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

diff --git a/x11-misc/genmenu/files/genmenu-1.0.2.patch b/x11-misc/genmenu/files/genmenu-1.0.2.patch
index f8855a48a4e321a93a850790dc94f92b5f8fe3b0..1ad0002441d3bc260922c153ecc2c9d7db45d8a8 100644 (file)
--- 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 (file)
index 0000000..72ae669
--- /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 e464083c465476125d224c8a3e4e6c18afb1af0f..b5beac32bbb9444026775fadf78021a1d7b97f7f 100644 (file)
--- 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
 }