Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Sun, 04 Nov 2018 00:05:19
Message-Id: 1541289701.73ab94e1f34ad8b48eb2aa3481d94630d9d1a16c.zmedico@gentoo
1 commit: 73ab94e1f34ad8b48eb2aa3481d94630d9d1a16c
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 4 00:01:41 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 4 00:01:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ab94e1
7
8 sys-apps/portage: remove old version 2.3.50-r4
9
10 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 sys-apps/portage/Manifest | 1 -
14 sys-apps/portage/portage-2.3.50-r4.ebuild | 282 ------------------------------
15 2 files changed, 283 deletions(-)
16
17 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
18 index 9e78204526e..8cfb73ae8a8 100644
19 --- a/sys-apps/portage/Manifest
20 +++ b/sys-apps/portage/Manifest
21 @@ -2,6 +2,5 @@ DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f
22 DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
23 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
24 DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a
25 -DIST portage-2.3.50.tar.bz2 1012905 BLAKE2B 8eebb6ea412db4d07be64047c8e9995c7d61906ff3c387495f144acd5b7d31e9d8ede3f9e606dc7a28df5b5726a0a6d55e2e0d79c78848213f4835fb1a588f30 SHA512 120514e4e176de9ad27892d547825d4fd51d250266f9de8f2f96d689ff1373adab77b838e9801043f0053111063857e957e83b495d520db8cc7733af28b03b64
26 DIST portage-2.3.51.tar.bz2 1013015 BLAKE2B f7f5e6c9e627db5a9e4bfcc9a6cbebb40fda910d3cc928922870b295c706a9f669d3d812e726b220610efe6b182460811eb9420d6fa5b8756481df64a88fe2b9 SHA512 6c22b97959d4b5be263b9a1de6bb343b1f8300e989f37c7334a9d5d6fb65fe2390958e222bc5379ec95099124fc51a049ecca6e1bfc18f0a6c57e4601342bb94
27 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
28
29 diff --git a/sys-apps/portage/portage-2.3.50-r4.ebuild b/sys-apps/portage/portage-2.3.50-r4.ebuild
30 deleted file mode 100644
31 index d710911faee..00000000000
32 --- a/sys-apps/portage/portage-2.3.50-r4.ebuild
33 +++ /dev/null
34 @@ -1,282 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=5
39 -
40 -PYTHON_COMPAT=(
41 - pypy
42 - python3_4 python3_5 python3_6 python3_7
43 - python2_7
44 -)
45 -PYTHON_REQ_USE='bzip2(+),threads(+)'
46 -
47 -inherit distutils-r1 systemd
48 -
49 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
50 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
51 -
52 -LICENSE="GPL-2"
53 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
54 -SLOT="0"
55 -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
56 -
57 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
58 - >=app-arch/tar-1.27
59 - dev-lang/python-exec:2
60 - >=sys-apps/sed-4.0.5 sys-devel/patch
61 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
62 - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
63 -# Require sandbox-2.2 for bug #288863.
64 -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
65 -# quite slow, so it's not considered in the dependencies as an alternative to
66 -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
67 -# for now, don't pull in xattr deps for other kernels.
68 -# For whirlpool hash, require python[ssl] (bug #425046).
69 -# For compgen, require bash[readline] (bug #445576).
70 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
71 -# the executable.
72 -RDEPEND="
73 - >=app-arch/tar-1.27
74 - dev-lang/python-exec:2
75 - !build? (
76 - >=sys-apps/sed-4.0.5
77 - app-shells/bash:0[readline]
78 - >=app-admin/eselect-1.2
79 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
80 - python{2_7,3_4,3_5} pypy)
81 - rsync-verify? (
82 - >=app-portage/gemato-14[${PYTHON_USEDEP}]
83 - >=app-crypt/openpgp-keys-gentoo-release-20180706
84 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
85 - )
86 - )
87 - elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
88 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
89 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
90 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
91 - >=app-misc/pax-utils-0.1.17
92 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
93 - xattr? ( kernel_linux? (
94 - >=sys-apps/install-xattr-0.3
95 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
96 - python2_7 pypy)
97 - ) )
98 - !<app-admin/logrotate-3.8.0
99 - !<app-portage/repoman-2.3.10"
100 -PDEPEND="
101 - !build? (
102 - >=net-misc/rsync-2.6.4
103 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
104 - )"
105 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
106 -# NOTE: FEATURES=installsources requires debugedit and rsync
107 -
108 -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
109 -
110 -SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
111 -
112 -prefix_src_archives() {
113 - local x y
114 - for x in ${@}; do
115 - for y in ${SRC_ARCHIVES}; do
116 - echo ${y}/${x}
117 - done
118 - done
119 -}
120 -
121 -TARBALL_PV=${PV}
122 -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
123 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
124 -
125 -pkg_setup() {
126 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
127 -}
128 -
129 -python_prepare_all() {
130 - distutils-r1_python_prepare_all
131 -
132 - # Apply fbc100e68802 for bug 667008
133 - sed -i 's:\[\[ -z ${PORTAGE_COMPRESS} \]\] && exit 0:if [[ -z ${PORTAGE_COMPRESS} ]]; then\n\tfind "${ED}" -name '\''*.ecompress'\'' -delete\n\texit 0\nfi:' bin/ecompress || die
134 -
135 - # Apply 8a1d36088aa5 for bug 667072
136 - sed -e 's:^find "${ED}" -name '\''\*.ecompress'\'' -delete -print0 [|]:find "${ED}" -name '\''*.ecompress'\'' -delete \\:' \
137 - -e 's:\t___parallel_xargs -0 "${PORTAGE_BIN_PATH}"/ecompress-file:\t-exec "${PORTAGE_BIN_PATH}"/ecompress-file {} +:' \
138 - -i bin/ecompress || die
139 -
140 - # Apply 1fc311ce0afe for bug 667072
141 - sed -e 's:local filtered_args=():local -A filtered_args:' \
142 - -e 's:filtered_args+=( "$x" ):filtered_args[${x}]=:' \
143 - -e 's:set -- "${filtered_args\[@\]}":set -- "${!filtered_args[@]}":' \
144 - -i bin/ecompress-file || die
145 -
146 - # Apply b587fc874ce9 for bug 666554
147 - sed -e 's:yield self\._check_call(\['\''rsync'\'', '\''-a'\''.*:\0\n\t\t\t'\''--exclude=/distfiles'\'', '\''--exclude=/local'\'', '\''--exclude=/lost+found'\'', '\''--exclude=/packages'\'',:' \
148 - -i lib/portage/repository/storage/hardlink_quarantine.py || die
149 -
150 - if use gentoo-dev; then
151 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
152 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
153 - -i lib/_emerge/create_depgraph_params.py || \
154 - die "failed to patch create_depgraph_params.py"
155 -
156 - einfo "Enabling additional FEATURES for gentoo-dev..."
157 - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
158 - >> cnf/make.globals || die
159 - fi
160 -
161 - if use native-extensions; then
162 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
163 - setup.cfg || die
164 - fi
165 -
166 - if ! use ipc ; then
167 - einfo "Disabling ipc..."
168 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
169 - -i lib/_emerge/AbstractEbuildProcess.py || \
170 - die "failed to patch AbstractEbuildProcess.py"
171 - fi
172 -
173 - if use xattr && use kernel_linux ; then
174 - einfo "Adding FEATURES=xattr to make.globals ..."
175 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
176 - || die "failed to append to make.globals"
177 - fi
178 -
179 - if use build || ! use rsync-verify; then
180 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
181 - -i cnf/repos.conf || die "sed failed"
182 - fi
183 -
184 - if [[ -n ${EPREFIX} ]] ; then
185 - einfo "Setting portage.const.EPREFIX ..."
186 - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
187 - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
188 - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
189 - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
190 - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
191 - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
192 - -i lib/portage/const.py || \
193 - die "Failed to patch portage.const.EPREFIX"
194 -
195 - einfo "Prefixing shebangs ..."
196 - while read -r -d $'\0' ; do
197 - local shebang=$(head -n1 "$REPLY")
198 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
199 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
200 - die "sed failed"
201 - fi
202 - done < <(find . -type f -print0)
203 -
204 - einfo "Adjusting make.globals ..."
205 - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
206 - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
207 - -i cnf/make.globals || die "sed failed"
208 -
209 - einfo "Adjusting repos.conf ..."
210 - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
211 - -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
212 - -i cnf/repos.conf || die "sed failed"
213 - if use prefix-guest ; then
214 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
215 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
216 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
217 - -i cnf/repos.conf || die "sed failed"
218 - fi
219 -
220 - einfo "Adding FEATURES=force-prefix to make.globals ..."
221 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
222 - || die "failed to append to make.globals"
223 - fi
224 -
225 - cd "${S}/cnf" || die
226 - if [ -f "make.conf.example.${ARCH}".diff ]; then
227 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
228 - die "Failed to patch make.conf.example"
229 - else
230 - eerror ""
231 - eerror "Portage does not have an arch-specific configuration for this arch."
232 - eerror "Please notify the arch maintainer about this issue. Using generic."
233 - eerror ""
234 - fi
235 -}
236 -
237 -python_compile_all() {
238 - local targets=()
239 - use doc && targets+=( docbook )
240 - use epydoc && targets+=( epydoc )
241 -
242 - if [[ ${targets[@]} ]]; then
243 - esetup.py "${targets[@]}"
244 - fi
245 -}
246 -
247 -python_test() {
248 - esetup.py test
249 -}
250 -
251 -python_install() {
252 - # Install sbin scripts to bindir for python-exec linking
253 - # they will be relocated in pkg_preinst()
254 - distutils-r1_python_install \
255 - --system-prefix="${EPREFIX}/usr" \
256 - --bindir="$(python_get_scriptdir)" \
257 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
258 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
259 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
260 - --sbindir="$(python_get_scriptdir)" \
261 - --sysconfdir="${EPREFIX}/etc" \
262 - "${@}"
263 -}
264 -
265 -python_install_all() {
266 - distutils-r1_python_install_all
267 -
268 - local targets=()
269 - use doc && targets+=(
270 - install_docbook
271 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
272 - )
273 - use epydoc && targets+=(
274 - install_epydoc
275 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
276 - )
277 -
278 - # install docs
279 - if [[ ${targets[@]} ]]; then
280 - esetup.py "${targets[@]}"
281 - fi
282 -
283 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
284 -
285 - # Due to distutils/python-exec limitations
286 - # these must be installed to /usr/bin.
287 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
288 - einfo "Moving admin scripts to the correct directory"
289 - dodir /usr/sbin
290 - for target in ${sbin_relocations}; do
291 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
292 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
293 - done
294 -}
295 -
296 -pkg_preinst() {
297 - # comment out sanity test until it is fixed to work
298 - # with the new PORTAGE_PYM_PATH
299 - #if [[ $ROOT == / ]] ; then
300 - ## Run some minimal tests as a sanity check.
301 - #local test_runner=$(find "${ED}" -name runTests)
302 - #if [[ -n $test_runner && -x $test_runner ]] ; then
303 - #einfo "Running preinst sanity tests..."
304 - #"$test_runner" || die "preinst sanity tests failed"
305 - #fi
306 - #fi
307 -
308 - # elog dir must exist to avoid logrotate error for bug #415911.
309 - # This code runs in preinst in order to bypass the mapping of
310 - # portage:portage to root:root which happens after src_install.
311 - keepdir /var/log/portage/elog
312 - # This is allowed to fail if the user/group are invalid for prefix users.
313 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
314 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
315 - fi
316 -}