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