From 8a35c32c3f09e7988279d744c0670e3286a22d41 Mon Sep 17 00:00:00 2001 From: Harri Nieminen Date: Sun, 19 Feb 2017 11:47:50 +0200 Subject: 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 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch (limited to 'x11-misc/genmenu/files') 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" -- cgit v1.2.3-65-gdbad