x11-wm/lumina-1.2.0.1-r1 : Test-Ebuild for Lumina 1.2.0 Patch 01

3 files changed, 70 insertions, 56 deletions

diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index d832e38..fcccc9f 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,2 +1 @@
-DIST lumina-1.1.0.tar.gz 55828227 SHA256 b6b4eb9c671f0eef9760b0fbd93ebd992248ac619cc7025185fc3f82d6a00373 SHA512 79b48e70fd7be3708966221c25025a8013a3ef96e00681056e99dfdd60809a3ff9d2048b3767d9fbc57c1c4f7e00fb36659cdca86fa41a322f125e9e061e88e0 WHIRLPOOL 9be956b16d04850d0ca4d32166c4c0135f088ce65a754ff0bd7ccf6d95a5c9ede42bc87ad5d617185d008e3efbbe5edfab55dca298724fcb3403973fc6a4f557
 DIST lumina-1.2.0.1.tar.gz 56032695 SHA256 f8366212fe3f29039c5febef5b4de97a92eb72483e2d97f5c086edf8fc65bd49 SHA512 8490e2b0f2fa08b2d63ec688f9993771ea935129a2947ef7bfa1874424cbede6d8877083ce90658c283858e67397383b5bab536388e9222b440015ebdf8b2919 WHIRLPOOL 6a7fc95022c4f9cc372c4fafc87cbda70a5f3ebcb52dc1f96516460df928e6e2f02ea380104bd7df9f7df33b1d098b24d8e73ec7ffe77e82a633c920634f9c70
diff --git a/x11-wm/lumina/lumina-1.1.0.ebuild b/x11-wm/lumina/lumina-1.1.0.ebuild
deleted file mode 100644
index f6fa6b1..0000000
--- a/x11-wm/lumina/lumina-1.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit qmake-utils vcs-snapshot
-
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="http://lumina-desktop.org/"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb:0
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm"
-
-DEPEND="$COMMON_DEPEND
-	dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
-	kde-frameworks/oxygen-icons
-	x11-misc/numlockx
-	x11-wm/fluxbox
-	x11-apps/xbacklight
-	media-sound/alsa-utils
-	sys-power/acpi
-	app-admin/sysstat"
-
-src_configure(){
-	eqmake5 PREFIX="${ROOT}usr" L_BINDIR="${ROOT}usr/bin" \
-		L_ETCDIR="${ROOT}etc" L_LIBDIR="${ROOT}usr/$(get_libdir)" \
-		LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N"
-}
-
-src_install(){
-	# note: desktop files have known validation errors. see:
-	# https://github.com/pcbsd/lumina/pull/183
-	default
-	mv "${D}"/etc/luminaDesktop.conf.dist "${D}"/etc/luminaDesktop.conf || die
-	mv "${D}"/?umina-* "${D}"/usr/bin || die
-	mv "${D}"/start-lumina-desktop "${D}"/usr/bin || die
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}/lumina-session" lumina || die
-}
diff --git a/x11-wm/lumina/lumina-1.2.0.1-r1.ebuild b/x11-wm/lumina/lumina-1.2.0.1-r1.ebuild
new file mode 100644
index 0000000..33b3e87
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.2.0.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils versionator
+DESCRIPTION="Lumina desktop environment"
+HOMEPAGE="http://lumina-desktop.org/"
+I18N="161211"
+V_MAIN="$(get_version_component_range 1-3)"
+V_PATCH="$(get_version_component_range 4)"
+SRC_URI="https://github.com/trueos/${PN}/archive/v${V_MAIN}-p${V_PATCH}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="compton +i18n"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtsvg:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	x11-libs/libxcb:0
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm"
+
+DEPEND="$COMMON_DEPEND
+	dev-qt/linguist-tools:5"
+
+RDEPEND="$COMMON_DEPEND
+	|| (	virtual/freedesktop-icon-theme
+			x11-themes/hicolor-icon-theme )
+	sys-fs/inotify-tools
+	compton? ( x11-misc/compton )
+	x11-misc/numlockx
+	x11-wm/fluxbox
+	x11-apps/xbacklight
+	media-sound/alsa-utils
+	sys-power/acpi
+	app-admin/sysstat"
+
+S="${WORKDIR}/${PN}-${V_MAIN}-p${V_PATCH}"
+
+src_prepare(){
+	default
+
+	rm -rf src-qt5/desktop-utils || die
+
+	sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+}
+
+src_configure(){
+	eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \
+		L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" \
+		$(usex i18n 'CONFIG+=WITH_I18N' 'CONFIG+=NO_I18N')
+}
+
+src_install(){
+	default
+	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
+	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
+}