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, 10 Aug 2019 17:37:25
Message-Id: 1565458633.393c6acc6a0ee91aeb2c3b5e1f6cd95c69aeb398.zmedico@gentoo
1 commit: 393c6acc6a0ee91aeb2c3b5e1f6cd95c69aeb398
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 10 17:35:26 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 10 17:37:13 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393c6acc
7
8 sys-apps/portage: Remove old version 2.3.70
9
10 Package-Manager: Portage-2.3.71, 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.70.ebuild | 260 ---------------------------------
15 2 files changed, 261 deletions(-)
16
17 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
18 index 9d9ee6e1158..204080770ee 100644
19 --- a/sys-apps/portage/Manifest
20 +++ b/sys-apps/portage/Manifest
21 @@ -1,5 +1,4 @@
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.70.tar.bz2 1028564 BLAKE2B d54cf01099329e052a58c637ead03c3749c5dea21236dd25bee53b1634d8757da0e8c9a1d5187d71278349e5c86113abd7c430599db97b67377fed56f44a1b5b SHA512 2f928cea2199299583eb3f2d45eb718ff0573747f4e57a1506f6baa1d12e54fe0851b3f9c184b766c46e304a373a85d9f8a2c7711d06c074a3b23cd8970547d8
25 DIST portage-2.3.71.tar.bz2 1028966 BLAKE2B 26c1e8835cde39479d1cf510b1fbc14f7edf9b785dc26f6c439cf982a2ccdd6b8a9108bb7edc5358d8fe641ba32fba1b62abb6f39060cb568984e6c271524b42 SHA512 55f5f4f5ccfb2964ad7a3f99cb17cb2a5125392e4f37d5986fc8afcf90924f92ba5c2a278f84b4ef03c5a3f98f75c14646861086c0fd8491526608897b6d30ce
26 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
27
28 diff --git a/sys-apps/portage/portage-2.3.70.ebuild b/sys-apps/portage/portage-2.3.70.ebuild
29 deleted file mode 100644
30 index 969ce20d876..00000000000
31 --- a/sys-apps/portage/portage-2.3.70.ebuild
32 +++ /dev/null
33 @@ -1,260 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=5
38 -
39 -PYTHON_COMPAT=(
40 - pypy
41 - python3_5 python3_6 python3_7
42 - python2_7
43 -)
44 -PYTHON_REQ_USE='bzip2(+),threads(+)'
45 -
46 -inherit distutils-r1 linux-info systemd prefix
47 -
48 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
49 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
50 -
51 -LICENSE="GPL-2"
52 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
53 -SLOT="0"
54 -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
55 -
56 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
57 - >=app-arch/tar-1.27
58 - dev-lang/python-exec:2
59 - >=sys-apps/sed-4.0.5 sys-devel/patch
60 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
61 - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
62 -# Require sandbox-2.2 for bug #288863.
63 -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
64 -# quite slow, so it's not considered in the dependencies as an alternative to
65 -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
66 -# for now, don't pull in xattr deps for other kernels.
67 -# For whirlpool hash, require python[ssl] (bug #425046).
68 -# For compgen, require bash[readline] (bug #445576).
69 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
70 -# the executable.
71 -RDEPEND="
72 - >=app-arch/tar-1.27
73 - dev-lang/python-exec:2
74 - !build? (
75 - >=sys-apps/sed-4.0.5
76 - app-shells/bash:0[readline]
77 - >=app-admin/eselect-1.2
78 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
79 - python{2_7,3_5} pypy)
80 - rsync-verify? (
81 - >=app-portage/gemato-14[${PYTHON_USEDEP}]
82 - >=app-crypt/openpgp-keys-gentoo-release-20180706
83 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
84 - )
85 - )
86 - elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
87 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
88 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
89 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
90 - kernel_linux? ( sys-apps/util-linux )
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_pretend() {
126 - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
127 -
128 - check_extra_config
129 -}
130 -
131 -pkg_setup() {
132 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
133 -}
134 -
135 -python_prepare_all() {
136 - distutils-r1_python_prepare_all
137 -
138 - if use gentoo-dev; then
139 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
140 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
141 - -i lib/_emerge/create_depgraph_params.py || \
142 - die "failed to patch create_depgraph_params.py"
143 -
144 - einfo "Enabling additional FEATURES for gentoo-dev..."
145 - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
146 - >> cnf/make.globals || die
147 - fi
148 -
149 - if use native-extensions; then
150 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
151 - setup.cfg || die
152 - fi
153 -
154 - if ! use ipc ; then
155 - einfo "Disabling ipc..."
156 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
157 - -i lib/_emerge/AbstractEbuildProcess.py || \
158 - die "failed to patch AbstractEbuildProcess.py"
159 - fi
160 -
161 - if use xattr && use kernel_linux ; then
162 - einfo "Adding FEATURES=xattr to make.globals ..."
163 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
164 - || die "failed to append to make.globals"
165 - fi
166 -
167 - if use build || ! use rsync-verify; then
168 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
169 - -e '/^sync-webrsync-verify-signature/s|yes|no|' \
170 - -i cnf/repos.conf || die "sed failed"
171 - fi
172 -
173 - if [[ -n ${EPREFIX} ]] ; then
174 - einfo "Setting portage.const.EPREFIX ..."
175 - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
176 - -w "/_BINARY/" lib/portage/const.py
177 -
178 - einfo "Prefixing shebangs ..."
179 - while read -r -d $'\0' ; do
180 - local shebang=$(head -n1 "$REPLY")
181 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
182 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
183 - die "sed failed"
184 - fi
185 - done < <(find . -type f ! -name etc-update -print0)
186 -
187 - einfo "Adjusting make.globals, repos.conf and etc-update ..."
188 - hprefixify cnf/{make.globals,repos.conf} bin/etc-update
189 -
190 - if use prefix-guest ; then
191 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
192 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
193 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
194 - -i cnf/repos.conf || die "sed failed"
195 - fi
196 -
197 - einfo "Adding FEATURES=force-prefix to make.globals ..."
198 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
199 - || die "failed to append to make.globals"
200 - fi
201 -
202 - cd "${S}/cnf" || die
203 - if [ -f "make.conf.example.${ARCH}".diff ]; then
204 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
205 - die "Failed to patch make.conf.example"
206 - else
207 - eerror ""
208 - eerror "Portage does not have an arch-specific configuration for this arch."
209 - eerror "Please notify the arch maintainer about this issue. Using generic."
210 - eerror ""
211 - fi
212 -}
213 -
214 -python_compile_all() {
215 - local targets=()
216 - use doc && targets+=( docbook )
217 - use epydoc && targets+=( epydoc )
218 -
219 - if [[ ${targets[@]} ]]; then
220 - esetup.py "${targets[@]}"
221 - fi
222 -}
223 -
224 -python_test() {
225 - esetup.py test
226 -}
227 -
228 -python_install() {
229 - # Install sbin scripts to bindir for python-exec linking
230 - # they will be relocated in pkg_preinst()
231 - distutils-r1_python_install \
232 - --system-prefix="${EPREFIX}/usr" \
233 - --bindir="$(python_get_scriptdir)" \
234 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
235 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
236 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
237 - --sbindir="$(python_get_scriptdir)" \
238 - --sysconfdir="${EPREFIX}/etc" \
239 - "${@}"
240 -}
241 -
242 -python_install_all() {
243 - distutils-r1_python_install_all
244 -
245 - local targets=()
246 - use doc && targets+=(
247 - install_docbook
248 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
249 - )
250 - use epydoc && targets+=(
251 - install_epydoc
252 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
253 - )
254 -
255 - # install docs
256 - if [[ ${targets[@]} ]]; then
257 - esetup.py "${targets[@]}"
258 - fi
259 -
260 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
261 -
262 - # Due to distutils/python-exec limitations
263 - # these must be installed to /usr/bin.
264 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
265 - einfo "Moving admin scripts to the correct directory"
266 - dodir /usr/sbin
267 - for target in ${sbin_relocations}; do
268 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
269 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
270 - done
271 -}
272 -
273 -pkg_preinst() {
274 - python_setup
275 - python_export PYTHON_SITEDIR
276 - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
277 - env -u DISTDIR \
278 - -u PORTAGE_OVERRIDE_EPREFIX \
279 - -u PORTAGE_REPOSITORIES \
280 - -u PORTDIR \
281 - -u PORTDIR_OVERLAY \
282 - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
283 - "${PYTHON}" -m portage._compat_upgrade.default_locations || die
284 -
285 - # elog dir must exist to avoid logrotate error for bug #415911.
286 - # This code runs in preinst in order to bypass the mapping of
287 - # portage:portage to root:root which happens after src_install.
288 - keepdir /var/log/portage/elog
289 - # This is allowed to fail if the user/group are invalid for prefix users.
290 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
291 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
292 - fi
293 -}