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