import LXQt 0.7.0 release to the tree, update live ebuilds

1 files changed, 23 insertions, 15 deletions

diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
index 3da82892..e730d4c7 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
+}