diff options
| author |   Harri Nieminen <moikkis@gmail.com> | 2017-02-19 11:47:50 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-02-20 00:43:48 +0100 |
| commit | 8a35c32c3f09e7988279d744c0670e3286a22d41 (patch) | |
| tree | 6fb04361bfa328517598b735315f02759ebc64f1 /x11-misc | |
| parent | x11-misc/gccmakedep: Drop old (diff) | |
| download | gentoo-8a35c32c3f09e7988279d744c0670e3286a22d41.tar.gz gentoo-8a35c32c3f09e7988279d744c0670e3286a22d41.tar.bz2 gentoo-8a35c32c3f09e7988279d744c0670e3286a22d41.zip | |
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
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/genmenu/files/genmenu-1.0.2.patch | 4 | ||||
| -rw-r--r-- | x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch | 28 | ||||
| -rw-r--r-- | x11-misc/genmenu/genmenu-1.1.0-r1.ebuild (renamed from x11-misc/genmenu/genmenu-1.1.0.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 f8855a48a4e3..1ad0002441d3 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 000000000000..72ae66927e17 --- /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 index e464083c4654..b5beac32bbb9 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 } |