Merge remote-tracking branch 'origin/master'

1 files changed, 39 insertions, 16 deletions

diff --git a/port-files/lumina-9999.ebuild b/port-files/lumina-9999.ebuild
index c8dd7108..dca8574c 100644
--- a/port-files/lumina-9999.ebuild
+++ b/port-files/lumina-9999.ebuild
@@ -5,38 +5,61 @@
 
 EAPI=6
 
-inherit git-r3 qmake-utils versionator
-
+inherit git-r3 qmake-utils
 DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://github.com/pcbsd/${PN}"
-SRC_URI=""
-EGIT_REPO_URI="${HOMEPAGE}"
+HOMEPAGE="https://lumina-desktop.org/"
+EGIT_REPO_URI="https://github.com/pcbsd/lumina"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS=""
+IUSE="desktop-utils"
 
-DEPEND="dev-qt/linguist-tools:5
-    dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtmultimedia:5
+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
+	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"
-RDEPEND="${DEPEND}
+
+DEPEND="$COMMON_DEPEND
+	dev-qt/linguist-tools:5"
+
+RDEPEND="$COMMON_DEPEND
+	sys-fs/inotify-tools
 	x11-misc/numlockx
 	x11-wm/fluxbox
-	x11-apps/xbacklight
+	|| ( x11-apps/xbacklight
+	sys-power/acpilight )
 	media-sound/alsa-utils
 	sys-power/acpi
 	app-admin/sysstat"
 
-src_compile(){
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare(){
+	default
+
+	if use !desktop-utils ; then
+		rm -rf src-qt5/desktop-utils || die
+		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
+	fi
+}
+
+src_configure(){
+	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
+}
 
-	eqmake5 PREFIX="${ROOT}usr" LIBPREFIX="${ROOT}usr/lib" DESTDIR="${D}" CONFIG+="NO_I18N"
-	emake
+src_install(){
+	default
+	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
+	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
 }