gentoo resync : 29.06.2020

3 files changed, 52 insertions, 60 deletions

diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 22a9c568ae14..5efc3849f1a8 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,7 +1,7 @@
-AUX menumaker-0.99.10-AM_PATH_PYTHON.patch 2517 BLAKE2B 45fc07e14f0b89106464b925e68fc3b9b8ea23c14e5091150ed45c7a3a7bf84e310d0cc2437b021f4a83c4d162200b44c5deb23c1a40740dba4379dd682ad964 SHA512 8ba6d7898f5346a6e64ac1cbf17f914c44835f603c9d5952e226063c2d7d3ad64597e41a8a0bbfa4dd12966ddbf53722bc4c28d3ee0e5c860073e08f56fa2805
 AUX menumaker-0.99.11-AM_PATH_PYTHON.patch 2579 BLAKE2B 67b3924544429c998229b439cdaac12aaf6e24aeaf647fd604a9602a25d24250a59c398d7c403744445adf81cf0dc4dcaeb88a07edb0f6181104e0e81aae175d SHA512 f36c5d30981c2e39b37a626eb235f7e9117de18bd774e91058350cceb9859ed9f99a11233f9a72a8acff7a7f84bf657a25e86935623a65986d63ce86734b3c3b
-DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
+AUX menumaker-0.99.12-AM_PATH_PYTHON.patch 2600 BLAKE2B bd7b4b3628c9628ca9b381f292e5919c093d492b2f87ce6ff595be15e57d4e8b92e417fcf8856ed8e7625a1eea337a361c321c0b6f87a23f462f5dc1a79d1756 SHA512 db92e8bde59afa52a3d38681deaab37642830964b717a4bb39134afc607d46f33d983f081e9b96848e63d7f7ea99a3ecdc8df7c0bc3dda5156c3e0d9f8bcaca0
 DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
-EBUILD menumaker-0.99.10.ebuild 1090 BLAKE2B d31876d7b5d2ea5774abe97068be1b189fb258012576c824b76d63a874d2c680fd4477ab5d8de1f28c520c6b0d6cafc9621b702d9a421d995e435dee5f2e8e29 SHA512 22afcce577ac026e8fbaf90f3bab9f4623022ee9ef51fc6b2dc336edae413585405a0dd49f6095ca9fcc1f1aff9f1a4c070e28df1e109efdc1e7410014defa07
+DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
 EBUILD menumaker-0.99.11.ebuild 1085 BLAKE2B 13171e9c329839b33b97c8df86841b3c2deff204c7ed4f45edb647e12d224d34e554d60e4881ebcedb4d20b92c867df990e4a16fc3fa00a3c533738d9ae65e22 SHA512 aa94681b914b862c5ed8dd65adbe9ab96cc694b9f8890be2ec7917dcbc2ee964b903296103e3f0f0c36b38ea76de0d42983c8bacb683c0aca9df21e5ff952dd2
+EBUILD menumaker-0.99.12.ebuild 897 BLAKE2B 48616c0f5e77611b204d55faaec061c4904a69c5b7093c34b2ce24a8bbaf413a5cd8311fa0774c268732a139ff0cd286ede82bd559ca2592d24eab600a8c0657 SHA512 4f4f9665ab7688c59f4232d7c1481ecbfc594fb810064825b5249bd93ef7bcae2a16ec6d68de7ae522325247d284c0d4ea3e35b7298ab7fe35ba4862f210565e
 MISC metadata.xml 439 BLAKE2B cee25e15ca49508e651ba46d0598ee61f0c959bdf46a28337ab0d6071683e6779e8e0d50e36d9aa84ef761f251773ea101eae4dbf1a3b7494d08d2f8778f90e4 SHA512 5f68ee720bbfc364f200335a1045982b4c82aab73e24a8e5143d8a776919b6b676088c5af49ea74cdb09d09cf1f055b596471915f173ab6afbb17bc553a6b07c
diff --git a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.12-AM_PATH_PYTHON.patch
index 8e645a8b2fbc..4df6939ce019 100644
--- a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch
+++ b/x11-misc/menumaker/files/menumaker-0.99.12-AM_PATH_PYTHON.patch
@@ -1,41 +1,8 @@
-Use AM_PATH_PYTHON instead of broken hacks
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,23 +1,13 @@
--AC_INIT(MenuMaker, 0.99.10)
-+AC_INIT([MenuMaker], [0.99.10])
- 
- AM_INIT_AUTOMAKE
- 
--#AZ_PYTHON_DEFAULT
-+AM_PATH_PYTHON
- 
--#AZ_PYTHON_WITH
--
--#if test -z "$PYTHON"; then
--#    AZ_PYTHON_PATH
--#fi
--
--#AZ_PYTHON_VERSION_ENSURE([2.7])
--
--#AZ_PYTHON_RUN
--
--AX_PYTHON
--
--AC_CONFIG_FILES([Makefile])
--AC_CONFIG_FILES([doc/Makefile])
--AC_CONFIG_FILES([Config.py])
-+AC_CONFIG_FILES([
-+	Makefile
-+	doc/Makefile
-+	Config.py
-+])
- 
- AC_OUTPUT
+diff --git a/Makefile.am b/Makefile.am
+index b00b7bc..e1395ac 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,15 +1,53 @@
+@@ -1,15 +1,54 @@
 -ACLOCAL_AMFLAGS = -I m4
 -
  SUBDIRS = doc
@@ -56,6 +23,7 @@ Use AM_PATH_PYTHON instead of broken hacks
 +	MenuMaker/FluxBox.py \
 +	MenuMaker/IceWM.py \
 +	MenuMaker/__init__.py \
++	MenuMaker/JWM.py \
 +	MenuMaker/OpenBox3.py \
 +	MenuMaker/PekWM.py \
 +	MenuMaker/WindowMaker.py \
@@ -98,3 +66,36 @@ Use AM_PATH_PYTHON instead of broken hacks
 +	Prophet/Debian/menu/debian-8.1 \
 +	Prophet/Debian/menu/ubuntu-5.04 \
 +	Prophet/Debian/menu/ubuntu-5.10
+diff --git a/configure.ac b/configure.ac
+index 9ffeee7..604af4e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,22 +2,12 @@ AC_INIT(MenuMaker, 0.99.12)
+ 
+ AM_INIT_AUTOMAKE
+ 
+-#AZ_PYTHON_DEFAULT
++AM_PATH_PYTHON
+ 
+-#AZ_PYTHON_WITH
+-
+-#if test -z "$PYTHON"; then
+-#    AZ_PYTHON_PATH
+-#fi
+-
+-#AZ_PYTHON_VERSION_ENSURE([2.7])
+-
+-#AZ_PYTHON_RUN
+-
+-AX_PYTHON
+-
+-AC_CONFIG_FILES([Makefile])
+-AC_CONFIG_FILES([doc/Makefile])
+-AC_CONFIG_FILES([Config.py])
++AC_CONFIG_FILES([
++	Makefile
++	doc/Makefile
++	Config.py
++])
+ 
+ AC_OUTPUT
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild
index b7fbd34187e3..311238de9188 100644
--- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.12.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools python-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
 HOMEPAGE="http://menumaker.sourceforge.net/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="doc"
 
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.99.10-AM_PATH_PYTHON.patch
+	"${FILESDIR}"/${P}-AM_PATH_PYTHON.patch
 )
 
 src_prepare() {
@@ -33,26 +33,17 @@ src_prepare() {
 }
 
 src_configure() {
-	configure() {
-		ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
-	}
-	python_foreach_impl run_in_build_dir configure
+	ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
 }
 
 src_compile() {
-	compile() {
-		default
-		use doc && emake html
-	}
-	python_foreach_impl run_in_build_dir compile
+	default
+	use doc && emake html
 }
 
 src_install() {
-	compile() {
-		default
-		use doc && emake DESTDIR="${D}" install-html
-	}
-	python_foreach_impl run_in_build_dir compile
-	python_replicate_script "${ED%/}"/usr/bin/mmaker
-	einstalldocs
+	default
+	use doc && emake DESTDIR="${D}" install-html
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/mmaker
 }