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