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, 24 Dec 2019 00:58:02
Message-Id: 1577149058.749757f2bf9ef7dd25dc697e293e03538a9e89bd.zmedico@gentoo
1 commit: 749757f2bf9ef7dd25dc697e293e03538a9e89bd
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 24 00:48:52 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 24 00:57:38 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=749757f2
7
8 sys-apps/portage: Remove old version 2.3.81
9
10 Package-Manager: Portage-2.3.82, Repoman-2.3.20
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 sys-apps/portage/Manifest | 1 -
14 sys-apps/portage/portage-2.3.81.ebuild | 272 ---------------------------------
15 2 files changed, 273 deletions(-)
16
17 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
18 index fe5d2322faa..d04f8cbc5ca 100644
19 --- a/sys-apps/portage/Manifest
20 +++ b/sys-apps/portage/Manifest
21 @@ -1,5 +1,4 @@
22 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
23 DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903 SHA512 e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
24 DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
25 -DIST portage-2.3.81.tar.bz2 1041978 BLAKE2B 03c032204dcc4725bfbf4d2bf605a8f2a24bfbd854d7c74e0697e25ae4e10831ec19e3c1252d2d1a5921cdf00801fbbc6fcf60a2d64076cee96f427e49b1ee37 SHA512 ce0688eab181243cf4e8dd2a7e2e5bc188e6323331ffcf8d6ee970073bc634bb5566afebef7570fff711ad1ae9a4484df9a602db523d3398ca6ad29d633f0824
26 DIST portage-2.3.82.tar.bz2 1042836 BLAKE2B 97fc32b988863497564f64bb22ecdb787f6d6075ec3f5a35c27f7c8b0610892c0516236eba238deec59ee5f9c42e0f10c6ef6c9a2f193ff54e24d86706afd814 SHA512 cee59744bba8bb429689dde899df2d84a42ac68b1e0f4a65f8f14c6db04a26a805095b54a807fa95dfe4032e8a637660a9aec88f70b36ba785228ed0db9c1144
27
28 diff --git a/sys-apps/portage/portage-2.3.81.ebuild b/sys-apps/portage/portage-2.3.81.ebuild
29 deleted file mode 100644
30 index a7197349654..00000000000
31 --- a/sys-apps/portage/portage-2.3.81.ebuild
32 +++ /dev/null
33 @@ -1,272 +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 -DISTUTILS_USE_SETUPTOOLS=no
40 -PYTHON_COMPAT=(
41 - pypy
42 - python3_5 python3_6 python3_7 python3_8
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 - if use gentoo-dev; then
141 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
142 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
143 - -i lib/_emerge/create_depgraph_params.py || \
144 - die "failed to patch create_depgraph_params.py"
145 -
146 - einfo "Enabling additional FEATURES for gentoo-dev..."
147 - echo 'FEATURES="${FEATURES} strict-keepdir"' \
148 - >> cnf/make.globals || die
149 - fi
150 -
151 - if use native-extensions; then
152 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
153 - setup.cfg || die
154 - fi
155 -
156 - if ! use ipc ; then
157 - einfo "Disabling ipc..."
158 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
159 - -i lib/_emerge/AbstractEbuildProcess.py || \
160 - die "failed to patch AbstractEbuildProcess.py"
161 - fi
162 -
163 - if use xattr && use kernel_linux ; then
164 - einfo "Adding FEATURES=xattr to make.globals ..."
165 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
166 - || die "failed to append to make.globals"
167 - fi
168 -
169 - if use build || ! use rsync-verify; then
170 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
171 - -e '/^sync-webrsync-verify-signature/s|yes|no|' \
172 - -i cnf/repos.conf || die "sed failed"
173 - fi
174 -
175 - if [[ -n ${EPREFIX} ]] ; then
176 - einfo "Setting portage.const.EPREFIX ..."
177 - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
178 - -w "/_BINARY/" lib/portage/const.py
179 -
180 - einfo "Prefixing shebangs ..."
181 - while read -r -d $'\0' ; do
182 - local shebang=$(head -n1 "$REPLY")
183 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
184 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
185 - die "sed failed"
186 - fi
187 - done < <(find . -type f ! -name etc-update -print0)
188 -
189 - einfo "Adjusting make.globals, repos.conf and etc-update ..."
190 - hprefixify cnf/{make.globals,repos.conf} bin/etc-update
191 -
192 - if use prefix-guest ; then
193 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
194 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
195 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
196 - -i cnf/repos.conf || die "sed failed"
197 - fi
198 -
199 - einfo "Adding FEATURES=force-prefix to make.globals ..."
200 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
201 - || die "failed to append to make.globals"
202 - fi
203 -
204 - cd "${S}/cnf" || die
205 - if [ -f "make.conf.example.${ARCH}".diff ]; then
206 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
207 - die "Failed to patch make.conf.example"
208 - else
209 - eerror ""
210 - eerror "Portage does not have an arch-specific configuration for this arch."
211 - eerror "Please notify the arch maintainer about this issue. Using generic."
212 - eerror ""
213 - fi
214 -}
215 -
216 -python_compile_all() {
217 - local targets=()
218 - use doc && targets+=( docbook )
219 - use epydoc && targets+=( epydoc )
220 -
221 - if [[ ${targets[@]} ]]; then
222 - esetup.py "${targets[@]}"
223 - fi
224 -}
225 -
226 -python_test() {
227 - esetup.py test
228 -}
229 -
230 -python_install() {
231 - # Install sbin scripts to bindir for python-exec linking
232 - # they will be relocated in pkg_preinst()
233 - distutils-r1_python_install \
234 - --system-prefix="${EPREFIX}/usr" \
235 - --bindir="$(python_get_scriptdir)" \
236 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
237 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
238 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
239 - --sbindir="$(python_get_scriptdir)" \
240 - --sysconfdir="${EPREFIX}/etc" \
241 - "${@}"
242 -}
243 -
244 -python_install_all() {
245 - distutils-r1_python_install_all
246 -
247 - local targets=()
248 - use doc && targets+=(
249 - install_docbook
250 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
251 - )
252 - use epydoc && targets+=(
253 - install_epydoc
254 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
255 - )
256 -
257 - # install docs
258 - if [[ ${targets[@]} ]]; then
259 - esetup.py "${targets[@]}"
260 - fi
261 -
262 - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
263 -
264 - # Due to distutils/python-exec limitations
265 - # these must be installed to /usr/bin.
266 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
267 - einfo "Moving admin scripts to the correct directory"
268 - dodir /usr/sbin
269 - for target in ${sbin_relocations}; do
270 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
271 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
272 - done
273 -}
274 -
275 -pkg_preinst() {
276 - python_setup
277 - python_export PYTHON_SITEDIR
278 - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
279 - env -u DISTDIR \
280 - -u PORTAGE_OVERRIDE_EPREFIX \
281 - -u PORTAGE_REPOSITORIES \
282 - -u PORTDIR \
283 - -u PORTDIR_OVERLAY \
284 - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
285 - "${PYTHON}" -m portage._compat_upgrade.default_locations || die
286 -
287 - # elog dir must exist to avoid logrotate error for bug #415911.
288 - # This code runs in preinst in order to bypass the mapping of
289 - # portage:portage to root:root which happens after src_install.
290 - keepdir /var/log/portage/elog
291 - # This is allowed to fail if the user/group are invalid for prefix users.
292 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
293 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
294 - fi
295 -
296 - if has_version "<${CATEGORY}/${PN}-2.3.77"; then
297 - elog "The emerge --autounmask option is now disabled by default, except for"
298 - elog "portions of behavior which are controlled by the --autounmask-use and"
299 - elog "--autounmask-license options. For backward compatibility, previous"
300 - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
301 - elog "Users can get the old behavior simply by adding --autounmask to the"
302 - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
303 - elog "change, see https://bugs.gentoo.org/658648."
304 - fi
305 -}