Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/menumaker/, x11-misc/menumaker/files/
Date: Sun, 28 Jun 2020 10:41:24
Message-Id: 1593340859.62e9539442d47e810e9af04f4b45076ec7df5b28.juippis@gentoo
1 commit: 62e9539442d47e810e9af04f4b45076ec7df5b28
2 Author: Chris Mayo <aklhfex <AT> gmail <DOT> com>
3 AuthorDate: Sun Jun 14 18:16:45 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 28 10:40:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e95394
7
8 x11-misc/menumaker: remove old 0.99.10
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/16207
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 x11-misc/menumaker/Manifest | 1 -
16 .../files/menumaker-0.99.10-AM_PATH_PYTHON.patch | 100 ---------------------
17 x11-misc/menumaker/menumaker-0.99.10.ebuild | 58 ------------
18 3 files changed, 159 deletions(-)
19
20 diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
21 index 075a2e4b8c1..199c44262ce 100644
22 --- a/x11-misc/menumaker/Manifest
23 +++ b/x11-misc/menumaker/Manifest
24 @@ -1,3 +1,2 @@
25 -DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
26 DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
27 DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
28
29 diff --git a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch
30 deleted file mode 100644
31 index 8e645a8b2fb..00000000000
32 --- a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch
33 +++ /dev/null
34 @@ -1,100 +0,0 @@
35 -Use AM_PATH_PYTHON instead of broken hacks
36 -
37 ---- a/configure.ac
38 -+++ b/configure.ac
39 -@@ -1,23 +1,13 @@
40 --AC_INIT(MenuMaker, 0.99.10)
41 -+AC_INIT([MenuMaker], [0.99.10])
42 -
43 - AM_INIT_AUTOMAKE
44 -
45 --#AZ_PYTHON_DEFAULT
46 -+AM_PATH_PYTHON
47 -
48 --#AZ_PYTHON_WITH
49 --
50 --#if test -z "$PYTHON"; then
51 --# AZ_PYTHON_PATH
52 --#fi
53 --
54 --#AZ_PYTHON_VERSION_ENSURE([2.7])
55 --
56 --#AZ_PYTHON_RUN
57 --
58 --AX_PYTHON
59 --
60 --AC_CONFIG_FILES([Makefile])
61 --AC_CONFIG_FILES([doc/Makefile])
62 --AC_CONFIG_FILES([Config.py])
63 -+AC_CONFIG_FILES([
64 -+ Makefile
65 -+ doc/Makefile
66 -+ Config.py
67 -+])
68 -
69 - AC_OUTPUT
70 ---- a/Makefile.am
71 -+++ b/Makefile.am
72 -@@ -1,15 +1,53 @@
73 --ACLOCAL_AMFLAGS = -I m4
74 --
75 - SUBDIRS = doc
76 -
77 - dist_bin_SCRIPTS = mmaker
78 -
79 --nobase_dist_pkgdata_DATA = *.py MenuMaker/*.py Prophet/*.py Prophet/Desktop/*.py Prophet/Legacy/*.py Prophet/Debian/*.py Prophet/Debian/menu/*
80 -+python_PYTHON = \
81 -+ Config.py \
82 -+ Keywords.py \
83 -+ Paths.py
84 -+
85 -+pythonMenuMakerdir = $(pythondir)/MenuMaker
86 -+pythonMenuMaker_PYTHON = \
87 -+ MenuMaker/BlackBox.py \
88 -+ MenuMaker/CLI.py \
89 -+ MenuMaker/Deskmenu.py \
90 -+ MenuMaker/FluxBox.py \
91 -+ MenuMaker/IceWM.py \
92 -+ MenuMaker/__init__.py \
93 -+ MenuMaker/OpenBox3.py \
94 -+ MenuMaker/PekWM.py \
95 -+ MenuMaker/WindowMaker.py \
96 -+ MenuMaker/xBox.py \
97 -+ MenuMaker/Xfce4.py
98 -+
99 -+pythonProphetdir = $(pythondir)/Prophet
100 -+pythonProphet_PYTHON = \
101 -+ Prophet/Categories.py \
102 -+ Prophet/__init__.py
103 -+
104 -+pythonProphetDesktopdir = $(pythondir)/Prophet/Desktop
105 -+pythonProphetDesktop_PYTHON = \
106 -+ Prophet/Desktop/__init__.py
107 -+
108 -+pythonProphetLegacydir = $(pythondir)/Prophet/Legacy
109 -+pythonProphetLegacy_PYTHON = \
110 -+ Prophet/Legacy/Development.py \
111 -+ Prophet/Legacy/Editor.py \
112 -+ Prophet/Legacy/Emulator.py \
113 -+ Prophet/Legacy/Graphics.py \
114 -+ Prophet/Legacy/__init__.py \
115 -+ Prophet/Legacy/Multimedia.py \
116 -+ Prophet/Legacy/Network.py \
117 -+ Prophet/Legacy/Shell.py
118 -
119 --install-exec-local :
120 -- echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker
121 -- echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker
122 -- echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker
123 -+pythonProphetDebiandir = $(pythondir)/Prophet/Debian
124 -+pythonProphetDebian_PYTHON = \
125 -+ Prophet/Debian/__init__.py
126 -
127 --install-data-local :
128 -- $(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")'
129 -+pythonProphetDebianMenudir = $(pythondir)/Prophet/Debian/menu
130 -+dist_pythonProphetDebianMenu_DATA = \
131 -+ Prophet/Debian/menu/debian-2.2r5 \
132 -+ Prophet/Debian/menu/debian-8.1 \
133 -+ Prophet/Debian/menu/ubuntu-5.04 \
134 -+ Prophet/Debian/menu/ubuntu-5.10
135
136 diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.10.ebuild
137 deleted file mode 100644
138 index b7fbd34187e..00000000000
139 --- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
140 +++ /dev/null
141 @@ -1,58 +0,0 @@
142 -# Copyright 1999-2020 Gentoo Authors
143 -# Distributed under the terms of the GNU General Public License v2
144 -
145 -EAPI=6
146 -
147 -PYTHON_COMPAT=( python3_6 )
148 -
149 -inherit autotools python-r1
150 -
151 -DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
152 -HOMEPAGE="http://menumaker.sourceforge.net/"
153 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
154 -
155 -LICENSE="BSD"
156 -SLOT="0"
157 -KEYWORDS="amd64 ~ppc x86"
158 -
159 -IUSE="doc"
160 -
161 -RDEPEND="${PYTHON_DEPS}"
162 -DEPEND="${RDEPEND}
163 - doc? ( sys-apps/texinfo )"
164 -
165 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
166 -
167 -PATCHES=(
168 - "${FILESDIR}"/${PN}-0.99.10-AM_PATH_PYTHON.patch
169 -)
170 -
171 -src_prepare() {
172 - default
173 - eautoreconf
174 -}
175 -
176 -src_configure() {
177 - configure() {
178 - ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
179 - }
180 - python_foreach_impl run_in_build_dir configure
181 -}
182 -
183 -src_compile() {
184 - compile() {
185 - default
186 - use doc && emake html
187 - }
188 - python_foreach_impl run_in_build_dir compile
189 -}
190 -
191 -src_install() {
192 - compile() {
193 - default
194 - use doc && emake DESTDIR="${D}" install-html
195 - }
196 - python_foreach_impl run_in_build_dir compile
197 - python_replicate_script "${ED%/}"/usr/bin/mmaker
198 - einstalldocs
199 -}