lxqt: sync related ebuilds/metadata with the main Gentoo repo tree

With this, the metadata and 9999 ebuilds are in sync with the 0.13.0
versions found via the official Gentoo repository tree, with the
following exceptions:

- Polkit is optional.
- Some of the USE-flags are not used/included in the metadata.
- A patch for 'lxqt-config' is not needed.
- The handling of translations has been changed upstream, so
  'lxqt-meta' does not depend on 'lxqt-l10n' due to file collisions.

Package-Manager: Portage-2.3.49, Repoman-2.3.11

4 files changed, 53 insertions, 49 deletions

diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml
index a40a83a9..08d5c58e 100644
--- a/x11-misc/obconf-qt/metadata.xml
+++ b/x11-misc/obconf-qt/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>lxqt@gentoo.org</email>
-    <name>LXQt</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lxqt/obconf-qt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
index 9b96b4ee..ad92050f 100644
--- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
@@ -1,47 +1,53 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils
+
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Openbox window manager configuration tool"
-HOMEPAGE="http://lxqt.org/"
+HOMEPAGE="https://lxqt.org/"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 RDEPEND="
 	dev-libs/glib:2
-	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-libs/fontconfig
-	media-libs/freetype
 	x11-wm/openbox:3
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/pango
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.1.0
+	>=dev-util/lxqt-build-tools-0.5.0
+	sys-apps/sed
 	virtual/pkgconfig
 "
 
 src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
+	local mycmakeargs=(
+		-DPULL_TRANSLATIONS=OFF
+	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
index 5a72fc7c..f0e3eb36 100644
--- a/x11-misc/pcmanfm-qt/metadata.xml
+++ b/x11-misc/pcmanfm-qt/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>lxqt@gentoo.org</email>
-    <name>LXQt</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">pcmanfm</remote-id>
-    <remote-id type="github">lxde/pcmanfm-qt</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lxqt/pcmanfm-qt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
index 7438c61a..e3344d87 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
@@ -1,51 +1,47 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils
 
-if [[ ${PV} == *9999* ]]; then
+inherit cmake-utils eapi7-ver
+
+if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+HOMEPAGE="https://lxqt.org/"
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
-CDEPEND="
-	>=dev-libs/glib-2.18:2
+RDEPEND="
+	dev-libs/glib:2
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	>=x11-libs/libfm-1.2.0:=
-	>=x11-libs/libfm-qt-${PV}:=
+	=x11-libs/libfm-qt-$(ver_cut 1-2)*
 	x11-libs/libxcb:=
-"
-RDEPEND="${CDEPEND}
 	x11-misc/xdg-utils
 	virtual/eject
 	virtual/freedesktop-icon-theme
+	!lxqt-base/lxqt-common
 "
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
-	>=dev-util/intltool-0.40
-	>=dev-util/lxqt-build-tools-0.4.0
-	sys-devel/gettext
-	virtual/pkgconfig
+	>=dev-util/lxqt-build-tools-0.5.0
 "
 
 src_configure() {
 	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=NO
+		-DPULL_TRANSLATIONS=OFF
 	)
-
 	cmake-utils_src_configure
 }