commit: e149e15569d118b6726b545bfba07cf3177af626 Author: charIes17 <charles17 <AT> arcor <DOT> de> AuthorDate: Sat Jul 22 11:05:14 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Jul 27 08:08:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e149e155
x11-wm/lumina: Move stuff from eqmake5 to patch for upstream Upstream has a configuration file src-qt5/OS-detect.pri used for distribution specific settings. The idea of this PR is to move as much as possible from the ebuild to a patch for that upstream config file. Package-Manager: Portage-2.3.6, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/5167 x11-wm/lumina/files/1.3.0-OS-detect.patch | 21 ++++++++++++--------- x11-wm/lumina/lumina-1.3.0_p1.ebuild | 5 ++--- x11-wm/lumina/lumina-9999.ebuild | 6 ++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/x11-wm/lumina/files/1.3.0-OS-detect.patch b/x11-wm/lumina/files/1.3.0-OS-detect.patch index e1b71b2a789..48a2076f3aa 100644 --- a/x11-wm/lumina/files/1.3.0-OS-detect.patch +++ b/x11-wm/lumina/files/1.3.0-OS-detect.patch @@ -1,11 +1,14 @@ --- ./src-qt5/OS-detect.pri +++ ./src-qt5/OS-detect.pri -@@ -94,7 +94,7 @@ - isEmpty(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share } - isEmpty(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include } - isEmpty(L_SESSDIR){ L_SESSDIR = $${L_SHAREDIR}/xsessions } -- isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/man } -+ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } - isEmpty(LRELEASE){ LRELEASE = $$[QT_INSTALL_BINS]/lrelease } - isEmpty(MAN_ZIP){ MAN_ZIP = "gzip -c" } - !exists(LRELEASE){ NO_I18N=true } #translations unavailable +@@ -76,6 +76,11 @@ + equals(LINUX_DISTRO,"Fedora"){ + isEmpty(L_ETCDIR){ L_ETCDIR=/etc } + } ++ equals(LINUX_DISTRO,"Gentoo"){ ++ isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } ++ isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc } ++ isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } ++ } + }else{ + OS="Unknown"; + } diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild index deae92b2500..794daf6eea8 100644 --- a/x11-wm/lumina/lumina-1.3.0_p1.ebuild +++ b/x11-wm/lumina/lumina-1.3.0_p1.ebuild @@ -57,9 +57,8 @@ src_prepare(){ } src_configure(){ - eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \ - L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= + eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \ + DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= } src_install(){ diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild index 63c5176b1f2..11c8d155760 100644 --- a/x11-wm/lumina/lumina-9999.ebuild +++ b/x11-wm/lumina/lumina-9999.ebuild @@ -44,7 +44,6 @@ S="${WORKDIR}/${P/_/-}" PATCHES=( "${FILESDIR}/1.2.0-desktop-files.patch" - "${FILESDIR}/1.3.0-OS-detect.patch" ) src_prepare(){ @@ -57,9 +56,8 @@ src_prepare(){ } src_configure(){ - eqmake5 PREFIX="${EPREFIX}/usr" L_BINDIR="${EPREFIX}/usr/bin" \ - L_ETCDIR="${EPREFIX}/etc" L_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= + eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \ + DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= } src_install(){
