| 1 |
commit: e149e15569d118b6726b545bfba07cf3177af626 |
| 2 |
Author: charIes17 <charles17 <AT> arcor <DOT> de> |
| 3 |
AuthorDate: Sat Jul 22 11:05:14 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 27 08:08:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e149e155 |
| 7 |
|
| 8 |
x11-wm/lumina: Move stuff from eqmake5 to patch for upstream |
| 9 |
|
| 10 |
Upstream has a configuration file src-qt5/OS-detect.pri used |
| 11 |
for distribution specific settings. |
| 12 |
|
| 13 |
The idea of this PR is to move as much as possible from |
| 14 |
the ebuild to a patch for that upstream config file. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/5167 |
| 18 |
|
| 19 |
x11-wm/lumina/files/1.3.0-OS-detect.patch | 21 ++++++++++++--------- |
| 20 |
x11-wm/lumina/lumina-1.3.0_p1.ebuild | 5 ++--- |
| 21 |
x11-wm/lumina/lumina-9999.ebuild | 6 ++---- |
| 22 |
3 files changed, 16 insertions(+), 16 deletions(-) |
| 23 |
|
| 24 |
diff --git a/x11-wm/lumina/files/1.3.0-OS-detect.patch b/x11-wm/lumina/files/1.3.0-OS-detect.patch |
| 25 |
index e1b71b2a789..48a2076f3aa 100644 |
| 26 |
--- a/x11-wm/lumina/files/1.3.0-OS-detect.patch |
| 27 |
+++ b/x11-wm/lumina/files/1.3.0-OS-detect.patch |
| 28 |
@@ -1,11 +1,14 @@ |
| 29 |
--- ./src-qt5/OS-detect.pri |
| 30 |
+++ ./src-qt5/OS-detect.pri |
| 31 |
-@@ -94,7 +94,7 @@ |
| 32 |
- isEmpty(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share } |
| 33 |
- isEmpty(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include } |
| 34 |
- isEmpty(L_SESSDIR){ L_SESSDIR = $${L_SHAREDIR}/xsessions } |
| 35 |
-- isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/man } |
| 36 |
-+ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } |
| 37 |
- isEmpty(LRELEASE){ LRELEASE = $$[QT_INSTALL_BINS]/lrelease } |
| 38 |
- isEmpty(MAN_ZIP){ MAN_ZIP = "gzip -c" } |
| 39 |
- !exists(LRELEASE){ NO_I18N=true } #translations unavailable |
| 40 |
+@@ -76,6 +76,11 @@ |
| 41 |
+ equals(LINUX_DISTRO,"Fedora"){ |
| 42 |
+ isEmpty(L_ETCDIR){ L_ETCDIR=/etc } |
| 43 |
+ } |
| 44 |
++ equals(LINUX_DISTRO,"Gentoo"){ |
| 45 |
++ isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } |
| 46 |
++ isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc } |
| 47 |
++ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } |
| 48 |
++ } |
| 49 |
+ }else{ |
| 50 |
+ OS="Unknown"; |
| 51 |
+ } |
| 52 |
|
| 53 |
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild |
| 54 |
index deae92b2500..794daf6eea8 100644 |
| 55 |
--- a/x11-wm/lumina/lumina-1.3.0_p1.ebuild |
| 56 |
+++ b/x11-wm/lumina/lumina-1.3.0_p1.ebuild |
| 57 |
@@ -57,9 +57,8 @@ src_prepare(){ |
| 58 |
} |
| 59 |
|
| 60 |
src_configure(){ |
| 61 |
- eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \ |
| 62 |
- L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 63 |
- LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= |
| 64 |
+ eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \ |
| 65 |
+ DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= |
| 66 |
} |
| 67 |
|
| 68 |
src_install(){ |
| 69 |
|
| 70 |
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild |
| 71 |
index 63c5176b1f2..11c8d155760 100644 |
| 72 |
--- a/x11-wm/lumina/lumina-9999.ebuild |
| 73 |
+++ b/x11-wm/lumina/lumina-9999.ebuild |
| 74 |
@@ -44,7 +44,6 @@ S="${WORKDIR}/${P/_/-}" |
| 75 |
|
| 76 |
PATCHES=( |
| 77 |
"${FILESDIR}/1.2.0-desktop-files.patch" |
| 78 |
- "${FILESDIR}/1.3.0-OS-detect.patch" |
| 79 |
) |
| 80 |
|
| 81 |
src_prepare(){ |
| 82 |
@@ -57,9 +56,8 @@ src_prepare(){ |
| 83 |
} |
| 84 |
|
| 85 |
src_configure(){ |
| 86 |
- eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \ |
| 87 |
- L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 88 |
- LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= |
| 89 |
+ eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \ |
| 90 |
+ DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= |
| 91 |
} |
| 92 |
|
| 93 |
src_install(){ |
Archives