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, 27 Sep 2020 00:05:05
Message-Id: 1601165094.99e2920a969d062aae6a167c25ff989c80688819.zmedico@gentoo
1 commit: 99e2920a969d062aae6a167c25ff989c80688819
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 27 00:04:15 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 27 00:04:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e2920a
7
8 sys-apps/portage: Remove old version 3.0.7
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 sys-apps/portage/Manifest | 1 -
14 sys-apps/portage/portage-3.0.7.ebuild | 267 ----------------------------------
15 2 files changed, 268 deletions(-)
16
17 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
18 index dcb0c98700e..2b1ad98362c 100644
19 --- a/sys-apps/portage/Manifest
20 +++ b/sys-apps/portage/Manifest
21 @@ -1,5 +1,4 @@
22 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
23 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
24 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
25 -DIST portage-3.0.7.tar.bz2 1045185 BLAKE2B 1fe5e13bbbfaecd1b850b29b17908fb2c2756d559b0583174833672b68a67cfc7e7080334729ee5295b646423ca3925284f42eeace0c0b79d02305a170aed5d9 SHA512 701f6bddb9255d5ac86ed6e73f869124925bafd09f7c2e458376b54aebf030fa7f0d80beda1626350755cc1e8a2b9c2636b3fde1105787f2d2a0f742a73cf5e8
26 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
27
28 diff --git a/sys-apps/portage/portage-3.0.7.ebuild b/sys-apps/portage/portage-3.0.7.ebuild
29 deleted file mode 100644
30 index 28cd3d04cca..00000000000
31 --- a/sys-apps/portage/portage-3.0.7.ebuild
32 +++ /dev/null
33 @@ -1,267 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -DISTUTILS_USE_SETUPTOOLS=no
40 -PYTHON_COMPAT=( pypy3 python3_{6..9} )
41 -PYTHON_REQ_USE='bzip2(+),threads(+)'
42 -
43 -inherit distutils-r1 linux-info tmpfiles prefix
44 -
45 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
46 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
47 -
48 -LICENSE="GPL-2"
49 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
50 -SLOT="0"
51 -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
52 -RESTRICT="!test? ( test )"
53 -
54 -BDEPEND="test? ( dev-vcs/git )"
55 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
56 - >=app-arch/tar-1.27
57 - dev-lang/python-exec:2
58 - >=sys-apps/sed-4.0.5 sys-devel/patch
59 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
60 - apidoc? (
61 - dev-python/sphinx
62 - dev-python/sphinx-epytext
63 - )"
64 -# Require sandbox-2.2 for bug #288863.
65 -# For whirlpool hash, require python[ssl] (bug #425046).
66 -# For compgen, require bash[readline] (bug #445576).
67 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
68 -# the executable.
69 -RDEPEND="
70 - app-arch/zstd
71 - >=app-arch/tar-1.27
72 - dev-lang/python-exec:2
73 - >=sys-apps/findutils-4.4
74 - !build? (
75 - >=sys-apps/sed-4.0.5
76 - app-shells/bash:0[readline]
77 - >=app-admin/eselect-1.2
78 - rsync-verify? (
79 - >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
80 - >=app-crypt/openpgp-keys-gentoo-release-20180706
81 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
82 - )
83 - )
84 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
85 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
86 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
87 - kernel_linux? ( sys-apps/util-linux )
88 - >=app-misc/pax-utils-0.1.17
89 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
90 - xattr? ( kernel_linux? (
91 - >=sys-apps/install-xattr-0.3
92 - ) )
93 - !<app-admin/logrotate-3.8.0
94 - !<app-portage/gentoolkit-0.4.6
95 - !<app-portage/repoman-2.3.10
96 - !~app-portage/repoman-3.0.0"
97 -PDEPEND="
98 - !build? (
99 - >=net-misc/rsync-2.6.4
100 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
101 - )"
102 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
103 -# NOTE: FEATURES=installsources requires debugedit and rsync
104 -
105 -SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
106 -
107 -prefix_src_archives() {
108 - local x y
109 - for x in ${@}; do
110 - for y in ${SRC_ARCHIVES}; do
111 - echo ${y}/${x}
112 - done
113 - done
114 -}
115 -
116 -TARBALL_PV=${PV}
117 -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
118 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
119 -
120 -pkg_pretend() {
121 - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
122 -
123 - check_extra_config
124 -}
125 -
126 -python_prepare_all() {
127 - distutils-r1_python_prepare_all
128 -
129 - sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
130 -
131 - if use gentoo-dev; then
132 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
133 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
134 - -i lib/_emerge/create_depgraph_params.py || \
135 - die "failed to patch create_depgraph_params.py"
136 -
137 - einfo "Enabling additional FEATURES for gentoo-dev..."
138 - echo 'FEATURES="${FEATURES} strict-keepdir"' \
139 - >> cnf/make.globals || die
140 - fi
141 -
142 - if use native-extensions; then
143 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
144 - setup.cfg || die
145 - fi
146 -
147 - if ! use ipc ; then
148 - einfo "Disabling ipc..."
149 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
150 - -i lib/_emerge/AbstractEbuildProcess.py || \
151 - die "failed to patch AbstractEbuildProcess.py"
152 - fi
153 -
154 - if use xattr && use kernel_linux ; then
155 - einfo "Adding FEATURES=xattr to make.globals ..."
156 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
157 - || die "failed to append to make.globals"
158 - fi
159 -
160 - if use build || ! use rsync-verify; then
161 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
162 - -e '/^sync-webrsync-verify-signature/s|yes|no|' \
163 - -i cnf/repos.conf || die "sed failed"
164 - fi
165 -
166 - if [[ -n ${EPREFIX} ]] ; then
167 - einfo "Setting portage.const.EPREFIX ..."
168 - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
169 - -w "/_BINARY/" lib/portage/const.py
170 -
171 - einfo "Prefixing shebangs ..."
172 - while read -r -d $'\0' ; do
173 - local shebang=$(head -n1 "$REPLY")
174 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
175 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
176 - die "sed failed"
177 - fi
178 - done < <(find . -type f ! -name etc-update -print0)
179 -
180 - einfo "Adjusting make.globals, repos.conf and etc-update ..."
181 - hprefixify cnf/{make.globals,repos.conf} bin/etc-update
182 -
183 - if use prefix-guest ; then
184 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
185 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
186 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
187 - -i cnf/repos.conf || die "sed failed"
188 - fi
189 -
190 - einfo "Adding FEATURES=force-prefix to make.globals ..."
191 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
192 - || die "failed to append to make.globals"
193 - fi
194 -
195 - cd "${S}/cnf" || die
196 - if [ -f "make.conf.example.${ARCH}".diff ]; then
197 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
198 - die "Failed to patch make.conf.example"
199 - else
200 - eerror ""
201 - eerror "Portage does not have an arch-specific configuration for this arch."
202 - eerror "Please notify the arch maintainer about this issue. Using generic."
203 - eerror ""
204 - fi
205 -}
206 -
207 -python_compile_all() {
208 - local targets=()
209 - use doc && targets+=( docbook )
210 - use apidoc && targets+=( apidoc )
211 -
212 - if [[ ${targets[@]} ]]; then
213 - esetup.py "${targets[@]}"
214 - fi
215 -}
216 -
217 -python_test() {
218 - esetup.py test
219 -}
220 -
221 -python_install() {
222 - # Install sbin scripts to bindir for python-exec linking
223 - # they will be relocated in pkg_preinst()
224 - distutils-r1_python_install \
225 - --system-prefix="${EPREFIX}/usr" \
226 - --bindir="$(python_get_scriptdir)" \
227 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
228 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
229 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
230 - --sbindir="$(python_get_scriptdir)" \
231 - --sysconfdir="${EPREFIX}/etc" \
232 - "${@}"
233 -}
234 -
235 -python_install_all() {
236 - distutils-r1_python_install_all
237 -
238 - local targets=()
239 - use doc && targets+=(
240 - install_docbook
241 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
242 - )
243 - use apidoc && targets+=(
244 - install_apidoc
245 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
246 - )
247 -
248 - # install docs
249 - if [[ ${targets[@]} ]]; then
250 - esetup.py "${targets[@]}"
251 - fi
252 -
253 - dotmpfiles "${FILESDIR}"/portage-ccache.conf
254 -
255 - # Due to distutils/python-exec limitations
256 - # these must be installed to /usr/bin.
257 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
258 - einfo "Moving admin scripts to the correct directory"
259 - dodir /usr/sbin
260 - for target in ${sbin_relocations}; do
261 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
262 - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
263 - done
264 -}
265 -
266 -pkg_preinst() {
267 - python_setup
268 - local sitedir=$(python_get_sitedir)
269 - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
270 - env -u DISTDIR \
271 - -u PORTAGE_OVERRIDE_EPREFIX \
272 - -u PORTAGE_REPOSITORIES \
273 - -u PORTDIR \
274 - -u PORTDIR_OVERLAY \
275 - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
276 - "${PYTHON}" -m portage._compat_upgrade.default_locations || die
277 -
278 - env -u BINPKG_COMPRESS \
279 - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
280 - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
281 -
282 - # elog dir must exist to avoid logrotate error for bug #415911.
283 - # This code runs in preinst in order to bypass the mapping of
284 - # portage:portage to root:root which happens after src_install.
285 - keepdir /var/log/portage/elog
286 - # This is allowed to fail if the user/group are invalid for prefix users.
287 - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
288 - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
289 - fi
290 -
291 - if has_version "<${CATEGORY}/${PN}-2.3.77"; then
292 - elog "The emerge --autounmask option is now disabled by default, except for"
293 - elog "portions of behavior which are controlled by the --autounmask-use and"
294 - elog "--autounmask-license options. For backward compatibility, previous"
295 - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
296 - elog "Users can get the old behavior simply by adding --autounmask to the"
297 - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
298 - elog "change, see https://bugs.gentoo.org/658648."
299 - fi
300 -}