x11-wm/lumina: fixes for bug #57320.

diff --git a/x11-wm/lumina/lumina-0.8.8_p1.ebuild b/x11-wm/lumina/lumina-0.8.8_p1.ebuild
index fbc0e74602af5a8940f8d2d84c614da821a80d57..9be26746b04f6786e5d1c6b3c29e6bde6ff14c7c 100644 (file)
--- a/x11-wm/lumina/lumina-0.8.8_p1.ebuild
+++ b/x11-wm/lumina/lumina-0.8.8_p1.ebuild
@@ -15,10 +15,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-qt/linguist-tools:5
+COMMON_DEPEND="dev-qt/qtcore:5
        dev-qt/qtconcurrent:5
-       dev-qt/qtcore:5
-       dev-qt/qtmultimedia:5
+       dev-qt/qtmultimedia:5[widgets]
+       dev-qt/qtsvg:5
        dev-qt/qtnetwork:5
        dev-qt/qtwidgets:5
        dev-qt/qtx11extras:5
@@ -27,7 +27,10 @@ DEPEND="dev-qt/linguist-tools:5
        x11-libs/xcb-util-image
        x11-libs/xcb-util-wm"
 
-RDEPEND="${DEPEND}
+DEPEND="$COMMON_DEPEND
+       dev-qt/linguist-tools:5"
+
+RDEPEND="$COMMON_DEPEND
        kde-frameworks/oxygen-icons
        x11-misc/numlockx
        x11-wm/fluxbox
@@ -37,10 +40,14 @@ RDEPEND="${DEPEND}
        app-admin/sysstat"
 
 src_configure(){
-       eqmake5 PREFIX="${ROOT}usr" L_ETCDIR="${ROOT}etc" LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N"
+       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

diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
index 606868b1771492c78194b0db1532a7e814826678..cd89ea63f19e7a9fb0837e8e3ead57f516caf587 100644 (file)
--- a/x11-wm/lumina/lumina-9999.ebuild
+++ b/x11-wm/lumina/lumina-9999.ebuild
@@ -14,10 +14,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND="dev-qt/linguist-tools:5
+COMMON_DEPEND="dev-qt/qtcore:5
        dev-qt/qtconcurrent:5
-       dev-qt/qtcore:5
-       dev-qt/qtmultimedia:5
+       dev-qt/qtmultimedia:5[widgets]
+       dev-qt/qtsvg:5
        dev-qt/qtnetwork:5
        dev-qt/qtwidgets:5
        dev-qt/qtx11extras:5
@@ -26,7 +26,10 @@ DEPEND="dev-qt/linguist-tools:5
        x11-libs/xcb-util-image
        x11-libs/xcb-util-wm"
 
-RDEPEND="${DEPEND}
+DEPEND="$COMMON_DEPEND
+       dev-qt/linguist-tools:5"
+
+RDEPEND="$COMMON_DEPEND
        kde-frameworks/oxygen-icons
        x11-misc/numlockx
        x11-wm/fluxbox
@@ -36,10 +39,14 @@ RDEPEND="${DEPEND}
        app-admin/sysstat"
 
 src_configure(){
-       eqmake5 PREFIX="${ROOT}usr" L_ETCDIR="${ROOT}etc" LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N"
+       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