* [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/
@ 2016-03-29 16:48 99% Anthony G. Basile
0 siblings, 0 replies; 1+ results
From: Anthony G. Basile @ 2016-03-29 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 03c876a55b7306290648331d3be6a9345b68689d
Author: Rubin Simons <rubin.simons <AT> raaftech <DOT> com>
AuthorDate: Mon Mar 28 08:48:09 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 16:54:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c876a5
x11-wm/lumina: fixes for bug #57320.
x11-wm/lumina/lumina-0.8.8_p1.ebuild | 17 ++++++++++++-----
x11-wm/lumina/lumina-9999.ebuild | 17 ++++++++++++-----
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/x11-wm/lumina/lumina-0.8.8_p1.ebuild b/x11-wm/lumina/lumina-0.8.8_p1.ebuild
index fbc0e74..9be2674 100644
--- 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 606868b..cd89ea6 100644
--- 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
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-03-29 16:48 99% [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/ Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox