Gentoo Archives: gentoo-commits

From: Thomas Sachau <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/multilib-portage:master commit in: sys-apps/portage/
Date: Sat, 03 Apr 2021 08:42:26
Message-Id: 1617439327.67ebdd862bb1cf8326d93668d507583715f39e1e.tommy@gentoo
1 commit: 67ebdd862bb1cf8326d93668d507583715f39e1e
2 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 3 08:42:07 2021 +0000
4 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 3 08:42:07 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=67ebdd86
7
8 sys-apps/portage: Drop old version
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Manifest-Sign-Key: 0xC05330B3211CA2D4
12 Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
13
14 sys-apps/portage/Manifest | 11 +-
15 sys-apps/portage/portage-3.0.13.ebuild | 273 ---------------------------------
16 2 files changed, 5 insertions(+), 279 deletions(-)
17
18 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
19 index 9cd0b1c96..f155fecf5 100644
20 --- a/sys-apps/portage/Manifest
21 +++ b/sys-apps/portage/Manifest
22 @@ -3,17 +3,16 @@ Hash: SHA256
23
24 AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
25 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
26 -EBUILD portage-3.0.13.ebuild 8862 BLAKE2B fb6876b6bace59c6a11209b07eb7d0a11a292a04ee00f8f3517e8d24bc9089e83b2ad8fd1934b6ee435f579831fdc80cc690317c6439ad84791d6cdd5bf750de SHA512 0b10d05f1389fb054428254f0ba60b0fd90aa28e4d3e81b9b87944280f90120307e5aba92e61f8f28732292d161a50eab3636f51cf8459e5c518c3b3d9c8b0b7
27 EBUILD portage-3.0.14.ebuild 8862 BLAKE2B 73e2b035fe7b2354bc54509bee2f881bc456138ebc71bee5bee95e82770df788fa5abc67010832b252fc9a7315fc53f5d7d60e6da3755e06511a88feb6b08b75 SHA512 534b91282a3939e7bcac69208a9a14573de7c107422c3e5dedb7bd5461ed479cb69f38e7e135660b212da093f29266fd05852ced346794d17d44c58b4b9e34e4
28 EBUILD portage-3.0.18.ebuild 9223 BLAKE2B 9ead807d1a6894c88422c90204d8c39e5673b42b7fd9998640cbb57d56dfb115e6112ead8f8c962c0777a15eeafac0093b84a5a24cc8f1395911756fa1a5b668 SHA512 c5da02f09fe22111f7d87594fa83a7a28fb7c7431c9d0cc8e0d0c4a19fd761066b652b120a66b3166d3ac2c22d397e168d8467ae83be3a7c2aecd5cb6e4d0f28
29 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
30 -----BEGIN PGP SIGNATURE-----
31
32 -iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmBoKOhfFIAAAAAALgAo
33 +iQETBAEBCAB9FiEEFBBHHupGGwsJA3v7G7kqcTWJkGcFAmBoKlhfFIAAAAAALgAo
34 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0
35 MTA0NzFFRUE0NjFCMEIwOTAzN0JGQjFCQjkyQTcxMzU4OTkwNjcACgkQG7kqcTWJ
36 -kGdl+AP+J/IvkZA6xbrBuDW9eZpI8zL++g+SlXs9WrUwvz5anLFF9mlNWatnwF5x
37 -/QhxYX7CvozmfR9SgtQXnH+bdQKM2z1eJ6IxH1JO54YxqkCbzhLTxWCiQbyVHsZ6
38 -39c5FBHO8FL/SkrY+s5DKXRCKj+qKvr7qtzVzJsp44qbbMaROio=
39 -=3qhR
40 +kGe2YwQAvJISLNpnX3Vsw6uweHVFh341Obf9NXcXYfO9I50I+MNAZxYPOpfwm79Y
41 +HQegXyhilo/APxeDL3nKVQwnBf/xduCO4R82xPyDanWondFmeUN76T9P/UEpvdlH
42 +WuhmKbaOGVin9Yipc5XrQ4hsk3awClbOJX0jWc4H/0JRdzp8BrA=
43 +=VcPc
44 -----END PGP SIGNATURE-----
45
46 diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
47 deleted file mode 100644
48 index 19d6e2157..000000000
49 --- a/sys-apps/portage/portage-3.0.13.ebuild
50 +++ /dev/null
51 @@ -1,273 +0,0 @@
52 -# Copyright 1999-2021 Gentoo Authors
53 -# Distributed under the terms of the GNU General Public License v2
54 -
55 -EAPI=7
56 -
57 -DISTUTILS_USE_SETUPTOOLS=no
58 -PYTHON_COMPAT=( pypy3 python3_{6..9} )
59 -PYTHON_REQ_USE='bzip2(+),threads(+)'
60 -
61 -inherit distutils-r1 git-r3 linux-info multilib tmpfiles prefix
62 -
63 -EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
64 -EGIT_BRANCH="multilib"
65 -EGIT_COMMIT="2cf0e1224b7d8f4016dda0c197539c85d86ec65c"
66 -DESCRIPTION="Portage is the package management and distribution system for Gentoo"
67 -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
68 -
69 -LICENSE="GPL-2"
70 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
71 -SLOT="0"
72 -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
73 -RESTRICT="!test? ( test )"
74 -
75 -BDEPEND="test? ( dev-vcs/git )"
76 -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
77 - >=app-arch/tar-1.27
78 - dev-lang/python-exec:2
79 - >=sys-apps/sed-4.0.5 sys-devel/patch
80 - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
81 - >=sys-apps/abi-wrapper-1.0-r6
82 - apidoc? (
83 - dev-python/sphinx
84 - dev-python/sphinx-epytext
85 - )"
86 -# Require sandbox-2.2 for bug #288863.
87 -# For whirlpool hash, require python[ssl] (bug #425046).
88 -# For compgen, require bash[readline] (bug #445576).
89 -# app-portage/gemato goes without PYTHON_USEDEP since we're calling
90 -# the executable.
91 -RDEPEND="
92 - acct-user/portage
93 - app-arch/zstd
94 - >=app-arch/tar-1.27
95 - dev-lang/python-exec:2
96 - >=sys-apps/findutils-4.4
97 - !build? (
98 - >=sys-apps/sed-4.0.5
99 - app-shells/bash:0[readline]
100 - >=app-admin/eselect-1.2
101 - rsync-verify? (
102 - >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
103 - >=app-crypt/openpgp-keys-gentoo-release-20180706
104 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
105 - )
106 - )
107 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
108 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
109 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
110 - kernel_linux? ( sys-apps/util-linux )
111 - >=app-misc/pax-utils-0.1.17
112 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
113 - xattr? ( kernel_linux? (
114 - >=sys-apps/install-xattr-0.3
115 - ) )
116 - !<app-admin/logrotate-3.8.0
117 - >=sys-apps/abi-wrapper-1.0-r6
118 - !<app-portage/gentoolkit-0.4.6
119 - !<app-portage/repoman-2.3.10"
120 -PDEPEND="
121 - !build? (
122 - >=net-misc/rsync-2.6.4
123 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
124 - )"
125 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
126 -# NOTE: FEATURES=installsources requires debugedit and rsync
127 -
128 -pkg_pretend() {
129 - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
130 -
131 - check_extra_config
132 -}
133 -
134 -python_prepare_all() {
135 - distutils-r1_python_prepare_all
136 -
137 - sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
138 -
139 - if use gentoo-dev; then
140 - einfo "Disabling --dynamic-deps by default for gentoo-dev..."
141 - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
142 - -i lib/_emerge/create_depgraph_params.py || \
143 - die "failed to patch create_depgraph_params.py"
144 -
145 - einfo "Enabling additional FEATURES for gentoo-dev..."
146 - echo 'FEATURES="${FEATURES} strict-keepdir"' \
147 - >> cnf/make.globals || die
148 - fi
149 -
150 - if use native-extensions; then
151 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
152 - setup.cfg || die
153 - fi
154 -
155 - if ! use ipc ; then
156 - einfo "Disabling ipc..."
157 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
158 - -i lib/_emerge/AbstractEbuildProcess.py || \
159 - die "failed to patch AbstractEbuildProcess.py"
160 - fi
161 -
162 - if use xattr && use kernel_linux ; then
163 - einfo "Adding FEATURES=xattr to make.globals ..."
164 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
165 - || die "failed to append to make.globals"
166 - fi
167 -
168 - if use build || ! use rsync-verify; then
169 - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
170 - -e '/^sync-webrsync-verify-signature/s|yes|no|' \
171 - -i cnf/repos.conf || die "sed failed"
172 - fi
173 -
174 - if [[ -n ${EPREFIX} ]] ; then
175 - einfo "Setting portage.const.EPREFIX ..."
176 - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
177 - -w "/_BINARY/" lib/portage/const.py
178 -
179 - einfo "Prefixing shebangs ..."
180 - while read -r -d $'\0' ; do
181 - local shebang=$(head -n1 "$REPLY")
182 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
183 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
184 - die "sed failed"
185 - fi
186 - done < <(find . -type f ! -name etc-update -print0)
187 -
188 - einfo "Adjusting make.globals, repos.conf and etc-update ..."
189 - hprefixify cnf/{make.globals,repos.conf} bin/etc-update
190 -
191 - if use prefix-guest ; then
192 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
193 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
194 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
195 - -i cnf/repos.conf || die "sed failed"
196 - fi
197 -
198 - einfo "Adding FEATURES=force-prefix to make.globals ..."
199 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
200 - || die "failed to append to make.globals"
201 - fi
202 -
203 - cd "${S}/cnf" || die
204 - if [ -f "make.conf.example.${ARCH}".diff ]; then
205 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
206 - die "Failed to patch make.conf.example"
207 - else
208 - eerror ""
209 - eerror "Portage does not have an arch-specific configuration for this arch."
210 - eerror "Please notify the arch maintainer about this issue. Using generic."
211 - eerror ""
212 - fi
213 -}
214 -
215 -python_compile_all() {
216 - local targets=()
217 - use doc && targets+=( docbook )
218 - use apidoc && targets+=( apidoc )
219 -
220 - if [[ ${targets[@]} ]]; then
221 - esetup.py "${targets[@]}"
222 - fi
223 -}
224 -
225 -python_test() {
226 - esetup.py test
227 -}
228 -
229 -python_install() {
230 - # Install sbin scripts to bindir for python-exec linking
231 - # they will be relocated in pkg_preinst()
232 - distutils-r1_python_install \
233 - --system-prefix="${EPREFIX}/usr" \
234 - --bindir="$(python_get_scriptdir)" \
235 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
236 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
237 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
238 - --sbindir="$(python_get_scriptdir)" \
239 - --sysconfdir="${EPREFIX}/etc" \
240 - "${@}"
241 -}
242 -
243 -python_install_all() {
244 - distutils-r1_python_install_all
245 -
246 - local targets=()
247 - use doc && targets+=(
248 - install_docbook
249 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
250 - )
251 - use apidoc && targets+=(
252 - install_apidoc
253 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
254 - )
255 -
256 - # install docs
257 - if [[ ${targets[@]} ]]; then
258 - esetup.py "${targets[@]}"
259 - fi
260 -
261 - dotmpfiles "${FILESDIR}"/portage-ccache.conf
262 -
263 - # Due to distutils/python-exec limitations
264 - # these must be installed to /usr/bin.
265 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
266 - einfo "Moving admin scripts to the correct directory"
267 - dodir /usr/sbin
268 - for target in ${sbin_relocations}; do
269 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
270 - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
271 - done
272 -}
273 -
274 -pkg_preinst() {
275 - python_setup
276 - local sitedir=$(python_get_sitedir)
277 - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
278 - env -u DISTDIR \
279 - -u PORTAGE_OVERRIDE_EPREFIX \
280 - -u PORTAGE_REPOSITORIES \
281 - -u PORTDIR \
282 - -u PORTDIR_OVERLAY \
283 - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
284 - "${PYTHON}" -m portage._compat_upgrade.default_locations || die
285 -
286 - env -u BINPKG_COMPRESS \
287 - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
288 - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || 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 -
299 - if has_version "<${CATEGORY}/${PN}-2.3.77"; then
300 - elog "The emerge --autounmask option is now disabled by default, except for"
301 - elog "portions of behavior which are controlled by the --autounmask-use and"
302 - elog "--autounmask-license options. For backward compatibility, previous"
303 - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
304 - elog "Users can get the old behavior simply by adding --autounmask to the"
305 - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
306 - elog "change, see https://bugs.gentoo.org/658648."
307 - fi
308 -}
309 -
310 -pkg_postinst() {
311 - einfo
312 - elog "For setup instructions after switching to portage-multilib"
313 - elog "read doc/portage-multilib-instructions inside the multilib overlay"
314 - einfo
315 - elog "The bin/ dir of the overlay has some scripts to switch from lib32"
316 - elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags"
317 -
318 - einfo ""
319 - einfo "This release of portage NO LONGER contains the repoman code base."
320 - einfo "Repoman has its own ebuild and release package."
321 - einfo "For repoman functionality please emerge app-portage/repoman"
322 - einfo "Please report any bugs you may encounter."
323 - einfo ""
324 -}