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: Sat, 24 Aug 2019 04:23:19
Message-Id: 1566620587.c8953243256b8f8324d46b7a8c1e46165a8b7bee.zmedico@gentoo
1 commit: c8953243256b8f8324d46b7a8c1e46165a8b7bee
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 24 04:18:40 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 24 04:23:07 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8953243
7
8 sys-apps/portage: Remove old version 2.3.71
9
10 Package-Manager: Portage-2.3.73, Repoman-2.3.17
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 sys-apps/portage/Manifest | 1 -
14 sys-apps/portage/portage-2.3.71.ebuild | 263 ---------------------------------
15 2 files changed, 264 deletions(-)
16
17 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
18 index cc676dbae34..bd1d0fe8f5b 100644
19 --- a/sys-apps/portage/Manifest
20 +++ b/sys-apps/portage/Manifest
21 @@ -1,6 +1,5 @@
22 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6 SHA512 f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
23 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
24 -DIST portage-2.3.71.tar.bz2 1028966 BLAKE2B 26c1e8835cde39479d1cf510b1fbc14f7edf9b785dc26f6c439cf982a2ccdd6b8a9108bb7edc5358d8fe641ba32fba1b62abb6f39060cb568984e6c271524b42 SHA512 55f5f4f5ccfb2964ad7a3f99cb17cb2a5125392e4f37d5986fc8afcf90924f92ba5c2a278f84b4ef03c5a3f98f75c14646861086c0fd8491526608897b6d30ce
25 DIST portage-2.3.72.tar.bz2 1030924 BLAKE2B 84ecb1cda83a33f7159b86edc915810460f85dd6c97e971a054b5c1cc685077cb784313a666d1867c671e6324a25ea64b0032bb1924af560bd60d261b199c479 SHA512 cc42030bee07b2addc7977a5f206ab35a76ac98d37215d2ee2952d47408c0de1c74387436b85b08f94be5fd01b422cb68bcf908fa8acac8fb9dda0e5caa39f86
26 DIST portage-2.3.73.tar.bz2 1031001 BLAKE2B f08a639ae587cae8c87670c6d8f8b8f5a860a3d1d8ad960d6da7fac7c0e170d0f19c352d6a31de20de60a4504766724901ef7d2ba026f959ef8dd6bb8e095c73 SHA512 5edda4b235a9bb7574fb5bce79c4a226200ba077580ce0e0237ef209cc935ab94eef24859bf450443a92a6cb9d31a754e1e06c8fd0293efe7e5fa87e4d21652a
27 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
28
29 diff --git a/sys-apps/portage/portage-2.3.71.ebuild b/sys-apps/portage/portage-2.3.71.ebuild
30 deleted file mode 100644
31 index 4a0a61a97b5..00000000000
32 --- a/sys-apps/portage/portage-2.3.71.ebuild
33 +++ /dev/null
34 @@ -1,263 +0,0 @@
35 -# Copyright 1999-2019 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_5 python3_6 python3_7
43 - python2_7
44 -)
45 -PYTHON_REQ_USE='bzip2(+),threads(+)'
46 -
47 -inherit distutils-r1 linux-info systemd prefix
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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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_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 - kernel_linux? (
92 - sys-apps/iproute2
93 - sys-apps/util-linux
94 - )
95 - >=app-misc/pax-utils-0.1.17
96 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
97 - xattr? ( kernel_linux? (
98 - >=sys-apps/install-xattr-0.3
99 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
100 - python2_7 pypy)
101 - ) )
102 - !<app-admin/logrotate-3.8.0
103 - !<app-portage/repoman-2.3.10"
104 -PDEPEND="
105 - !build? (
106 - >=net-misc/rsync-2.6.4
107 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
108 - )"
109 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
110 -# NOTE: FEATURES=installsources requires debugedit and rsync
111 -
112 -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
113 -
114 -SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
115 -
116 -prefix_src_archives() {
117 - local x y
118 - for x in ${@}; do
119 - for y in ${SRC_ARCHIVES}; do
120 - echo ${y}/${x}
121 - done
122 - done
123 -}
124 -
125 -TARBALL_PV=${PV}
126 -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
127 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
128 -
129 -pkg_pretend() {
130 - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
131 -
132 - check_extra_config
133 -}
134 -
135 -pkg_setup() {
136 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
137 -}
138 -
139 -python_prepare_all() {
140 - distutils-r1_python_prepare_all
141 -
142 - if use gentoo-dev; then
143 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
144 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
145 - -i lib/_emerge/create_depgraph_params.py || \
146 - die "failed to patch create_depgraph_params.py"
147 -
148 - einfo "Enabling additional FEATURES for gentoo-dev..."
149 - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
150 - >> cnf/make.globals || die
151 - fi
152 -
153 - if use native-extensions; then
154 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
155 - setup.cfg || die
156 - fi
157 -
158 - if ! use ipc ; then
159 - einfo "Disabling ipc..."
160 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
161 - -i lib/_emerge/AbstractEbuildProcess.py || \
162 - die "failed to patch AbstractEbuildProcess.py"
163 - fi
164 -
165 - if use xattr && use kernel_linux ; then
166 - einfo "Adding FEATURES=xattr to make.globals ..."
167 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
168 - || die "failed to append to make.globals"
169 - fi
170 -
171 - if use build || ! use rsync-verify; then
172 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
173 - -e '/^sync-webrsync-verify-signature/s|yes|no|' \
174 - -i cnf/repos.conf || die "sed failed"
175 - fi
176 -
177 - if [[ -n ${EPREFIX} ]] ; then
178 - einfo "Setting portage.const.EPREFIX ..."
179 - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
180 - -w "/_BINARY/" lib/portage/const.py
181 -
182 - einfo "Prefixing shebangs ..."
183 - while read -r -d $'\0' ; do
184 - local shebang=$(head -n1 "$REPLY")
185 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
186 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
187 - die "sed failed"
188 - fi
189 - done < <(find . -type f ! -name etc-update -print0)
190 -
191 - einfo "Adjusting make.globals, repos.conf and etc-update ..."
192 - hprefixify cnf/{make.globals,repos.conf} bin/etc-update
193 -
194 - if use prefix-guest ; then
195 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
196 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
197 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
198 - -i cnf/repos.conf || die "sed failed"
199 - fi
200 -
201 - einfo "Adding FEATURES=force-prefix to make.globals ..."
202 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
203 - || die "failed to append to make.globals"
204 - fi
205 -
206 - cd "${S}/cnf" || die
207 - if [ -f "make.conf.example.${ARCH}".diff ]; then
208 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
209 - die "Failed to patch make.conf.example"
210 - else
211 - eerror ""
212 - eerror "Portage does not have an arch-specific configuration for this arch."
213 - eerror "Please notify the arch maintainer about this issue. Using generic."
214 - eerror ""
215 - fi
216 -}
217 -
218 -python_compile_all() {
219 - local targets=()
220 - use doc && targets+=( docbook )
221 - use epydoc && targets+=( epydoc )
222 -
223 - if [[ ${targets[@]} ]]; then
224 - esetup.py "${targets[@]}"
225 - fi
226 -}
227 -
228 -python_test() {
229 - esetup.py test
230 -}
231 -
232 -python_install() {
233 - # Install sbin scripts to bindir for python-exec linking
234 - # they will be relocated in pkg_preinst()
235 - distutils-r1_python_install \
236 - --system-prefix="${EPREFIX}/usr" \
237 - --bindir="$(python_get_scriptdir)" \
238 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
239 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
240 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
241 - --sbindir="$(python_get_scriptdir)" \
242 - --sysconfdir="${EPREFIX}/etc" \
243 - "${@}"
244 -}
245 -
246 -python_install_all() {
247 - distutils-r1_python_install_all
248 -
249 - local targets=()
250 - use doc && targets+=(
251 - install_docbook
252 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
253 - )
254 - use epydoc && targets+=(
255 - install_epydoc
256 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
257 - )
258 -
259 - # install docs
260 - if [[ ${targets[@]} ]]; then
261 - esetup.py "${targets[@]}"
262 - fi
263 -
264 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
265 -
266 - # Due to distutils/python-exec limitations
267 - # these must be installed to /usr/bin.
268 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
269 - einfo "Moving admin scripts to the correct directory"
270 - dodir /usr/sbin
271 - for target in ${sbin_relocations}; do
272 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
273 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
274 - done
275 -}
276 -
277 -pkg_preinst() {
278 - python_setup
279 - python_export PYTHON_SITEDIR
280 - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
281 - env -u DISTDIR \
282 - -u PORTAGE_OVERRIDE_EPREFIX \
283 - -u PORTAGE_REPOSITORIES \
284 - -u PORTDIR \
285 - -u PORTDIR_OVERLAY \
286 - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
287 - "${PYTHON}" -m portage._compat_upgrade.default_locations || die
288 -
289 - # elog dir must exist to avoid logrotate error for bug #415911.
290 - # This code runs in preinst in order to bypass the mapping of
291 - # portage:portage to root:root which happens after src_install.
292 - keepdir /var/log/portage/elog
293 - # This is allowed to fail if the user/group are invalid for prefix users.
294 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
295 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
296 - fi
297 -}