public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: lxqt-base/liblxqt/, lxqt-base/libsysstat/, lxqt-base/lxqt-globalkeys/, ...
@ 2014-05-27 21:32 Davide Pesavento
  0 siblings, 0 replies; only message in thread
From: Davide Pesavento @ 2014-05-27 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ce1feca908fbddf7279b67c21af5981230ac9e3c
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 19:04:53 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 19:04:53 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ce1feca9

import LXQt 0.7.0 release to the tree, update live ebuilds

---
 lxqt-base/liblxqt-mount/Manifest                   |  1 -
 lxqt-base/liblxqt-mount/liblxqt-mount-0.7.0.ebuild | 32 -----------
 lxqt-base/liblxqt-mount/liblxqt-mount-9999.ebuild  | 14 ++---
 lxqt-base/liblxqt-mount/metadata.xml               |  2 +-
 lxqt-base/liblxqt/Manifest                         |  1 -
 lxqt-base/liblxqt/liblxqt-0.7.0.ebuild             | 39 --------------
 lxqt-base/liblxqt/liblxqt-9999.ebuild              |  9 ++--
 lxqt-base/liblxqt/metadata.xml                     |  2 +-
 lxqt-base/libsysstat/Manifest                      |  1 -
 lxqt-base/libsysstat/libsysstat-0.1.0.ebuild       | 27 ----------
 lxqt-base/libsysstat/libsysstat-9999.ebuild        |  5 +-
 lxqt-base/libsysstat/metadata.xml                  |  2 +-
 lxqt-base/lxqt-about/Manifest                      |  1 -
 lxqt-base/lxqt-about/lxqt-about-0.7.0.ebuild       | 28 ----------
 lxqt-base/lxqt-about/lxqt-about-9999.ebuild        | 13 +++--
 lxqt-base/lxqt-about/metadata.xml                  |  2 +-
 lxqt-base/lxqt-common/Manifest                     |  1 -
 lxqt-base/lxqt-common/lxqt-common-0.7.0.ebuild     | 44 ---------------
 lxqt-base/lxqt-common/lxqt-common-9999.ebuild      | 18 +++----
 lxqt-base/lxqt-common/metadata.xml                 |  2 +-
 lxqt-base/lxqt-config-randr/Manifest               |  1 -
 .../lxqt-config-randr-0.7.0.ebuild                 | 35 ------------
 .../lxqt-config-randr-9999.ebuild                  | 13 ++---
 lxqt-base/lxqt-config-randr/metadata.xml           |  2 +-
 lxqt-base/lxqt-config/Manifest                     |  1 -
 lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild     | 36 -------------
 lxqt-base/lxqt-config/lxqt-config-9999.ebuild      | 18 ++++---
 lxqt-base/lxqt-config/metadata.xml                 |  2 +-
 lxqt-base/lxqt-globalkeys/Manifest                 |  1 -
 .../lxqt-globalkeys/lxqt-globalkeys-0.7.0.ebuild   | 34 ------------
 .../lxqt-globalkeys/lxqt-globalkeys-9999.ebuild    | 13 +++--
 lxqt-base/lxqt-globalkeys/metadata.xml             |  2 +-
 lxqt-base/lxqt-meta/lxqt-meta-0.7.0.ebuild         | 47 ----------------
 lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild          | 44 +++++++--------
 lxqt-base/lxqt-meta/metadata.xml                   |  8 +--
 lxqt-base/lxqt-notificationd/Manifest              |  1 -
 .../lxqt-notificationd-0.7.0.ebuild                | 34 ------------
 .../lxqt-notificationd-9999.ebuild                 | 15 +++---
 lxqt-base/lxqt-notificationd/metadata.xml          |  2 +-
 lxqt-base/lxqt-openssh-askpass/Manifest            |  1 -
 .../lxqt-openssh-askpass-9999.ebuild               | 33 ------------
 lxqt-base/lxqt-openssh-askpass/metadata.xml        |  6 ---
 lxqt-base/lxqt-panel/Manifest                      |  1 -
 lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild       | 63 ----------------------
 lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild        | 38 +++++++------
 lxqt-base/lxqt-panel/metadata.xml                  | 45 +++++++---------
 lxqt-base/lxqt-policykit/Manifest                  |  1 -
 .../lxqt-policykit/lxqt-policykit-0.7.0.ebuild     | 34 ------------
 .../lxqt-policykit/lxqt-policykit-9999.ebuild      | 14 +++--
 lxqt-base/lxqt-policykit/metadata.xml              |  2 +-
 lxqt-base/lxqt-powermanagement/Manifest            |  1 -
 .../lxqt-powermanagement-0.7.0.ebuild              | 34 ------------
 .../lxqt-powermanagement-9999.ebuild               | 14 ++---
 lxqt-base/lxqt-powermanagement/metadata.xml        |  2 +-
 lxqt-base/lxqt-qtplugin/Manifest                   |  1 -
 lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.7.0.ebuild | 34 ------------
 lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild  |  5 +-
 lxqt-base/lxqt-qtplugin/metadata.xml               |  2 +-
 lxqt-base/lxqt-runner/Manifest                     |  1 -
 lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild     | 39 --------------
 lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild      | 24 +++++----
 lxqt-base/lxqt-runner/metadata.xml                 |  2 +-
 lxqt-base/lxqt-session/Manifest                    |  1 -
 lxqt-base/lxqt-session/lxqt-session-0.7.0.ebuild   | 40 --------------
 lxqt-base/lxqt-session/lxqt-session-9999.ebuild    | 19 ++++---
 lxqt-base/lxqt-session/metadata.xml                |  2 +-
 media-gfx/lximage-qt/Manifest                      |  1 -
 media-gfx/lximage-qt/lximage-qt-0.2.0.ebuild       | 34 ------------
 media-gfx/lximage-qt/lximage-qt-9999.ebuild        | 14 +++--
 media-gfx/lximage-qt/metadata.xml                  |  2 +-
 .../lxqt-openssh-askpass-9999.ebuild               | 18 +++----
 .../lxqt-openssh-askpass}/metadata.xml             |  3 +-
 profiles/updates/2Q-2014                           |  1 +
 x11-misc/obconf-qt/Manifest                        |  1 -
 x11-misc/obconf-qt/metadata.xml                    |  2 +-
 x11-misc/obconf-qt/obconf-qt-0.1.0.ebuild          | 31 -----------
 x11-misc/obconf-qt/obconf-qt-9999.ebuild           |  9 ++--
 x11-misc/pcmanfm-qt/Manifest                       |  1 -
 x11-misc/pcmanfm-qt/metadata.xml                   |  6 +--
 x11-misc/pcmanfm-qt/pcmanfm-qt-0.7.0.ebuild        | 55 -------------------
 x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild         | 25 +++++----
 81 files changed, 223 insertions(+), 992 deletions(-)

diff --git a/lxqt-base/liblxqt-mount/Manifest b/lxqt-base/liblxqt-mount/Manifest
deleted file mode 100644
index 205846a..0000000
--- a/lxqt-base/liblxqt-mount/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST liblxqt-mount-0.7.0.tar.xz 16012 SHA256 320bae8889e24742c9136839a8e5c79d9ae6678e13bb07105a8a373df2e02c15 SHA512 51c0b8b283661d7bc7383bb7ebb5b615c08f3ed5a22946621405ca9fd4c9d493e0d7c3c8a3d83b506f5d625d451f17a426fd3a96841564f8a0c47cb9d260282f WHIRLPOOL c1c7e8b8d29abec7e5fb970b689dfec757e6069cfd9689703f4eb4104fae8abc57c237c5d91393105c44cc9bc21e111714ce225f205777290f6b9f68fbbab12f

diff --git a/lxqt-base/liblxqt-mount/liblxqt-mount-0.7.0.ebuild b/lxqt-base/liblxqt-mount/liblxqt-mount-0.7.0.ebuild
deleted file mode 100644
index f59ab39..0000000
--- a/lxqt-base/liblxqt-mount/liblxqt-mount-0.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt library for removable media and devices"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND="lxqt-base/liblxqt
-	x11-libs/libX11
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	virtual/udev"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}

diff --git a/lxqt-base/liblxqt-mount/liblxqt-mount-9999.ebuild b/lxqt-base/liblxqt-mount/liblxqt-mount-9999.ebuild
index 818497c..8dbd564 100644
--- a/lxqt-base/liblxqt-mount/liblxqt-mount-9999.ebuild
+++ b/lxqt-base/liblxqt-mount/liblxqt-mount-9999.ebuild
@@ -5,26 +5,26 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt library for removable media and devices"
+DESCRIPTION="LXQt library for removable media and devices"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-DEPEND="lxqt-base/liblxqt
-	x11-libs/libX11
-	dev-qt/qtcore:4
+DEPEND="dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
+	lxqt-base/liblxqt
+	sys-fs/udisks:2
+	x11-libs/libX11
 	virtual/udev"
 RDEPEND="${DEPEND}"

diff --git a/lxqt-base/liblxqt-mount/metadata.xml b/lxqt-base/liblxqt-mount/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/liblxqt-mount/metadata.xml
+++ b/lxqt-base/liblxqt-mount/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
deleted file mode 100644
index dbf4804..0000000
--- a/lxqt-base/liblxqt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST liblxqt-0.7.0.tar.xz 82860 SHA256 a21f8fef4c0c44355b375b9731401d889c20852ccf55a2da11d7e5d5e08e1555 SHA512 21d532338fe2a88de45ee20bbb709924643be3780627a856a0c7f1de882e709fbc746c28d6785947c61539de207d1dcbbfa75b6901a1b82342d28273362a99b4 WHIRLPOOL 6be57b43412671c105a858b3b12fb0246c7e0600335d3973ea34b2f2564db42f97dc4585e37747555b58cb55ccaccfd1852038053bf125a281c2689709f5ae0f

diff --git a/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild b/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild
deleted file mode 100644
index 88c1630..0000000
--- a/lxqt-base/liblxqt/liblxqt-0.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Common base library for the LXDE-Qt desktop environment"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND="razorqt-base/libqtxdg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild
index 0fd29d0..30a27d8 100644
--- a/lxqt-base/liblxqt/liblxqt-9999.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild
@@ -5,23 +5,22 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="Common base library for the LXDE-Qt desktop environment"
+DESCRIPTION="Common base library for the LXQt desktop environment"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-DEPEND="razorqt-base/libqtxdg
+DEPEND=">=razorqt-base/libqtxdg-0.5.3
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXcursor

diff --git a/lxqt-base/liblxqt/metadata.xml b/lxqt-base/liblxqt/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/liblxqt/metadata.xml
+++ b/lxqt-base/liblxqt/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/libsysstat/Manifest b/lxqt-base/libsysstat/Manifest
deleted file mode 100644
index 2a87e2a..0000000
--- a/lxqt-base/libsysstat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libsysstat-0.1.0.tar.xz 16376 SHA256 beafdb971fbe282d7698fb2230024382bc7f100d9af13f2a4bafc97509089d9f SHA512 d5454055a631aa3c66be8f4b24d2eec0b5d86941ccfa80efc3f831558e5fbd06681060a641aad8968590e61274478f6fad80a518150e9461d8dbd9a48faca497 WHIRLPOOL 556201bd21fa2d24e8d1d874657b27352acd13d15552a5083e3dfa4adef6fb5ef2a34d365ce5ac2a82834eaaac941a70c73cfd3ace6f7589796a659a80b4e0f2

diff --git a/lxqt-base/libsysstat/libsysstat-0.1.0.ebuild b/lxqt-base/libsysstat/libsysstat-0.1.0.ebuild
deleted file mode 100644
index d8817c4..0000000
--- a/lxqt-base/libsysstat/libsysstat-0.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A Qt-based interface to system statistics"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}

diff --git a/lxqt-base/libsysstat/libsysstat-9999.ebuild b/lxqt-base/libsysstat/libsysstat-9999.ebuild
index 0085618..da48cf6 100644
--- a/lxqt-base/libsysstat/libsysstat-9999.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-9999.ebuild
@@ -11,15 +11,14 @@ HOMEPAGE="http://www.lxqt.org/"
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
 DEPEND="dev-qt/qtcore:4"
 RDEPEND="${DEPEND}"

diff --git a/lxqt-base/libsysstat/metadata.xml b/lxqt-base/libsysstat/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/libsysstat/metadata.xml
+++ b/lxqt-base/libsysstat/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-about/Manifest b/lxqt-base/lxqt-about/Manifest
deleted file mode 100644
index 6489425..0000000
--- a/lxqt-base/lxqt-about/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-about-0.7.0.tar.xz 10384 SHA256 5f1b53862f528aab8173626efbc6737dc228aa127c27c221123133401033e4de SHA512 e73512f040ec392079b5242a4bb7df69949bf516b2ec5e03534be2d13dc11cf252502a32c4da6b8ee9b00282c8e7e42395dae068c6e7fee4522f2dee230d24bd WHIRLPOOL 23a51940bbe4b9d4d82e452d1c3896f16d92ece3dce5b0b9420fd43c190bb0465d4a8278161957c2c6f187fedc60207fe30f955ee2c1eed6cdf946e3b4304b25

diff --git a/lxqt-base/lxqt-about/lxqt-about-0.7.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.7.0.ebuild
deleted file mode 100644
index b9985e5..0000000
--- a/lxqt-base/lxqt-about/lxqt-about-0.7.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt about dialog"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	lxqt-base/liblxqt"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}

diff --git a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
index b88756e..0469ecd 100644
--- a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
@@ -5,22 +5,21 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt about dialog"
+DESCRIPTION="LXQt about dialog"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-RDEPEND="dev-qt/qtgui:4
+DEPEND="dev-qt/qtgui:4
 	lxqt-base/liblxqt"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

diff --git a/lxqt-base/lxqt-about/metadata.xml b/lxqt-base/lxqt-about/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-about/metadata.xml
+++ b/lxqt-base/lxqt-about/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-common/Manifest b/lxqt-base/lxqt-common/Manifest
deleted file mode 100644
index 537a968..0000000
--- a/lxqt-base/lxqt-common/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-common-0.7.0.tar.xz 5145600 SHA256 ca4b4ea0d8d6c34e7f42621c23d180ed8abdf834c944309917a09bf950123c51 SHA512 7cec49d8ad94ac1747e484f104b335fb159cd238452f395cb502a245015f7d15f8f6c9dbfd330d99078a873cc6d4b9b01a171cdc858815763499fb7d8863c87f WHIRLPOOL 51b9c5b0d33a112452fca0aa03b75b1393f04181c1e90d5f48ef9ee0195b5706dbe4e4b4b29369e47e0f33754e6d7d779f167f3563f00895d8647ea5c61cc206

diff --git a/lxqt-base/lxqt-common/lxqt-common-0.7.0.ebuild b/lxqt-base/lxqt-common/lxqt-common-0.7.0.ebuild
deleted file mode 100644
index 03764ee..0000000
--- a/lxqt-base/lxqt-common/lxqt-common-0.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt common resources"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/lxqt/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND="lxqt-base/liblxqt"
-RDEPEND="${DEPEND}
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e 's!^Exec=startlxde-qt!TryExec=lxqt-session\nExec=/etc/X11/Sessions/lxqt!' xsession/lxqt.desktop.in || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodir "/etc/X11/Sessions"
-	mv "${D}/usr/bin/startlxqt" "${D}/etc/X11/Sessions/lxqt" || die
-	dosym "/etc/X11/Sessions/lxqt" "/usr/bin/startlxqt"
-}

diff --git a/lxqt-base/lxqt-common/lxqt-common-9999.ebuild b/lxqt-base/lxqt-common/lxqt-common-9999.ebuild
index 67671fd..397feb9 100644
--- a/lxqt-base/lxqt-common/lxqt-common-9999.ebuild
+++ b/lxqt-base/lxqt-common/lxqt-common-9999.ebuild
@@ -5,36 +5,30 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt common resources"
+DESCRIPTION="LXQt common resources"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/lxqt/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-DEPEND="lxqt-base/liblxqt"
-RDEPEND="${DEPEND}
+DEPEND="lxqt-base/liblxqt
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	dev-qt/qtsvg:4"
-
-src_prepare() {
-	sed -i -e 's!^Exec=startlxde-qt!TryExec=lxqt-session\nExec=/etc/X11/Sessions/lxqt!' xsession/lxqt.desktop.in || die
-	cmake-utils_src_prepare
-}
+RDEPEND="${DEPEND}"
+PDEPEND="lxqt-base/lxqt-session"
 
 src_install() {
 	cmake-utils_src_install
 	dodir "/etc/X11/Sessions"
-	mv "${D}/usr/bin/startlxqt" "${D}/etc/X11/Sessions/lxqt" || die
-	dosym "/etc/X11/Sessions/lxqt" "/usr/bin/startlxqt"
+	dosym  "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt"
 }

diff --git a/lxqt-base/lxqt-common/metadata.xml b/lxqt-base/lxqt-common/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-common/metadata.xml
+++ b/lxqt-base/lxqt-common/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-config-randr/Manifest b/lxqt-base/lxqt-config-randr/Manifest
deleted file mode 100644
index 79e6fde..0000000
--- a/lxqt-base/lxqt-config-randr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-config-randr-0.7.0.tar.xz 58376 SHA256 aa58f622aac3ab542838f3a3ae981dff3fc4b16f90f5a2bc6efcd3f9383fedf0 SHA512 0859718467a32705f0bc9321c28ffe6730215920dd8e64d79af585cc6fe9fc7693ca327591b278eec2bb9fde2048c024a8abf852baab4570977e7a4c5009e1d5 WHIRLPOOL d836c7c938c7df3f110a370066fc177f948f3c8aebd8db7f1fc564d5d06809e27f49325f22394218f2f039d539fc375eca6a4e8f560e9708443833d20e501001

diff --git a/lxqt-base/lxqt-config-randr/lxqt-config-randr-0.7.0.ebuild b/lxqt-base/lxqt-config-randr/lxqt-config-randr-0.7.0.ebuild
deleted file mode 100644
index 5ec0593..0000000
--- a/lxqt-base/lxqt-config-randr/lxqt-config-randr-0.7.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt monitor configuration"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-libs/glib:2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	x11-apps/xrandr"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/lxqt-base/lxqt-config-randr/lxqt-config-randr-9999.ebuild b/lxqt-base/lxqt-config-randr/lxqt-config-randr-9999.ebuild
index 9237927..09d8832 100644
--- a/lxqt-base/lxqt-config-randr/lxqt-config-randr-9999.ebuild
+++ b/lxqt-base/lxqt-config-randr/lxqt-config-randr-9999.ebuild
@@ -5,25 +5,26 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt monitor configuration"
+DESCRIPTION="LXQt monitor configuration"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
 CDEPEND="dev-libs/glib:2
 	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
+	dev-qt/qtgui:4
+	x11-libs/libX11
+	x11-libs/libXrandr"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}

diff --git a/lxqt-base/lxqt-config-randr/metadata.xml b/lxqt-base/lxqt-config-randr/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-config-randr/metadata.xml
+++ b/lxqt-base/lxqt-config-randr/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
deleted file mode 100644
index c4fc3ba..0000000
--- a/lxqt-base/lxqt-config/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-config-0.7.0.tar.xz 112572 SHA256 4b8ec02a7c78efe8fa45dcb0d60e83dc6a53bf81f12d2ea4b022cf9f6feae551 SHA512 9f75d69a5add165019bc20f861a1c847d01a37760bd29418c80b0d290fcab54716218ab40dfc80941e13242ea59e5f9de33a753dc33c1f5f257f9b58cef672a6 WHIRLPOOL 2a2996d7b889e3a16570a33aa472aca3e3b913b57eb20ce4dab142b23b8a9227a7c8a56f4370eb3c02d843fb9cb4b1af979992f337e112e4839a2645869dc419

diff --git a/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild
deleted file mode 100644
index 746287b..0000000
--- a/lxqt-base/lxqt-config/lxqt-config-0.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt system configuration control center"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	lxqt-base/liblxqt
-	razorqt-base/libqtxdg
-	sys-libs/zlib
-	x11-libs/libXcursor
-	x11-libs/libXfixes"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
index 5629ee3..82e4aee 100644
--- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
@@ -5,27 +5,31 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt system configuration control center"
+DESCRIPTION="LXQt system configuration control center"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-RDEPEND="dev-qt/qtcore:4
+DEPEND="dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	lxqt-base/liblxqt
 	razorqt-base/libqtxdg
 	sys-libs/zlib
 	x11-libs/libXcursor
 	x11-libs/libXfixes"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
+
+src_install(){
+	cmake-utils_src_install
+	doman man/*.1 lxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1
+}

diff --git a/lxqt-base/lxqt-config/metadata.xml b/lxqt-base/lxqt-config/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-config/metadata.xml
+++ b/lxqt-base/lxqt-config/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest
deleted file mode 100644
index 04fc6e6..0000000
--- a/lxqt-base/lxqt-globalkeys/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-globalkeys-0.7.0.tar.xz 51672 SHA256 588152d64aed4fe767b8eeb4d241fdf51fbcf13cace16bc4c5304c22b09c83e2 SHA512 6fb588d9fc801f44be9f093e9372cc7d226e02ef83e7204ab489ef45f425109b3d50b75bcf41c48375de3f9681e37fb1878320c3af37ad2a169e63075e849d20 WHIRLPOOL a42de2ab8159987a329c0f26e81fab1d93b26e1bd55b15ec8e2fc40141abbf0ba0760676522115cfdb660b93ce6281b0f2018c84c7b35689dcebbe009ab73d84

diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.7.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.7.0.ebuild
deleted file mode 100644
index 0b3b8f6..0000000
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND="lxqt-base/liblxqt
-	x11-libs/libX11
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
index 1e3ce29..0671bd9 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
@@ -11,19 +11,18 @@ HOMEPAGE="http://www.lxqt.org/"
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-DEPEND="lxqt-base/liblxqt
-	x11-libs/libX11
-	dev-qt/qtcore:4
+DEPEND="dev-qt/qtcore:4
 	dev-qt/qtdbus:4
-	dev-qt/qtgui:4"
+	dev-qt/qtgui:4
+	lxqt-base/liblxqt
+	x11-libs/libX11"
 RDEPEND="${DEPEND}"

diff --git a/lxqt-base/lxqt-globalkeys/metadata.xml b/lxqt-base/lxqt-globalkeys/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-globalkeys/metadata.xml
+++ b/lxqt-base/lxqt-globalkeys/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.7.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.7.0.ebuild
deleted file mode 100644
index cdc6a29..0000000
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild,v 1.2 2014/03/16 13:20:58 hwoarang Exp $
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="Meta ebuild for LXQT, the Lightweight X11 Desktop Environment"
-HOMEPAGE="http://lxde.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal sddm upower"
-
-DOC_CONTENTS="
-	For your convenience you can review the LXDE Configuration HOWTO at
-	http://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
-
-RDEPEND="
-	sddm? ( x11-misc/sddm )
-	~lxqt-base/lxqt-qtplugin-${PV}
-	~lxqt-base/lxqt-openssh-askpass-${PV}
-	!minimal? (
-		x11-wm/openbox
-		>=x11-misc/obconf-qt-0.1.0 )
-	~lxqt-base/lxqt-notificationd-${PV}
-	upower? (
-		~lxqt-base/lxqt-runner-${PV}
-		~lxqt-base/lxqt-policykit-${PV}
-		~lxqt-base/lxqt-powermanagement-${PV} )
-	~lxqt-base/lxqt-about-${PV}
-	~lxqt-base/lxqt-config-${PV}
-	~lxqt-base/lxqt-config-randr-${PV}
-	>=lxde-base/lxde-icon-theme-0.5
-	~lxqt-base/lxqt-common-${PV}
-	>=lxde-base/lxmenu-data-0.1.2
-	~lxqt-base/lxqt-panel-${PV}
-	~lxqt-base/lxqt-session-${PV}
-	~x11-misc/pcmanfm-qt-${PV}"
-
-S=${WORKDIR}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-}

diff --git a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
index acc6a70..11ee8db 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
@@ -1,44 +1,46 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxqt-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild,v 1.2 2014/03/16 13:20:58 hwoarang Exp $
+# $Header: $
 
 EAPI=5
 
 inherit readme.gentoo
 
-DESCRIPTION="Meta ebuild for LXQT, the Lightweight X11 Desktop Environment"
-HOMEPAGE="http://lxde.org/"
+DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
+HOMEPAGE="http://lxqt.org/"
 
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="minimal sddm upower"
+IUSE="-minimal powermanagement"
+
+S="${WORKDIR}"
 
 DOC_CONTENTS="
-	For your convenience you can review the LXDE Configuration HOWTO at
-	http://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
+	For your convenience you can review
+	http://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml and
+	http://wiki.lxde.org/en/LXDE-Qt"
 
 RDEPEND="
-	sddm? ( x11-misc/sddm )
-	~lxqt-base/lxqt-qtplugin-${PV}
-	~lxqt-base/lxqt-openssh-askpass-${PV}
-	!minimal? (
-		x11-wm/openbox
-		>=x11-misc/obconf-qt-0.1.0 )
-	~lxqt-base/lxqt-notificationd-${PV}
-	upower? (
-		~lxqt-base/lxqt-runner-${PV}
-		~lxqt-base/lxqt-policykit-${PV}
-		~lxqt-base/lxqt-powermanagement-${PV} )
+	>=lxde-base/lxde-icon-theme-0.5
+	>=lxde-base/lxmenu-data-0.1.2
 	~lxqt-base/lxqt-about-${PV}
+	~lxqt-base/lxqt-common-${PV}
 	~lxqt-base/lxqt-config-${PV}
 	~lxqt-base/lxqt-config-randr-${PV}
-	>=lxde-base/lxde-icon-theme-0.5
-	~lxqt-base/lxqt-common-${PV}
-	>=lxde-base/lxmenu-data-0.1.2
+	~lxqt-base/lxqt-notificationd-${PV}
 	~lxqt-base/lxqt-panel-${PV}
+	~lxqt-base/lxqt-policykit-${PV}
+	~lxqt-base/lxqt-qtplugin-${PV}
+	~lxqt-base/lxqt-runner-${PV}
 	~lxqt-base/lxqt-session-${PV}
-	~x11-misc/pcmanfm-qt-${PV}"
+	~x11-misc/pcmanfm-qt-${PV}
+	!minimal? (
+		x11-wm/openbox
+		>=x11-misc/obconf-qt-${PV} )
+	powermanagement? (
+		~lxqt-base/lxqt-powermanagement-${PV} )
+"
 
 pkg_postinst() {
 	readme.gentoo_pkg_postinst

diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 92f01af..beb16ac 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <use>
-    <flag name="sddm">Enable SDDM a QT Based Display Manager</flag>
-    <flag name="upower">Pull in power management</flag>
+    <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
+    window manager</flag>
+    <flag name="powermanagement">Pull in
+    <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
   </use>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-notificationd/Manifest b/lxqt-base/lxqt-notificationd/Manifest
deleted file mode 100644
index c7df118..0000000
--- a/lxqt-base/lxqt-notificationd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-notificationd-0.7.0.tar.xz 38064 SHA256 bda7c841df4c4e340840877f83dc36188c52ffaff060c45b9e7f5b6f4075f11c SHA512 341a167fe7e5413d5e925cdfe7303efe255303c68f75bfa5a73808f566aee7cdfcc19bd52f4d623c7bf97c45020ffaa3fc9f65ae99c12a3199acfa8b287c1940 WHIRLPOOL 7f3ba04ac5c97224bf7a6193855245c6f879b0397a843a3f64d4de3dc3de8eb0546f92aa2ff8c0a28f4aaa87630ab3b42b6f8dec9e7468052c747018decd1c4a

diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild
deleted file mode 100644
index 20d8239..0000000
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Notification daemon and library"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND="lxqt-base/liblxqt
-	razorqt-base/libqtxdg
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
index 7df281d..52ec129 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
@@ -5,25 +5,24 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="Notification daemon and library"
+DESCRIPTION="LXQt notification daemon and library"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-DEPEND="lxqt-base/liblxqt
-	razorqt-base/libqtxdg
-	dev-qt/qtcore:4
+DEPEND="dev-qt/qtcore:4
 	dev-qt/qtdbus:4
-	dev-qt/qtgui:4"
+	dev-qt/qtgui:4
+	lxqt-base/liblxqt
+	razorqt-base/libqtxdg"
 RDEPEND="${DEPEND}"

diff --git a/lxqt-base/lxqt-notificationd/metadata.xml b/lxqt-base/lxqt-notificationd/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-notificationd/metadata.xml
+++ b/lxqt-base/lxqt-notificationd/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-openssh-askpass/Manifest b/lxqt-base/lxqt-openssh-askpass/Manifest
deleted file mode 100644
index 074c88f..0000000
--- a/lxqt-base/lxqt-openssh-askpass/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-openssh-askpass-0.7.0.tar.xz 14276 SHA256 764cac4eee716d19975f4f0f888a9341d74073519b19f331b7593362dbc878d5 SHA512 aff27c83f075427aa8fe8e5fa463a45eafc86da673f4feb618c3b101b37bbcc30224eb28146ca6652428a144b47f44ee62a37ca9c31fab5fcec81a8470d88e82 WHIRLPOOL ddf5459e364ff3ceff69bd44bcfac68da739dc977c3c2706a0c4fd22182d06009fd46ce62eba6c8e0b9bb268c43f3db7c84f0aa344350a399730c332b48aa04c

diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
deleted file mode 100644
index e79448f..0000000
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt OpenSSH user password prompt tool"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	lxqt-base/liblxqt"
-DEPEND="${RDEPEND}"
-
-src_install(){
-	cmake-utils_src_install
-	doman man/*.1
-}

diff --git a/lxqt-base/lxqt-openssh-askpass/metadata.xml b/lxqt-base/lxqt-openssh-askpass/metadata.xml
deleted file mode 100644
index c141026..0000000
--- a/lxqt-base/lxqt-openssh-askpass/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>lxde</herd>
-  <herd>qt</herd>
-</pkgmetadata>

diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
deleted file mode 100644
index 3f83a6b..0000000
--- a/lxqt-base/lxqt-panel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-panel-0.7.0.tar.xz 247640 SHA256 13fcdd33dfe1a691395765032dd6ae6eab5d4988ba96fb79b3d521e216383677 SHA512 e8817bc424c9c4369afd6f300d54f752cbb448767277eaa3024b44b0cb557e14721b19e83ba647fc1e0aac2923651782cd4964cf92a419f93b4f450351dcda28 WHIRLPOOL 5d29ab327eafe5a33a060e91b63d0320ae11000a2ec4bd58b9313a3eb0f6a78a7c5de1e7375de6c3bfe51f717d7998551d821b966a629263a4cfb873dc79e92b

diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild
deleted file mode 100644
index e6703eb..0000000
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt desktop panel and plugins"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/lxqt/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+alsa +clock colorpicker cpuload +desktopswitch +kbindicator +mainmenu
-	+mount networkmonitor pulseaudio +quicklaunch screensaver sensors
-	+showdesktop sysstat +taskbar +tray +volume worldclock"
-REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
-
-DEPEND="lxqt-base/liblxqt
-	lxqt-base/liblxqt-mount
-	razorqt-base/libqtxdg
-	lxqt-base/libsysstat
-	lxqt-base/lxqt-globalkeys
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	x11-libs/libX11
-	cpuload? ( sys-libs/libstatgrab )
-	networkmonitor? ( sys-libs/libstatgrab )
-	sensors? ( sys-apps/lm_sensors )
-	sysstat? ( lxqt-base/libsysstat )
-	volume? ( alsa? ( media-libs/alsa-lib )
-		pulseaudio? ( media-sound/pulseaudio ) )
-	worldclock? ( dev-libs/icu:= )"
-RDEPEND="${DEPEND}
-	lxde-base/lxmenu-data"
-
-S=${WORKDIR}
-
-src_configure() {
-	local mycmakeargs i y
-	for i in clock colorpicker cpuload desktopswitch kbindicator mainmenu mount \
-		networkmonitor quicklaunch screensaver sensors showdesktop sysstat \
-		taskbar tray volume worldclock; do
-		y=$(tr '[:lower:]' '[:upper:]' <<< "${i}")
-		mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) )
-	done
-
-	if use volume; then
-		mycmakeargs+=( $(cmake-utils_use alsa VOLUME_USE_ALSA)
-			$(cmake-utils_use pulseaudio VOLUME_USE_PULSEAUDIO) )
-	fi
-
-	cmake-utils_src_configure
-}

diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
index 3da8289..e730d4c 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
@@ -5,49 +5,52 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt desktop panel and plugins"
+DESCRIPTION="LXQt desktop panel and plugins"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/lxqt/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE="+alsa +clock colorpicker cpuload +desktopswitch +kbindicator +mainmenu
+IUSE="+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu
 	+mount networkmonitor pulseaudio +quicklaunch screensaver sensors
-	+showdesktop sysstat +taskbar +tray +volume worldclock"
+	+showdesktop sysstat +taskbar teatime +tray +volume worldclock"
 REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
 
-DEPEND="lxqt-base/liblxqt
-	lxqt-base/liblxqt-mount
-	razorqt-base/libqtxdg
-	lxqt-base/libsysstat
-	lxqt-base/lxqt-globalkeys
-	dev-qt/qtcore:4
+DEPEND="dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
+	>=lxde-base/menu-cache-0.3.3
+	~lxqt-base/liblxqt-${PV}
+	~lxqt-base/liblxqt-mount-${PV}
+	~lxqt-base/libsysstat-${PV}
+	~lxqt-base/lxqt-globalkeys-${PV}
+	~razorqt-base/libqtxdg-${PV}
 	x11-libs/libX11
 	cpuload? ( sys-libs/libstatgrab )
+	mainmenu? ( || ( sys-auth/consolekit[policykit(-)]
+		sys-apps/systemd[policykit(-)] ) )
 	networkmonitor? ( sys-libs/libstatgrab )
 	sensors? ( sys-apps/lm_sensors )
-	sysstat? ( lxqt-base/libsysstat )
+	sysstat? ( ~lxqt-base/libsysstat-${PV} )
 	volume? ( alsa? ( media-libs/alsa-lib )
 		pulseaudio? ( media-sound/pulseaudio ) )
 	worldclock? ( dev-libs/icu:= )"
 RDEPEND="${DEPEND}
-	lxde-base/lxmenu-data"
+	~lxde-base/lxmenu-data-${PV}"
 
 src_configure() {
 	local mycmakeargs i y
-	for i in clock colorpicker cpuload desktopswitch kbindicator mainmenu mount \
+	for i in clock colorpicker cpuload desktopswitch dom kbindicator mainmenu mount \
 		networkmonitor quicklaunch screensaver sensors showdesktop sysstat \
-		taskbar tray volume worldclock; do
+		taskbar teatime tray volume worldclock; do
 		y=$(tr '[:lower:]' '[:upper:]' <<< "${i}")
 		mycmakeargs+=( $(cmake-utils_use ${i} ${y}_PLUGIN) )
 	done
@@ -59,3 +62,8 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+src_install(){
+	cmake-utils_src_install
+	doman panel/man/*.1
+}

diff --git a/lxqt-base/lxqt-panel/metadata.xml b/lxqt-base/lxqt-panel/metadata.xml
index 47761f8..966aceb 100644
--- a/lxqt-base/lxqt-panel/metadata.xml
+++ b/lxqt-base/lxqt-panel/metadata.xml
@@ -1,31 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
-  <herd>qt</herd>
+  <herd>lxqt</herd>
   <use>
-    <flag name='clock'>Add clock panel applet</flag>
-    <flag name='colorpicker'>Add colorpicker panel applet</flag>
-    <flag name='cpuload'>Add CPU load panel applet; depends on
-      <pkg>sys-libs/libstatgrab</pkg></flag>
-    <flag name='desktopswitch'>Add desktop switch panel applet</flag>
-    <flag name='kbindicator'>Add keyboard indicator panel applet</flag>
-    <flag name='mainmenu'>Add main menu panel applet</flag>
-    <flag name='mount'>Add external storage mounting panel applet; depends on
-      <pkg>sys-fs/udisks</pkg></flag>
-    <flag name='networkmonitor'>Add network monitor panel applet; depends on
-      <pkg>sys-libs/libstatgrab</pkg></flag>
-    <flag name='quicklaunch'>Add quicklaunch panel applet</flag>
-    <flag name='screensaver'>Add screensaver panel applet</flag>
-    <flag name='sensors'>Add sensors panel applet; depends on
-      <pkg>sys-apps/lm_sensors</pkg></flag>
-    <flag name='showdesktop'>Add show desktop panel applet</flag>
-	<flag name='sysstat'>Add system statistics panel applet</flag>
-    <flag name='taskbar'>Add taskbar panel applet</flag>
-    <flag name='tray'>Add system tray panel applet</flag>
-    <flag name='volume'>Add volume mixer panel applet; depends on either
-      <pkg>media-libs/alsa-lib</pkg> or <pkg>media-sound/pulseaudio</pkg></flag>
-    <flag name='worldclock'>Add world clock panel applet; depends on
-      <pkg>dev-libs/icu</pkg></flag>
+    <flag name="clock">Build clock plugin</flag>
+    <flag name="colorpicker">Build colorpicker plugin</flag>
+    <flag name="cpuload">Build cpuload plugin</flag>
+    <flag name="desktopswitch">Build desktopswitch plugin</flag>
+    <flag name="dom">Build dom plugin</flag>
+    <flag name="kbindicator">Build kbindicator plugin</flag>
+    <flag name="mainmenu">Build mainmenu plugin</flag>
+    <flag name="mount">Build mount plugin</flag>
+    <flag name="networkmonitor">Build networkmonitor plugin</flag>
+    <flag name="quicklaunch">Build quicklaunch plugin</flag>
+    <flag name="screensaver">Build screensaver plugin</flag>
+    <flag name="sensors">Build sensors plugin</flag>
+    <flag name="showdesktop">Build showdesktop plugin</flag>
+    <flag name="sysstat">Build sysstat plugin</flag>
+    <flag name="taskbar">Build taskbar plugin</flag>
+    <flag name="teatime">Build teatime plugin</flag>
+    <flag name="tray">Build tray plugin</flag>
+    <flag name="volume">Build volume plugin</flag>
+    <flag name="worldclock">Build worldclock plugin</flag>
   </use>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-policykit/Manifest b/lxqt-base/lxqt-policykit/Manifest
deleted file mode 100644
index 1cfbc08..0000000
--- a/lxqt-base/lxqt-policykit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-policykit-0.7.0.tar.xz 15772 SHA256 1b93a2e5e9f70246f16198a07a49b3c2d16089d6ea413bdff25e4ec763763d86 SHA512 8e5ff42d4e74d648ad9b159d6140afeaffd8094bd3a92c30b5faf2d5aa8e719cb9b1c8345ed6ee92f603c7f7b88224873a791b2300bca4b49a1f53b4586f26c9 WHIRLPOOL 971eec6ef31937af95927a2abb666293a2d57bcc365f68696c288ce7dbe7473804352468d48bc40675ca8d6723b5591881cbce6987092589e703ce0a7cc2401c

diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild
deleted file mode 100644
index fb4090b..0000000
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt PolKit authentication agent"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	lxqt-base/liblxqt
-	razorqt-base/libqtxdg
-	sys-auth/polkit-qt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}

diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
index 28ac9e7..66a4b91 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
@@ -5,21 +5,20 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt PolKit authentication agent"
+DESCRIPTION="LXQt PolKit authentication agent"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="dev-qt/qtcore:4
 	dev-qt/qtdbus:4
@@ -30,3 +29,8 @@ RDEPEND="dev-qt/qtcore:4
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+
+src_install(){
+	cmake-utils_src_install
+	doman man/*.1
+}

diff --git a/lxqt-base/lxqt-policykit/metadata.xml b/lxqt-base/lxqt-policykit/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-policykit/metadata.xml
+++ b/lxqt-base/lxqt-policykit/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-powermanagement/Manifest b/lxqt-base/lxqt-powermanagement/Manifest
deleted file mode 100644
index b6289f7..0000000
--- a/lxqt-base/lxqt-powermanagement/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-powermanagement-0.7.0.tar.xz 29336 SHA256 7f0456b9bcf416adb1e1c5c797a688bcd276680f0821e165b346364cd2926f87 SHA512 973332d331d3a8b794d06523e623650a38b019f03c40bff8519036c314c9835101e51fafe34a76e755c5e7e85d963e481d4b3562e4d2f4a08fab4c3f60b7fbde WHIRLPOOL 6156238d287ead2a83743552bdd030f5a60b30cd0dc2d19f183b878fb9e31fbdb77b101d14c4e0d9e37d2a95f5958b22e21a1376fe2d8345c9f9fe1ae032901e

diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild
deleted file mode 100644
index b0c17c2..0000000
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt daemon for power management and auto-suspend"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/lxqt/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	lxqt-base/liblxqt
-	razorqt-base/libqtxdg
-	x11-libs/libX11
-	x11-libs/libxcb
-	sys-power/upower"
-
-S=${WORKDIR}

diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
index e96d3b6..c087bb6 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
@@ -5,28 +5,28 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt daemon for power management and auto-suspend"
+DESCRIPTION="LXQt daemon for power management and auto-suspend"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/lxqt/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-DEPEND="dev-qt/qtcore:4
+RDEPEND="dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
 	dev-qt/qtsvg:4
 	lxqt-base/liblxqt
 	razorqt-base/libqtxdg
 	x11-libs/libX11
-	x11-libs/libxcb
-	sys-power/upower"
+	x11-libs/libxcb"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"

diff --git a/lxqt-base/lxqt-powermanagement/metadata.xml b/lxqt-base/lxqt-powermanagement/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-powermanagement/metadata.xml
+++ b/lxqt-base/lxqt-powermanagement/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest
deleted file mode 100644
index 843e5a3..0000000
--- a/lxqt-base/lxqt-qtplugin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-qtplugin-0.7.0.tar.xz 11980 SHA256 fb9780ff79f2cd02bc75329d26e1b78a72447cc31d19ee85c079bd175293f7c9 SHA512 15a738b3d79320cd01fbe108f83ceb1fdfad9fc03e3647b3436e8d7936063b47f80f0eacf920420404e0d10046568a859e98a66d747b3fa0f1ff2be3e8920bf2 WHIRLPOOL fe46394ff1e2f7967f2cdac0b7a5357bb6b7ea6accfdb4d651e54932d6cec348acd26f76f23bd3cbf58bc06ff0fb7ab2537fa5aacd23d897a9f878c71103c6e5

diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.7.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.7.0.ebuild
deleted file mode 100644
index 42409a1..0000000
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt applications switcher"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-DEPEND="lxqt-base/liblxqt
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
index eb1237c..c4d572b 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
@@ -5,21 +5,20 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt applications switcher"
+DESCRIPTION="LXQt system integration plugin for Qt"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
 DEPEND="lxqt-base/liblxqt
 	dev-qt/qtcore:4

diff --git a/lxqt-base/lxqt-qtplugin/metadata.xml b/lxqt-base/lxqt-qtplugin/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-qtplugin/metadata.xml
+++ b/lxqt-base/lxqt-qtplugin/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-runner/Manifest b/lxqt-base/lxqt-runner/Manifest
deleted file mode 100644
index 54fb4a0..0000000
--- a/lxqt-base/lxqt-runner/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-runner-0.7.0.tar.xz 195452 SHA256 e4ef1820cb29fdd2b5ab2bd3a46da29abf3246bcc95e7521161a5e2103d4d7f2 SHA512 b592a9082b0dd2908373205a193a2f23ac134e316dffb50ccecc8cb245ccac014426ce4fedc57a46aad62100a11c4aad12b78364051d53331b593c8d1b81360c WHIRLPOOL 5abfe274823ba9342c2e8b83e5c9a53fd236b08c21b14fb143ac61bb86ed4c199e4f6797ea08c1bdde6c031f782e24e1898144eff8d7eb6cc9e574825baee635

diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild
deleted file mode 100644
index b235089..0000000
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXDE-Qt quick launcher"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="lxqt-base/liblxqt
-	razorqt-base/libqtxdg
-	lxqt-base/lxqt-globalkeys
-	>=lxde-base/menu-cache-0.5.1
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	sys-power/upower"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
index efbc268..d16d1c8 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
@@ -5,30 +5,34 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt quick launcher"
+DESCRIPTION="LXQt quick launcher"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="LGPL-2.1+"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-RDEPEND="lxqt-base/liblxqt
-	razorqt-base/libqtxdg
-	lxqt-base/lxqt-globalkeys
-	=lxde-base/menu-cache-9999
-	dev-qt/qtcore:4
+RDEPEND="dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
 	dev-qt/qtscript:4
-	sys-power/upower"
+	lxqt-base/liblxqt
+	lxqt-base/lxqt-globalkeys
+	>=lxde-base/menu-cache-0.5.1
+	razorqt-base/libqtxdg
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+
+src_install(){
+	cmake-utils_src_install
+	doman man/*.1
+}

diff --git a/lxqt-base/lxqt-runner/metadata.xml b/lxqt-base/lxqt-runner/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-runner/metadata.xml
+++ b/lxqt-base/lxqt-runner/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
deleted file mode 100644
index 8fe3916..0000000
--- a/lxqt-base/lxqt-session/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lxqt-session-0.7.0.tar.xz 68208 SHA256 d6af28a6054555acf1a2e47c839d6802e5a88b237cdcd8d2ee3155661bbdd6d6 SHA512 0a1fcdf9669295c5651ce21ee377997c5dbea147576bd26bd146642a23ecec1a402e209a0244a8798e481567f38499a6cc56887193b1b4bea07d746a15e5f94a WHIRLPOOL 0c20d15631ba575609f5b76a3d1054c048d721571e2b3fa9992e4b7e3fb8cf1d9642bf4268bad0ad3d00acede18c9bc5eff27f4a43ef3013bfb1570668a07364

diff --git a/lxqt-base/lxqt-session/lxqt-session-0.7.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.7.0.ebuild
deleted file mode 100644
index 409cb5f..0000000
--- a/lxqt-base/lxqt-session/lxqt-session-0.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="LXQT session manager"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/libX11
-	lxqt-base/liblxqt"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	lxqt-base/lxqt-common"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
index 6605af5..7c85ba6 100644
--- a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
@@ -12,24 +12,29 @@ HOMEPAGE="http://www.lxqt.org/"
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-CDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/libX11
-	lxqt-base/liblxqt"
+CDEPEND="dev-qt/qtcore:4
+	dev-qt/qtdbus
+	dev-qt/qtgui:4
+	lxqt-base/liblxqt
+	razorqt-base/libqtxdg
+	x11-libs/libX11"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
 	lxqt-base/lxqt-common"
+
+src_install(){
+	cmake-utils_src_install
+	doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
+}

diff --git a/lxqt-base/lxqt-session/metadata.xml b/lxqt-base/lxqt-session/metadata.xml
index c141026..2b2f838 100644
--- a/lxqt-base/lxqt-session/metadata.xml
+++ b/lxqt-base/lxqt-session/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
deleted file mode 100644
index 85be92b..0000000
--- a/media-gfx/lximage-qt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lximage-qt-0.2.0.tar.xz 41240 SHA256 4750981bbf1a1a36fd581addd8d6acecb608f9660442b6831eb05639151524fb SHA512 238e1fb7795fb2b5d73132fc61942b0277d1c2b7c880f3022e4fabee754a17da013af1907ada001762271ac7ded42efbf4470990bb574d26215ff0276f4a7c16 WHIRLPOOL a09053cfb944518a3879dcf28786ad70a2b7a67cc04d4f2a737d1dadaad846c883b322aa906135f01726cf2266d78d70a94e5e619699b91718faa914787afc37

diff --git a/media-gfx/lximage-qt/lximage-qt-0.2.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.2.0.ebuild
deleted file mode 100644
index 3eec91f..0000000
--- a/media-gfx/lximage-qt/lximage-qt-0.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXImage Image Viewer - GPicView replacement"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	x11-misc/pcmanfm-qt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}

diff --git a/media-gfx/lximage-qt/lximage-qt-9999.ebuild b/media-gfx/lximage-qt/lximage-qt-9999.ebuild
index 135b00f..23f9d8a 100644
--- a/media-gfx/lximage-qt/lximage-qt-9999.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-9999.ebuild
@@ -11,19 +11,23 @@ HOMEPAGE="http://www.lxqt.org/"
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-RDEPEND="dev-libs/glib:2
-	dev-qt/qtcore:4
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtdbus
 	dev-qt/qtgui:4
+	dev-libs/glib:2
+	media-libs/libexif
+	>=x11-libs/libfm-1.2
+	x11-libs/libX11
+	x11-libs/libXfixes
 	x11-misc/pcmanfm-qt"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

diff --git a/media-gfx/lximage-qt/metadata.xml b/media-gfx/lximage-qt/metadata.xml
index c141026..2b2f838 100644
--- a/media-gfx/lximage-qt/metadata.xml
+++ b/media-gfx/lximage-qt/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild b/net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
similarity index 71%
rename from lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
rename to net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
index fa90240..9b6735e 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.7.0.ebuild
+++ b/net-misc/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
@@ -5,34 +5,32 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="LXDE-Qt OpenSSH user password prompt tool"
+DESCRIPTION="LXQt OpenSSH user password prompt tool"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-RDEPEND="dev-qt/qtcore:4
+DEPEND="dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
 	lxqt-base/liblxqt"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}
+RDEPEND="${DEPEND}"
 
 src_install(){
 	cmake-utils_src_install
 	doman man/*.1
+
+	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/lxqt-openssh-askpass'" >> "${T}/99${PN}" \
+		|| die
+	doenvd "${T}/99${PN}"
 }

diff --git a/lxqt-base/liblxqt/metadata.xml b/net-misc/lxqt-openssh-askpass/metadata.xml
similarity index 78%
copy from lxqt-base/liblxqt/metadata.xml
copy to net-misc/lxqt-openssh-askpass/metadata.xml
index c141026..f988383 100644
--- a/lxqt-base/liblxqt/metadata.xml
+++ b/net-misc/lxqt-openssh-askpass/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
-  <herd>qt</herd>
+  <herd>lxqt</herd>
 </pkgmetadata>

diff --git a/profiles/updates/2Q-2014 b/profiles/updates/2Q-2014
new file mode 100644
index 0000000..39ff7b4
--- /dev/null
+++ b/profiles/updates/2Q-2014
@@ -0,0 +1 @@
+move lxqt-base/lxqt-openssh-askpass net-misc/lxqt-openssh-askpass

diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
deleted file mode 100644
index fcbae8f..0000000
--- a/x11-misc/obconf-qt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST obconf-qt-0.1.0.tar.xz 52048 SHA256 4831bfc06eff0529697a51196c1d7866cb12e3b19a0724e8201dbdfd2bca082b SHA512 0193b5d5d3ede2c7e2e5720c5ead1b75812277da474569926138647127cade87e23c3ca8c65dfded988122c097b867a6ce940da1eb526b12a44262be778d3fe8 WHIRLPOOL 835ee8c32cead4241d953e9302cd1f77c4ede8e15ab8d045af9d8cd49338ee75ec7feb05899a9da64b7e26497e35e59fe430ea99fd50d7fa2efc71f9ad84c561

diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml
index c141026..2b2f838 100644
--- a/x11-misc/obconf-qt/metadata.xml
+++ b/x11-misc/obconf-qt/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>lxde</herd>
+  <herd>lxqt</herd>
   <herd>qt</herd>
 </pkgmetadata>

diff --git a/x11-misc/obconf-qt/obconf-qt-0.1.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.1.0.ebuild
deleted file mode 100644
index e52acd6..0000000
--- a/x11-misc/obconf-qt/obconf-qt-0.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Openbox window manager configuration"
-HOMEPAGE="http://www.lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	x11-wm/openbox:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}

diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
index 8b4ee3b..58055a0 100644
--- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
@@ -5,21 +5,20 @@
 EAPI=5
 inherit cmake-utils
 
-DESCRIPTION="Openbox window manager configuration"
+DESCRIPTION="Openbox window manager configuration tool"
 HOMEPAGE="http://www.lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/lxde/${P}.tar.bz2"
+	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="dev-libs/glib:2
 	dev-qt/qtcore:4

diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
deleted file mode 100644
index 3cdbc9f..0000000
--- a/x11-misc/pcmanfm-qt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pcmanfm-qt-0.7.0.tar.xz 125308 SHA256 7ed3b2dec812294f770bdc39725eb94c8ea722420065d040ed4edf4d8455ec31 SHA512 1ddfb8139c805cb1df1cc028a82dadaee8f7cdd918ef108b3d4bad81a737b7cab517dd19803537264f5abab3e1942591da859cc431ad16916c756b402b269178 WHIRLPOOL 33046e270cbca03ac93348686a496d0a1ae210c13e28119307bd67e0ff2a1b3c89899e2c39884d4fa7924af23361b7e3e015981e7ae6ed53b1734f0882ab7aa8

diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
index 9f5e763..d87441e 100644
--- a/x11-misc/pcmanfm-qt/metadata.xml
+++ b/x11-misc/pcmanfm-qt/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>lxde</herd>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+<herd>lxqt</herd>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>

diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.7.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.7.0.ebuild
deleted file mode 100644
index 0a6509e..0000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.7.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild,v 1.2 2013/04/29 18:59:04 hwoarang Exp $
-
-EAPI=5
-
-inherit cmake-utils multilib readme.gentoo
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
-	KEYWORDS=""
-else
-	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	S="${WORKDIR}"/${P}-Source
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt4 port)"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="vala"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	dev-qt/qtgui:4
-	dev-qt/qtdbus:4
-	>=lxde-base/menu-cache-0.3.2
-	>=x11-libs/libfm-1.2.0"
-RDEPEND="${COMMON_DEPEND}
-	virtual/eject
-	virtual/freedesktop-icon-theme"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	default
-	S=${WORKDIR}
-}
-
-src_prepare() {
-	# fix multilib
-	sed -i -e "/LIBRARY\ DESTINATION/s:lib:$(get_libdir):" \
-		libfm-qt/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	DOC_CONTENTS="Be sure to set an icon theme in Edit > Preferences > User Interface"
-	readme.gentoo_src_install
-}

diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
index 11b0195..13293fd 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild,v 1.2 2013/04/29 18:59:04 hwoarang Exp $
+# $Header: $
 
 EAPI=5
 
@@ -9,32 +9,31 @@ inherit cmake-utils multilib readme.gentoo
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
-	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/${PV}/${P}.tar.xz"
-	S="${WORKDIR}"/${P}-Source
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"
 fi
 
-DESCRIPTION="Fast lightweight tabbed filemanager (Qt4 port)"
+DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	dev-qt/qtgui:4
+CDEPEND=">=dev-libs/glib-2.18:2
+	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
-	>=lxde-base/menu-cache-0.3.2
+	dev-qt/qtgui:4
+	>=lxde-base/menu-cache-0.4.1
 	>=x11-libs/libfm-1.2.0"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	virtual/eject
 	virtual/freedesktop-icon-theme"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${CDEPEND}
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 src_prepare() {
 	# fix multilib


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2014-05-27 21:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-27 21:32 [gentoo-commits] proj/qt:master commit in: lxqt-base/liblxqt/, lxqt-base/libsysstat/, lxqt-base/lxqt-globalkeys/, Davide Pesavento

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox