gentoo resync : 20.03.2021

4 files changed, 2 insertions, 170 deletions

diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index b5303cb414bf..7abaacd57ae3 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,7 +1,4 @@
-AUX menumaker-0.99.11-AM_PATH_PYTHON.patch 2579 BLAKE2B 67b3924544429c998229b439cdaac12aaf6e24aeaf647fd604a9602a25d24250a59c398d7c403744445adf81cf0dc4dcaeb88a07edb0f6181104e0e81aae175d SHA512 f36c5d30981c2e39b37a626eb235f7e9117de18bd774e91058350cceb9859ed9f99a11233f9a72a8acff7a7f84bf657a25e86935623a65986d63ce86734b3c3b
 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
 DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
-EBUILD menumaker-0.99.11.ebuild 1083 BLAKE2B e5123461019a41dc840748eab0cbcdf6d6ba7ca783054348bf0ff38f04501ebe6030b38efc2481ca50a66519f699dbce02adf4d8ce503d52e3874a0d70ed237e SHA512 15d038e1103322e1e86cfcc9bd21b5a00633f149d45d6e6f3c6153cb40b4d35e580e2cc4e76efa8d942878487cc278b6c35e1b5cca8257710abcf60f77f2c248
 EBUILD menumaker-0.99.12.ebuild 893 BLAKE2B 7056604320104a158ac866216548e7f4d74d385f5b04cebba13c8dc75b0eac706842a4ddb9f79df9f3718e5747f31d5e0b35935bfc42da7e49c6dfc06b6798cd SHA512 1a07ff69c1af53dc8fce9417d261e12a5c4a34cab82c704fec5e88a3371f7cb54bc7b475bfdc3fcd6ac45dcaea7c1a92692eb5de905b3e17d15fe5464a39bd17
-MISC metadata.xml 463 BLAKE2B d9fa2fb06c3c12064fccf263fcba9bdf6763c7d19e72fce75851694a978d18229a59dc6fb4e1d3744b094fca002bc115b9aa524460a43f8b806dbe3c5997194c SHA512 4963c8ee2ddbc9dd8ab2c6bc1a440e6eff3fb12278e0b281fc109ac4a90c1a283afce947068aa1bdc860f8a582296b7efefd753178a91c3694b86f1e6b799d12
+MISC metadata.xml 270 BLAKE2B fc16ae5dd7a1ce8280ce48ede6dc4604eff8234d44d7942c55b2da8fa4e7858e1697cc1bb6112de8091ef152dea2a2d78552a7381aa10b169beb6f460b2efd2c SHA512 d2a12e7e1d81c06c24660de56376cc73981ccf24a55c9f4966ccfcc9608ce590ff1c32bbc354bc77c0648f2af4caab57c80203823111a45a1538cfe09aa9ba3c
diff --git a/x11-misc/menumaker/files/menumaker-0.99.11-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.11-AM_PATH_PYTHON.patch
deleted file mode 100644
index 73cf9b6ff80f..000000000000
--- a/x11-misc/menumaker/files/menumaker-0.99.11-AM_PATH_PYTHON.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index b00b7bc..1c6f12b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,15 +1,53 @@
--ACLOCAL_AMFLAGS = -I m4
--
- SUBDIRS = doc
- 
- dist_bin_SCRIPTS = mmaker
- 
--nobase_dist_pkgdata_DATA = *.py MenuMaker/*.py Prophet/*.py Prophet/Desktop/*.py Prophet/Legacy/*.py Prophet/Debian/*.py Prophet/Debian/menu/*
-+python_PYTHON = \
-+	Config.py \
-+	Keywords.py \
-+	Paths.py
-+
-+pythonMenuMakerdir = $(pythondir)/MenuMaker
-+pythonMenuMaker_PYTHON = \
-+	MenuMaker/BlackBox.py \
-+	MenuMaker/CLI.py \
-+	MenuMaker/Deskmenu.py \
-+	MenuMaker/FluxBox.py \
-+	MenuMaker/IceWM.py \
-+	MenuMaker/__init__.py \
-+	MenuMaker/OpenBox3.py \
-+	MenuMaker/PekWM.py \
-+	MenuMaker/WindowMaker.py \
-+	MenuMaker/xBox.py \
-+	MenuMaker/Xfce4.py
-+
-+pythonProphetdir = $(pythondir)/Prophet
-+pythonProphet_PYTHON = \
-+	Prophet/Categories.py \
-+	Prophet/__init__.py
-+
-+pythonProphetDesktopdir = $(pythondir)/Prophet/Desktop
-+pythonProphetDesktop_PYTHON = \
-+	Prophet/Desktop/__init__.py
-+
-+pythonProphetLegacydir = $(pythondir)/Prophet/Legacy
-+pythonProphetLegacy_PYTHON = \
-+	Prophet/Legacy/Development.py \
-+	Prophet/Legacy/Editor.py \
-+	Prophet/Legacy/Emulator.py \
-+	Prophet/Legacy/Graphics.py \
-+	Prophet/Legacy/__init__.py \
-+	Prophet/Legacy/Multimedia.py \
-+	Prophet/Legacy/Network.py \
-+	Prophet/Legacy/Shell.py
- 
--install-exec-local :
--	echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker
--	echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker
--	echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker
-+pythonProphetDebiandir = $(pythondir)/Prophet/Debian
-+pythonProphetDebian_PYTHON = \
-+	Prophet/Debian/__init__.py
- 
--install-data-local :
--	$(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")'
-+pythonProphetDebianMenudir = $(pythondir)/Prophet/Debian/menu
-+dist_pythonProphetDebianMenu_DATA = \
-+	Prophet/Debian/menu/debian-2.2r5 \
-+	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 248ffcb..1bde23b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,22 +2,12 @@ AC_INIT(MenuMaker, 0.99.11)
- 
- 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.11.ebuild b/x11-misc/menumaker/menumaker-0.99.11.ebuild
deleted file mode 100644
index 9a121fbfd829..000000000000
--- a/x11-misc/menumaker/menumaker-0.99.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
-HOMEPAGE="http://menumaker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-AM_PATH_PYTHON.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	configure() {
-		ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
-	}
-	python_foreach_impl run_in_build_dir configure
-}
-
-src_compile() {
-	compile() {
-		default
-		use doc && emake html
-	}
-	python_foreach_impl run_in_build_dir compile
-}
-
-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
-}
diff --git a/x11-misc/menumaker/metadata.xml b/x11-misc/menumaker/metadata.xml
index 735d21bbe5bb..281b6021f57d 100644
--- a/x11-misc/menumaker/metadata.xml
+++ b/x11-misc/menumaker/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>aklhfex@gmail.com</email>
-		<name>Chris Mayo</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">menumaker</remote-id>