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