| 1 |
commit: 03c876a55b7306290648331d3be6a9345b68689d |
| 2 |
Author: Rubin Simons <rubin.simons <AT> raaftech <DOT> com> |
| 3 |
AuthorDate: Mon Mar 28 08:48:09 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 16:54:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c876a5 |
| 7 |
|
| 8 |
x11-wm/lumina: fixes for bug #57320. |
| 9 |
|
| 10 |
x11-wm/lumina/lumina-0.8.8_p1.ebuild | 17 ++++++++++++----- |
| 11 |
x11-wm/lumina/lumina-9999.ebuild | 17 ++++++++++++----- |
| 12 |
2 files changed, 24 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/x11-wm/lumina/lumina-0.8.8_p1.ebuild b/x11-wm/lumina/lumina-0.8.8_p1.ebuild |
| 15 |
index fbc0e74..9be2674 100644 |
| 16 |
--- a/x11-wm/lumina/lumina-0.8.8_p1.ebuild |
| 17 |
+++ b/x11-wm/lumina/lumina-0.8.8_p1.ebuild |
| 18 |
@@ -15,10 +15,10 @@ LICENSE="BSD" |
| 19 |
SLOT="0" |
| 20 |
KEYWORDS="~amd64 ~x86" |
| 21 |
|
| 22 |
-DEPEND="dev-qt/linguist-tools:5 |
| 23 |
+COMMON_DEPEND="dev-qt/qtcore:5 |
| 24 |
dev-qt/qtconcurrent:5 |
| 25 |
- dev-qt/qtcore:5 |
| 26 |
- dev-qt/qtmultimedia:5 |
| 27 |
+ dev-qt/qtmultimedia:5[widgets] |
| 28 |
+ dev-qt/qtsvg:5 |
| 29 |
dev-qt/qtnetwork:5 |
| 30 |
dev-qt/qtwidgets:5 |
| 31 |
dev-qt/qtx11extras:5 |
| 32 |
@@ -27,7 +27,10 @@ DEPEND="dev-qt/linguist-tools:5 |
| 33 |
x11-libs/xcb-util-image |
| 34 |
x11-libs/xcb-util-wm" |
| 35 |
|
| 36 |
-RDEPEND="${DEPEND} |
| 37 |
+DEPEND="$COMMON_DEPEND |
| 38 |
+ dev-qt/linguist-tools:5" |
| 39 |
+ |
| 40 |
+RDEPEND="$COMMON_DEPEND |
| 41 |
kde-frameworks/oxygen-icons |
| 42 |
x11-misc/numlockx |
| 43 |
x11-wm/fluxbox |
| 44 |
@@ -37,10 +40,14 @@ RDEPEND="${DEPEND} |
| 45 |
app-admin/sysstat" |
| 46 |
|
| 47 |
src_configure(){ |
| 48 |
- eqmake5 PREFIX="${ROOT}usr" L_ETCDIR="${ROOT}etc" LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" |
| 49 |
+ eqmake5 PREFIX="${ROOT}usr" L_BINDIR="${ROOT}usr/bin" \ |
| 50 |
+ L_ETCDIR="${ROOT}etc" L_LIBDIR="${ROOT}usr/$(get_libdir)" \ |
| 51 |
+ LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" |
| 52 |
} |
| 53 |
|
| 54 |
src_install(){ |
| 55 |
+ # note: desktop files have known validation errors. see: |
| 56 |
+ # https://github.com/pcbsd/lumina/pull/183 |
| 57 |
default |
| 58 |
mv "${D}"/etc/luminaDesktop.conf.dist "${D}"/etc/luminaDesktop.conf || die |
| 59 |
mv "${D}"/?umina-* "${D}"/usr/bin || die |
| 60 |
|
| 61 |
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild |
| 62 |
index 606868b..cd89ea6 100644 |
| 63 |
--- a/x11-wm/lumina/lumina-9999.ebuild |
| 64 |
+++ b/x11-wm/lumina/lumina-9999.ebuild |
| 65 |
@@ -14,10 +14,10 @@ LICENSE="BSD" |
| 66 |
SLOT="0" |
| 67 |
KEYWORDS="" |
| 68 |
|
| 69 |
-DEPEND="dev-qt/linguist-tools:5 |
| 70 |
+COMMON_DEPEND="dev-qt/qtcore:5 |
| 71 |
dev-qt/qtconcurrent:5 |
| 72 |
- dev-qt/qtcore:5 |
| 73 |
- dev-qt/qtmultimedia:5 |
| 74 |
+ dev-qt/qtmultimedia:5[widgets] |
| 75 |
+ dev-qt/qtsvg:5 |
| 76 |
dev-qt/qtnetwork:5 |
| 77 |
dev-qt/qtwidgets:5 |
| 78 |
dev-qt/qtx11extras:5 |
| 79 |
@@ -26,7 +26,10 @@ DEPEND="dev-qt/linguist-tools:5 |
| 80 |
x11-libs/xcb-util-image |
| 81 |
x11-libs/xcb-util-wm" |
| 82 |
|
| 83 |
-RDEPEND="${DEPEND} |
| 84 |
+DEPEND="$COMMON_DEPEND |
| 85 |
+ dev-qt/linguist-tools:5" |
| 86 |
+ |
| 87 |
+RDEPEND="$COMMON_DEPEND |
| 88 |
kde-frameworks/oxygen-icons |
| 89 |
x11-misc/numlockx |
| 90 |
x11-wm/fluxbox |
| 91 |
@@ -36,10 +39,14 @@ RDEPEND="${DEPEND} |
| 92 |
app-admin/sysstat" |
| 93 |
|
| 94 |
src_configure(){ |
| 95 |
- eqmake5 PREFIX="${ROOT}usr" L_ETCDIR="${ROOT}etc" LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" |
| 96 |
+ eqmake5 PREFIX="${ROOT}usr" L_BINDIR="${ROOT}usr/bin" \ |
| 97 |
+ L_ETCDIR="${ROOT}etc" L_LIBDIR="${ROOT}usr/$(get_libdir)" \ |
| 98 |
+ LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" |
| 99 |
} |
| 100 |
|
| 101 |
src_install(){ |
| 102 |
+ # note: desktop files have known validation errors. see: |
| 103 |
+ # https://github.com/pcbsd/lumina/pull/183 |
| 104 |
default |
| 105 |
mv "${D}"/etc/luminaDesktop.conf.dist "${D}"/etc/luminaDesktop.conf || die |
| 106 |
mv "${D}"/?umina-* "${D}"/usr/bin || die |
Archives