commit: b651b694caf33e73462574468bdf24478bc83894 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> AuthorDate: Tue Feb 28 08:03:28 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Mar 1 20:44:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b651b694
x11-misc/launchy: EAPI bump 4 -> 6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4091 .../files/launchy-2.5-prefix-and-libdir.patch | 112 +++++++++++++++++++++ .../{launchy-2.5.ebuild => launchy-2.5-r1.ebuild} | 32 ++++-- 2 files changed, 133 insertions(+), 11 deletions(-) diff --git a/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch b/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch new file mode 100644 index 00000000000..5b277786e87 --- /dev/null +++ b/x11-misc/launchy/files/launchy-2.5-prefix-and-libdir.patch @@ -0,0 +1,112 @@ +diff -ur a/platforms/unix/unix.pro b/platforms/unix/unix.pro +--- a/platforms/unix/unix.pro 2008-09-01 03:40:56.000000000 +0300 ++++ b/platforms/unix/unix.pro 2017-03-01 15:44:50.201858265 +0200 +@@ -11,11 +11,10 @@ + + + unix { +- PREFIX = /usr + DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \ +- PLUGINS_PATH=\\\"$$PREFIX/lib/launchy/plugins/\\\" \ +- PLATFORMS_PATH=\\\"$$PREFIX/lib/launchy/\\\" +- target.path = $$PREFIX/lib/launchy/ ++ PLUGINS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/plugins/\\\" \ ++ PLATFORMS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/\\\" ++ target.path = $$PREFIX/$$LIBDIR/launchy/ + INSTALLS += target + } + +diff -ur a/plugins/calcy/calcy.pro b/plugins/calcy/calcy.pro +--- a/plugins/calcy/calcy.pro 2010-03-08 01:02:22.000000000 +0200 ++++ b/plugins/calcy/calcy.pro 2017-03-01 15:46:49.252849881 +0200 +@@ -26,9 +26,8 @@ + + + unix:!macx { +- PREFIX = /usr +- target.path = $$PREFIX/lib/launchy/plugins/ +- icon.path = $$PREFIX/lib/launchy/plugins/icons/ ++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/ ++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/ + icon.files = calcy.png + INSTALLS += target \ + icon +diff -ur a/plugins/gcalc/gcalc.pro b/plugins/gcalc/gcalc.pro +--- a/plugins/gcalc/gcalc.pro 2010-02-15 23:07:34.000000000 +0200 ++++ b/plugins/gcalc/gcalc.pro 2017-03-01 15:48:00.542647288 +0200 +@@ -19,10 +19,9 @@ + if(!debug_and_release|build_pass):CONFIG(debug, debug|release):DESTDIR = ../../debug/plugins + if(!debug_and_release|build_pass):CONFIG(release, debug|release):DESTDIR = ../../release/plugins + unix:!macx { +- PREFIX = /usr +- target.path = $$PREFIX/lib/launchy/plugins/ ++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/ + +- # icon.path = $$PREFIX/lib/launchy/plugins/icons/ ++ # icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/ + # icon.files = gcalc.png + INSTALLS += target + } +diff -ur a/plugins/runner/runner.pro b/plugins/runner/runner.pro +--- a/plugins/runner/runner.pro 2010-02-15 23:07:34.000000000 +0200 ++++ b/plugins/runner/runner.pro 2017-03-01 15:46:22.202306212 +0200 +@@ -42,9 +42,8 @@ + } + + unix:!macx { +- PREFIX = /usr +- target.path = $$PREFIX/lib/launchy/plugins/ +- icon.path = $$PREFIX/lib/launchy/plugins/icons/ ++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/ ++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/ + icon.files = runner.png + INSTALLS += target icon + } +diff -ur a/plugins/verby/verby.pro b/plugins/verby/verby.pro +--- a/plugins/verby/verby.pro 2010-02-15 23:07:34.000000000 +0200 ++++ b/plugins/verby/verby.pro 2017-03-01 15:47:09.785503507 +0200 +@@ -31,9 +31,8 @@ + /WX + } + unix:!macx { +- PREFIX = /usr +- target.path = $$PREFIX/lib/launchy/plugins/ +- icon.path = $$PREFIX/lib/launchy/plugins/icons/ ++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/ ++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/ + icon.files = verby.png copy.png opencontainer.png properties.png run.png + INSTALLS += target \ + icon +diff -ur a/plugins/weby/weby.pro b/plugins/weby/weby.pro +--- a/plugins/weby/weby.pro 2010-02-15 23:07:34.000000000 +0200 ++++ b/plugins/weby/weby.pro 2017-03-01 15:47:30.764149617 +0200 +@@ -32,9 +32,8 @@ + if(!debug_and_release|build_pass):CONFIG(debug, debug|release):DESTDIR = ../../debug/plugins + if(!debug_and_release|build_pass):CONFIG(release, debug|release):DESTDIR = ../../release/plugins + unix:!macx { +- PREFIX = /usr +- target.path = $$PREFIX/lib/launchy/plugins/ +- icon.path = $$PREFIX/lib/launchy/plugins/icons/ ++ target.path = $$PREFIX/$$LIBDIR/launchy/plugins/ ++ icon.path = $$PREFIX/$$LIBDIR/launchy/plugins/icons/ + icon.files = weby.png + INSTALLS += target \ + icon +diff -ur a/src/src.pro b/src/src.pro +--- a/src/src.pro 2017-03-01 15:50:28.430152700 +0200 ++++ b/src/src.pro 2017-03-01 15:51:18.931300883 +0200 +@@ -71,11 +71,10 @@ + platform_base_hotkey.h \ + platform_base_hottrigger.h + +- PREFIX = /usr + LIBS += -lX11 -lXext -lXrender + DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \ +- PLUGINS_PATH=\\\"$$PREFIX/lib/launchy/plugins/\\\" \ +- PLATFORMS_PATH=\\\"$$PREFIX/lib/launchy/\\\" ++ PLUGINS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/plugins/\\\" \ ++ PLATFORMS_PATH=\\\"$$PREFIX/$$LIBDIR/launchy/\\\" + if(!debug_and_release|build_pass) { + CONFIG(debug, debug|release):DESTDIR = ../debug/ + CONFIG(release, debug|release):DESTDIR = ../release/ +Only in a/src: src.pro.orig diff --git a/x11-misc/launchy/launchy-2.5.ebuild b/x11-misc/launchy/launchy-2.5-r1.ebuild similarity index 56% rename from x11-misc/launchy/launchy-2.5.ebuild rename to x11-misc/launchy/launchy-2.5-r1.ebuild index 566d790d567..8b1a33abaef 100644 --- a/x11-misc/launchy/launchy-2.5.ebuild +++ b/x11-misc/launchy/launchy-2.5-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit fdo-mime gnome2-utils qt4-r2 +EAPI=6 +inherit fdo-mime gnome2-utils qmake-utils DESCRIPTION="utility that merges application menus, your desktop and even your file manager" HOMEPAGE="http://www.launchy.net/"; @@ -13,17 +13,27 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-qt/qtgui:4" +RDEPEND=" + dev-qt/qtgui:4 + x11-libs/libX11 +" DEPEND="${RDEPEND} - dev-libs/boost" + dev-libs/boost + x11-proto/xproto +" -PATCHES=( "${FILESDIR}"/${P}-underlink.patch ) +PATCHES=( + "${FILESDIR}"/${P}-underlink.patch + "${FILESDIR}"/${P}-prefix-and-libdir.patch +) -src_prepare() { - sed -i -e "s:lib/launchy:$(get_libdir)/launchy:" src/src.pro \ - platforms/unix/unix.pro \ - plugins/*/*.pro || die "sed failed" - qt4-r2_src_prepare +src_configure() { + eqmake4 Launchy.pro PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)" +} + +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs } pkg_preinst() {
