commit: 8a35c32c3f09e7988279d744c0670e3286a22d41 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> AuthorDate: Sun Feb 19 09:47:50 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Feb 19 23:43:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a35c32c
x11-misc/genmenu: EAPI bump 4 -> 6, remove openbox support Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4029 x11-misc/genmenu/files/genmenu-1.0.2.patch | 4 ++-- .../genmenu-1.1.0-remove-openbox-support.patch | 28 ++++++++++++++++++++++ ...enmenu-1.1.0.ebuild => genmenu-1.1.0-r1.ebuild} | 15 ++++++------ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/x11-misc/genmenu/files/genmenu-1.0.2.patch b/x11-misc/genmenu/files/genmenu-1.0.2.patch index f8855a48a4..1ad0002441 100644 --- a/x11-misc/genmenu/files/genmenu-1.0.2.patch +++ b/x11-misc/genmenu/files/genmenu-1.0.2.patch @@ -1,5 +1,5 @@ ---- genmenu-orig 2003-05-29 02:26:17.000000000 -0700 -+++ genmenu 2003-05-29 02:35:21.000000000 -0700 +--- a/genmenu-orig 2003-05-29 02:26:17.000000000 -0700 ++++ b/genmenu 2003-05-29 02:35:21.000000000 -0700 @@ -815,6 +815,7 @@ fi diff --git a/x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch b/x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch new file mode 100644 index 0000000000..72ae66927e --- /dev/null +++ b/x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch @@ -0,0 +1,28 @@ +Openbox config files have changed. Genmenu doesn't work anymore with openbox +--- a/genmenu 2012-03-01 20:34:08.000000000 +0200 ++++ b/genmenu 2017-02-19 11:38:53.687593570 +0200 +@@ -111,7 +111,7 @@ + + # Window managers to check for + +-WINDOWMANAGERS="blackbox fluxbox openbox waimea wmaker enlightenment sawfish metacity afterstep icewm xfce 9wm aewm amaterus amiwm ctwm flwm fvwm fvwm2 fvwm95 gwm ion kwin kwm larswm lwm mwm olvwm olwm oroborus phluid pwm qvwn ratpoision sapphire scwm twm ude vtwm wm2 golem" ++WINDOWMANAGERS="blackbox fluxbox waimea wmaker enlightenment sawfish metacity afterstep icewm xfce 9wm aewm amaterus amiwm ctwm flwm fvwm fvwm2 fvwm95 gwm ion kwin kwm larswm lwm mwm olvwm olwm oroborus phluid pwm qvwn ratpoision sapphire scwm twm ude vtwm wm2 golem" + + # Fonts to check for + +@@ -935,15 +935,6 @@ + } + } + +- findprog openbox && { +- yesno "Generate Openbox menu?" && { +- WM="openbox" +- MENUITEMS="$tmp_menuitems $BLACKBOX_APPS" +- realmenu +- bb_interactive openbox .openbox/rc +- } +- } +- + findprog wmaker && { + yesno "Generate Window Maker menu?" && { + WM="wmaker" diff --git a/x11-misc/genmenu/genmenu-1.1.0.ebuild b/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild similarity index 69% rename from x11-misc/genmenu/genmenu-1.1.0.ebuild rename to x11-misc/genmenu/genmenu-1.1.0-r1.ebuild index e464083c46..b5beac32bb 100644 --- a/x11-misc/genmenu/genmenu-1.1.0.ebuild +++ b/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 - -inherit eutils +EAPI=6 DESCRIPTION="menu generator for *box, WindowMaker, and Enlightenment" HOMEPAGE="http://f00l.de/genmenu/"; @@ -17,11 +15,12 @@ IUSE="" RDEPEND="app-shells/bash" -src_prepare() { - epatch "${FILESDIR}"/genmenu-1.0.2.patch -} +PATCHES=( + "${FILESDIR}"/"${PN}"-1.0.2.patch + "${FILESDIR}"/"${P}"-remove-openbox-support.patch +) src_install() { dobin genmenu - dodoc ChangeLog README + einstalldocs }
