Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/gentoolkit/files/, app-portage/gentoolkit/
Date: Wed, 22 Nov 2017 00:22:20
Message-Id: 1511310114.17ee4dbf1ddb843028d3a63e806d37303e55f054.dilfridge@gentoo
1 commit: 17ee4dbf1ddb843028d3a63e806d37303e55f054
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 22 00:21:54 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 22 00:21:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ee4dbf
7
8 app-portage/gentoolkit: Drop old
9
10 Package-Manager: Portage-2.3.14, Repoman-2.3.6
11
12 app-portage/gentoolkit/Manifest | 6 +-
13 .../files/0.3.0.8-revdep-rebuild-476740.patch | 33 ---------
14 .../files/0.3.0.8-revdep-rebuild-484340.patch | 46 ------------
15 .../gentoolkit/files/0.3.2-helpers.py-589686.patch | 30 --------
16 .../gentoolkit/gentoolkit-0.3.0.8-r2.ebuild | 82 ----------------------
17 app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild | 74 -------------------
18 6 files changed, 2 insertions(+), 269 deletions(-)
19
20 diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
21 index 6c44fed2047..dd6834288d6 100644
22 --- a/app-portage/gentoolkit/Manifest
23 +++ b/app-portage/gentoolkit/Manifest
24 @@ -1,4 +1,2 @@
25 -DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 0338dee7c295c32b60a84e529b764d2bc61536fa3aca021cd5a75c6e534864a6 SHA512 50efd701d0d056740bcf7c7cdce652ae7c9e2786f799f5d30946e752b8aa735489d3e0dc5c7664a5810a0f22cec05b9bc7ccc10292b07ac4dd0777658651f72d WHIRLPOOL 5a2455e50d4e0f4df8abab5b81deb6bb00e078dfed1687ae046ce97a0427eafea2d3de9b83ac6de8155d207653d001c6684ac92226fa2320515c6e14c8fea6e0
26 -DIST gentoolkit-0.3.2.tar.gz 3198294 SHA256 f3bb38d663c1b153447556b5265df5a11b6ed78411e761335b692111c823d9dd SHA512 e174ac7f12d45703515876ea558a661e1d0c5d4cc71d2d64ee793786e2a2d3d2b309500b6e1891774e3415de74922efc77553c0103d695f5dda91def9a6ac637 WHIRLPOOL 67192702f72f437cc31aeeef8bf005c83a4a9322e9fa0de3c1e0d229bfb95d7363f14a8902da5ffbf49dee45cd587286899ea1ead017cd7d18d0f852cc7fd9fb
27 -DIST gentoolkit-0.3.3.tar.gz 3197037 SHA256 bb1fd78a6063efffd4e8402cd799f2c22ed2bbf440c26390aab68bfb6f4ee982 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691 WHIRLPOOL 81c2aa8cb36d9c6abef99729b07c9cc5402d66ccfd8523a4cee57ed99d2b4c2ab0db6c77dccdc90597bd11d60e11823130dd1136eeaba9b2a18383da3e9c5f25
28 -DIST gentoolkit-0.4.0.tar.gz 3215377 SHA256 3696b45b304b4b789f21d897e09311cf08474dcd9247dd3143bce95ffba5a220 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56 WHIRLPOOL 0114e0e2274b198aca5bbadce6baf5b6595be92e48d322c759826d1143d7d82ea2deb91ba2f8133e5b554567b7ce62081b5e7df24fa3b029bb50041ce99509db
29 +DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B c2a45971f1f25e3008422b63b59042ca0f2b170b98e10fc4e449ee6be76c0422469cd8bce1b744830404d5a26ba87ded47aab679069965eea266719249475923 SHA512 ad142c2c66e7f7a2e4184c8f95e394ee783cd57808e6254e9f5df0f3f60ad842042f773716ca0fd6d7545bb8a2d11c1c167a4ec471eb3238c8ee3a519f70a691
30 +DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56
31
32 diff --git a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch
33 deleted file mode 100644
34 index 8832838bd33..00000000000
35 --- a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-476740.patch
36 +++ /dev/null
37 @@ -1,33 +0,0 @@
38 -From 87a01450ab33220f6f0821d4f4209004cdc3aa8b Mon Sep 17 00:00:00 2001
39 -From: Paul Varner <fuzzyray@g.o>
40 -Date: Tue, 10 Sep 2013 13:52:28 -0500
41 -Subject: [PATCH] Fix Ctrl-C handling when running emerge (Bug 476740).
42 -
43 ----
44 - bin/revdep-rebuild.sh | 3 ++-
45 - 1 file changed, 2 insertions(+), 1 deletion(-)
46 -
47 -diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
48 -index 6cb5608..09f5135 100755
49 ---- a/bin/revdep-rebuild.sh
50 -+++ b/bin/revdep-rebuild.sh
51 -@@ -1052,6 +1052,7 @@ portage_settings() {
52 - if [[ -n ${REVDEP_REBUILD_DEFAULT_OPTS} ]]; then
53 - EMERGE_DEFAULT_OPTS=("${REVDEP_REBUILD_DEFAULT_OPTS[@]}")
54 - fi
55 -+
56 - }
57 -
58 - ##
59 -@@ -1138,7 +1139,7 @@ rebuild() {
60 - REBUILD_LIST=$(sort -u "$EBUILDS_FILE")
61 - fi
62 -
63 -- trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
64 -+ trap "kill 0" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
65 -
66 - [[ $QUIET -ne 1 ]] && einfo 'All prepared. Starting rebuild'
67 - echo "emerge --complete-graph=y --oneshot ${EMERGE_DEFAULT_OPTS[@]} ${EMERGE_OPTIONS[@]} $REBUILD_LIST"
68 ---
69 -1.8.3.2
70 -
71
72 diff --git a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch b/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch
73 deleted file mode 100644
74 index 1a0393dac48..00000000000
75 --- a/app-portage/gentoolkit/files/0.3.0.8-revdep-rebuild-484340.patch
76 +++ /dev/null
77 @@ -1,46 +0,0 @@
78 -From db997501ec8e0ef0c5e4426649c17d2498b40e06 Mon Sep 17 00:00:00 2001
79 -From: Paul Varner <fuzzyray@g.o>
80 -Date: Tue, 10 Sep 2013 10:59:31 -0500
81 -Subject: [PATCH] Fix use of REVDEP_REBUILD_DEFAULT_OPTS (Bug 484340).
82 -
83 ----
84 - bin/revdep-rebuild.sh | 7 ++-----
85 - 1 file changed, 2 insertions(+), 5 deletions(-)
86 -
87 -diff --git a/bin/revdep-rebuild.sh b/bin/revdep-rebuild.sh
88 -index 7f848bc..6cb5608 100755
89 ---- a/bin/revdep-rebuild.sh
90 -+++ b/bin/revdep-rebuild.sh
91 -@@ -1034,27 +1034,24 @@ portage_settings() {
92 - local ORIG_SEARCH_DIRS="$SEARCH_DIRS"
93 - local ORIG_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK"
94 - local ORIG_LD_LIBRARY_MASK="$LD_LIBRARY_MASK"
95 -- local ORIG_REVDEP_REBUILD_DEFAULT_OPTS="$REVDEP_REBUILD_DEFAULT_OPTS"
96 - unset SEARCH_DIRS
97 - unset SEARCH_DIRS_MASK
98 - unset LD_LIBRARY_MASK
99 -- unset REVDEP_REBUILD_DEFAULT_OPTS
100 -
101 - eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK REVDEP_REBUILD_DEFAULT_OPTS)
102 - export NOCOLOR
103 -
104 - # Convert quoted paths to array.
105 - eval "EMERGE_DEFAULT_OPTS=(${EMERGE_DEFAULT_OPTS})"
106 -+ eval "REVDEP_REBUILD_DEFAULT_OPTS=(${REVDEP_REBUILD_DEFAULT_OPTS})"
107 - SEARCH_DIRS="$ORIG_SEARCH_DIRS $SEARCH_DIRS"
108 - SEARCH_DIRS_MASK="$ORIG_SEARCH_DIRS_MASK $SEARCH_DIRS_MASK"
109 - LD_LIBRARY_MASK="$ORIG_LD_LIBRARY_MASK $LD_LIBRARY_MASK"
110 -- REVDEP_REBUILD_DEFAULT_OPTS="$ORIG_REVDEP_REBUILD_DEFAULT_OPTS $REVDEP_REBUILD_DEFAULT_OPTS"
111 -
112 - # Replace EMERGE_DEFAULT_OPTS with REVDEP_REBUILD_DEFAULT_OPTS (if it exists)
113 - if [[ -n ${REVDEP_REBUILD_DEFAULT_OPTS} ]]; then
114 -- EMERGE_DEFAULT_OPTS=("$REVDEP_REBUILD_DEFAULT_OPTS")
115 -+ EMERGE_DEFAULT_OPTS=("${REVDEP_REBUILD_DEFAULT_OPTS[@]}")
116 - fi
117 --
118 - }
119 -
120 - ##
121 ---
122 -1.8.3.2
123 -
124
125 diff --git a/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch b/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch
126 deleted file mode 100644
127 index 282846c4724..00000000000
128 --- a/app-portage/gentoolkit/files/0.3.2-helpers.py-589686.patch
129 +++ /dev/null
130 @@ -1,30 +0,0 @@
131 -From bc92540f8ce498e8305103619c7085b670ba19b1 Mon Sep 17 00:00:00 2001
132 -From: Paul Varner <fuzzyray@g.o>
133 -Date: Mon, 25 Jul 2016 13:01:06 -0500
134 -Subject: Add missing import of io.open when using python2.7
135 -
136 -This fixes the traceback when running equery changes with Python 2.7
137 -
138 -X-Gentoo-bug: 589686
139 -X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=589686
140 ----
141 - pym/gentoolkit/helpers.py | 3 +++
142 - 1 file changed, 3 insertions(+)
143 -
144 -diff --git a/pym/gentoolkit/helpers.py b/pym/gentoolkit/helpers.py
145 -index 0d985b6..8d25393 100644
146 ---- a/pym/gentoolkit/helpers.py
147 -+++ b/pym/gentoolkit/helpers.py
148 -@@ -26,6 +26,9 @@ __docformat__ = 'epytext'
149 - # =======
150 -
151 - import os
152 -+import sys
153 -+if sys.hexversion < 0x3000000:
154 -+ from io import open
155 - import re
156 - from functools import partial
157 - from itertools import chain
158 ---
159 -cgit v0.12
160 -
161
162 diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
163 deleted file mode 100644
164 index 040f9c34ec9..00000000000
165 --- a/app-portage/gentoolkit/gentoolkit-0.3.0.8-r2.ebuild
166 +++ /dev/null
167 @@ -1,82 +0,0 @@
168 -# Copyright 1999-2017 Gentoo Foundation
169 -# Distributed under the terms of the GNU General Public License v2
170 -
171 -EAPI="5"
172 -
173 -PYTHON_COMPAT=(python2_7)
174 -PYTHON_REQ_USE="xml(+),threads(+)"
175 -
176 -inherit distutils-r1
177 -
178 -DESCRIPTION="Collection of administration scripts for Gentoo"
179 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
180 -SRC_URI="mirror://gentoo/${P}.tar.gz"
181 -
182 -LICENSE="GPL-2"
183 -SLOT="0"
184 -IUSE=""
185 -
186 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
187 -
188 -DEPEND="sys-apps/portage"
189 -RDEPEND="${DEPEND}
190 - !<=app-portage/gentoolkit-dev-0.2.7
191 - sys-apps/gawk"
192 -
193 -PATCHES=(
194 - "${FILESDIR}"/${PV}-revdep-rebuild-484340.patch
195 - "${FILESDIR}"/${PV}-revdep-rebuild-476740.patch
196 -)
197 -
198 -python_prepare_all() {
199 - python_setup
200 - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
201 - VERSION="${PVR}" "${PYTHON}" setup.py set_version
202 - mv ./bin/revdep-rebuild{,.py} || die
203 - distutils-r1_python_prepare_all
204 -}
205 -
206 -python_install_all() {
207 - distutils-r1_python_install_all
208 -
209 - # Rename the python versions of revdep-rebuild, since we are not ready
210 - # to switch to the python version yet. Link /usr/bin/revdep-rebuild to
211 - # revdep-rebuild.sh. Leaving the python version available for potential
212 - # testing by a wider audience.
213 - dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
214 -
215 - # Create cache directory for revdep-rebuild
216 - keepdir /var/cache/revdep-rebuild
217 - use prefix || fowners root:0 /var/cache/revdep-rebuild
218 - fperms 0700 /var/cache/revdep-rebuild
219 -
220 - # remove on Gentoo Prefix platforms where it's broken anyway
221 - if use prefix; then
222 - elog "The revdep-rebuild command is removed, the preserve-libs"
223 - elog "feature of portage will handle issues."
224 - rm "${ED}"/usr/bin/revdep-rebuild*
225 - rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
226 - rm -rf "${ED}"/etc/revdep-rebuild
227 - rm -rf "${ED}"/var
228 - fi
229 -}
230 -
231 -pkg_postinst() {
232 - # Only show the elog information on a new install
233 - if [[ ! ${REPLACING_VERSIONS} ]]; then
234 - elog
235 - elog "For further information on gentoolkit, please read the gentoolkit"
236 - elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
237 - elog
238 - elog "Another alternative to equery is app-portage/portage-utils"
239 - elog
240 - elog "Additional tools that may be of interest:"
241 - elog
242 - elog " app-admin/eclean-kernel"
243 - elog " app-portage/diffmask"
244 - elog " app-portage/flaggie"
245 - elog " app-portage/install-mask"
246 - elog " app-portage/portpeek"
247 - elog " app-portage/smart-live-rebuild"
248 - fi
249 -}
250
251 diff --git a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
252 deleted file mode 100644
253 index eeca23d3292..00000000000
254 --- a/app-portage/gentoolkit/gentoolkit-0.3.2-r1.ebuild
255 +++ /dev/null
256 @@ -1,74 +0,0 @@
257 -# Copyright 1999-2017 Gentoo Foundation
258 -# Distributed under the terms of the GNU General Public License v2
259 -
260 -EAPI="6"
261 -
262 -PYTHON_COMPAT=(python{2_7,3_4,3_5} pypy)
263 -PYTHON_REQ_USE="xml(+),threads(+)"
264 -
265 -inherit distutils-r1
266 -
267 -DESCRIPTION="Collection of administration scripts for Gentoo"
268 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
269 -SRC_URI="https://dev.gentoo.org/~dolsen/releases/gentoolkit/${P}.tar.gz"
270 -
271 -LICENSE="GPL-2"
272 -SLOT="0"
273 -IUSE=""
274 -
275 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
276 -
277 -DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
278 -RDEPEND="${DEPEND}
279 - !<=app-portage/gentoolkit-dev-0.2.7
280 - sys-apps/gawk
281 - sys-apps/gentoo-functions"
282 -
283 -PATCHES=(
284 - "${FILESDIR}"/${PV}-helpers.py-589686.patch
285 -)
286 -
287 -python_prepare_all() {
288 - python_setup
289 - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
290 - VERSION="${PVR}" "${PYTHON}" setup.py set_version
291 - distutils-r1_python_prepare_all
292 -}
293 -
294 -python_install_all() {
295 - distutils-r1_python_install_all
296 -
297 - # remove on Gentoo Prefix platforms where it's broken anyway
298 - if use prefix; then
299 - elog "The revdep-rebuild command is removed, the preserve-libs"
300 - elog "feature of portage will handle issues."
301 - rm "${ED}"/usr/bin/revdep-rebuild*
302 - rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
303 - rm -rf "${ED}"/etc/revdep-rebuild
304 - rm -rf "${ED}"/var
305 - fi
306 -}
307 -
308 -pkg_postinst() {
309 - # Create cache directory for revdep-rebuild
310 - mkdir -p -m 0755 "${EROOT%/}"/var/cache
311 - mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
312 -
313 - # Only show the elog information on a new install
314 - if [[ ! ${REPLACING_VERSIONS} ]]; then
315 - elog
316 - elog "For further information on gentoolkit, please read the gentoolkit"
317 - elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
318 - elog
319 - elog "Another alternative to equery is app-portage/portage-utils"
320 - elog
321 - elog "Additional tools that may be of interest:"
322 - elog
323 - elog " app-admin/eclean-kernel"
324 - elog " app-portage/diffmask"
325 - elog " app-portage/flaggie"
326 - elog " app-portage/install-mask"
327 - elog " app-portage/portpeek"
328 - elog " app-portage/smart-live-rebuild"
329 - fi
330 -}
Report Message
Find on MARC Find on Google Groups