1 |
commit: 33c0866db672207ca7d6eada7de26cf44b2af4a7 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 1 20:35:01 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 1 20:43:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c0866d |
7 |
|
8 |
sys-apps/portage: version bump to 2.3.32 |
9 |
|
10 |
#317337 - cross BDEPEND, BROOT, SYSROOT, etc |
11 |
#403697 - waitpid TypeError: an integer is required |
12 |
#614104 - AbstractPollTask._unregister_if.. event loop recursion |
13 |
#614108 - _LockProcess.unlock event loop recursion |
14 |
#614110 - BinpkgFetcher.lock event loop recursion |
15 |
#614112 - EbuildBuildDir.lock event loop recursion |
16 |
#649276 - surface key refresh exceptions early |
17 |
#653638 - emerge --config exit status is 0 after pkg_config calls die |
18 |
#653810 - EbuildFetcher._get_uri_map() event loop recursion |
19 |
#653844 - EbuildBuild._start() event loop recursion |
20 |
#653848 - EbuildMerge._merge_exit event loop recursion |
21 |
#653856 - use run_until_complete for asyncio compat |
22 |
#653946 - ManifestScheduler._iter_tasks() event loop recursion |
23 |
#654038 - FetchIterator.__iter__ event loop recursion |
24 |
#654224 - Larry's tail looks wrong |
25 |
#654276 - AbstractChildWatcher.add_child_handler asyncio compat |
26 |
#654382 - AbstractEventLoop add_reader/writer asyncio compat |
27 |
#654472 - Please implement EAPI 7 |
28 |
|
29 |
Package-Manager: Portage-2.3.32, Repoman-2.3.9 |
30 |
|
31 |
sys-apps/portage/Manifest | 1 + |
32 |
sys-apps/portage/portage-2.3.32.ebuild | 284 +++++++++++++++++++++++++++++++++ |
33 |
2 files changed, 285 insertions(+) |
34 |
|
35 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
36 |
index 9462f836d84..6c571ccf561 100644 |
37 |
--- a/sys-apps/portage/Manifest |
38 |
+++ b/sys-apps/portage/Manifest |
39 |
@@ -6,4 +6,5 @@ DIST portage-2.3.26.tar.bz2 970245 BLAKE2B b854bef894327b9e4beabca55d70368d32654 |
40 |
DIST portage-2.3.27.tar.bz2 970480 BLAKE2B dc46362773544102d9a07e686759d454a37177e9ac6e88d664c1aeb1676b9fb4e12662500f1de63644ad5eaf69d58bf85f38339c18d695cdc42930746dedb731 SHA512 791c87ffe958e883fe16562e69e606dd7ff860c13b2262b3eaa665f78acacdcb547c5e124b69d2c0faa36147fdc7c1d60669dee43b7401ea4f89784a619f81fe |
41 |
DIST portage-2.3.28.tar.bz2 975684 BLAKE2B 70f944700bba66e369877ffdb76c829d6521d429c65ded482482058639478c1c6e27366cb509252e59a4c3d2d295211f4efc2cecd84f7790674429a42a399a72 SHA512 208237faeee844bca829adc42b0407c246e09e91d5c5850c27696eb201f1009a87dce0b28cbbca4a27f2c9d58c0c102387a41483c976642acade83679a980777 |
42 |
DIST portage-2.3.31.tar.bz2 986684 BLAKE2B dc2a6e7da211da98320b872b26af46138791e2600d261fbff21823576804ea04dc77bc69c5f64d94a9bc3d0ec9cba0630b9093c12c426ae0561471092c837080 SHA512 7cca6aa6e8e6ce7ee3902686b437ea09c398630f46926d568a35f94b95be3c6ecc53a4ab6ee99d52c04755d5144900cc3aa84be24a49533518f8c50a9301ffb8 |
43 |
+DIST portage-2.3.32.tar.bz2 991775 BLAKE2B a28bdaa4af10a232c045b8154c275017840ef05758595ececb45ba8dc8e7e27afcd2a1005c4f02784c9a9adfe36d349b8ab388d6a889a11b6f15b2b96a708f59 SHA512 e7fdd2b5857885267e54c65701a31d9edb5052184d78e0b1bf21ee049113114d59dd8271b3ae1cb260fc831a6d1a0072c8bd0a23fd7e88363b8af03f0fc5c865 |
44 |
DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 |
45 |
|
46 |
diff --git a/sys-apps/portage/portage-2.3.32.ebuild b/sys-apps/portage/portage-2.3.32.ebuild |
47 |
new file mode 100644 |
48 |
index 00000000000..376030121e0 |
49 |
--- /dev/null |
50 |
+++ b/sys-apps/portage/portage-2.3.32.ebuild |
51 |
@@ -0,0 +1,284 @@ |
52 |
+# Copyright 1999-2018 Gentoo Foundation |
53 |
+# Distributed under the terms of the GNU General Public License v2 |
54 |
+ |
55 |
+EAPI=5 |
56 |
+ |
57 |
+PYTHON_COMPAT=( |
58 |
+ pypy |
59 |
+ python3_4 python3_5 python3_6 |
60 |
+ python2_7 |
61 |
+) |
62 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
63 |
+ |
64 |
+inherit distutils-r1 systemd |
65 |
+ |
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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
71 |
+SLOT="0" |
72 |
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
73 |
+ |
74 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
75 |
+ >=app-arch/tar-1.27 |
76 |
+ dev-lang/python-exec:2 |
77 |
+ >=sys-apps/sed-4.0.5 sys-devel/patch |
78 |
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
79 |
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
80 |
+# Require sandbox-2.2 for bug #288863. |
81 |
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
82 |
+# quite slow, so it's not considered in the dependencies as an alternative to |
83 |
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
84 |
+# for now, don't pull in xattr deps for other kernels. |
85 |
+# For whirlpool hash, require python[ssl] (bug #425046). |
86 |
+# For compgen, require bash[readline] (bug #445576). |
87 |
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling |
88 |
+# the executable. |
89 |
+RDEPEND=" |
90 |
+ >=app-arch/tar-1.27 |
91 |
+ dev-lang/python-exec:2 |
92 |
+ !build? ( |
93 |
+ >=sys-apps/sed-4.0.5 |
94 |
+ app-shells/bash:0[readline] |
95 |
+ >=app-admin/eselect-1.2 |
96 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
97 |
+ python{2_7,3_4,3_5} pypy) |
98 |
+ rsync-verify? ( |
99 |
+ >=app-portage/gemato-12.1 |
100 |
+ app-crypt/gentoo-keys |
101 |
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)] |
102 |
+ ) |
103 |
+ ) |
104 |
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
105 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
106 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
107 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
108 |
+ >=app-misc/pax-utils-0.1.17 |
109 |
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
110 |
+ xattr? ( kernel_linux? ( |
111 |
+ >=sys-apps/install-xattr-0.3 |
112 |
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
113 |
+ python2_7 pypy) |
114 |
+ ) ) |
115 |
+ !<app-admin/logrotate-3.8.0" |
116 |
+PDEPEND=" |
117 |
+ !build? ( |
118 |
+ >=net-misc/rsync-2.6.4 |
119 |
+ userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
120 |
+ )" |
121 |
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
122 |
+# NOTE: FEATURES=installsources requires debugedit and rsync |
123 |
+ |
124 |
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
125 |
+ |
126 |
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
127 |
+ |
128 |
+prefix_src_archives() { |
129 |
+ local x y |
130 |
+ for x in ${@}; do |
131 |
+ for y in ${SRC_ARCHIVES}; do |
132 |
+ echo ${y}/${x} |
133 |
+ done |
134 |
+ done |
135 |
+} |
136 |
+ |
137 |
+TARBALL_PV=${PV} |
138 |
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
139 |
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
140 |
+ |
141 |
+pkg_setup() { |
142 |
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
143 |
+} |
144 |
+ |
145 |
+python_prepare_all() { |
146 |
+ distutils-r1_python_prepare_all |
147 |
+ |
148 |
+ if use gentoo-dev; then |
149 |
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
150 |
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
151 |
+ -i pym/_emerge/create_depgraph_params.py || \ |
152 |
+ die "failed to patch create_depgraph_params.py" |
153 |
+ |
154 |
+ einfo "Enabling additional FEATURES for gentoo-dev..." |
155 |
+ echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ |
156 |
+ >> cnf/make.globals || die |
157 |
+ fi |
158 |
+ |
159 |
+ if use native-extensions; then |
160 |
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
161 |
+ setup.cfg || die |
162 |
+ fi |
163 |
+ |
164 |
+ if ! use ipc ; then |
165 |
+ einfo "Disabling ipc..." |
166 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
167 |
+ -i pym/_emerge/AbstractEbuildProcess.py || \ |
168 |
+ die "failed to patch AbstractEbuildProcess.py" |
169 |
+ fi |
170 |
+ |
171 |
+ if use xattr && use kernel_linux ; then |
172 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
173 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
174 |
+ || die "failed to append to make.globals" |
175 |
+ fi |
176 |
+ |
177 |
+ if use build || ! use rsync-verify; then |
178 |
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
179 |
+ -i cnf/repos.conf || die "sed failed" |
180 |
+ fi |
181 |
+ |
182 |
+ if [[ -n ${EPREFIX} ]] ; then |
183 |
+ einfo "Setting portage.const.EPREFIX ..." |
184 |
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
185 |
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
186 |
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
187 |
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
188 |
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
189 |
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
190 |
+ -i pym/portage/const.py || \ |
191 |
+ die "Failed to patch portage.const.EPREFIX" |
192 |
+ |
193 |
+ einfo "Prefixing shebangs ..." |
194 |
+ while read -r -d $'\0' ; do |
195 |
+ local shebang=$(head -n1 "$REPLY") |
196 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
197 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
198 |
+ die "sed failed" |
199 |
+ fi |
200 |
+ done < <(find . -type f -print0) |
201 |
+ |
202 |
+ einfo "Adjusting make.globals ..." |
203 |
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
204 |
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
205 |
+ -i cnf/make.globals || die "sed failed" |
206 |
+ |
207 |
+ einfo "Adjusting repos.conf ..." |
208 |
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
209 |
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ |
210 |
+ -i cnf/repos.conf || die "sed failed" |
211 |
+ if use prefix-guest ; then |
212 |
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
213 |
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
214 |
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
215 |
+ -i cnf/repos.conf || die "sed failed" |
216 |
+ fi |
217 |
+ |
218 |
+ einfo "Adding FEATURES=force-prefix to make.globals ..." |
219 |
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
220 |
+ || die "failed to append to make.globals" |
221 |
+ fi |
222 |
+ |
223 |
+ cd "${S}/cnf" || die |
224 |
+ if [ -f "make.conf.example.${ARCH}".diff ]; then |
225 |
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
226 |
+ die "Failed to patch make.conf.example" |
227 |
+ else |
228 |
+ eerror "" |
229 |
+ eerror "Portage does not have an arch-specific configuration for this arch." |
230 |
+ eerror "Please notify the arch maintainer about this issue. Using generic." |
231 |
+ eerror "" |
232 |
+ fi |
233 |
+} |
234 |
+ |
235 |
+python_compile_all() { |
236 |
+ local targets=() |
237 |
+ use doc && targets+=( docbook ) |
238 |
+ use epydoc && targets+=( epydoc ) |
239 |
+ |
240 |
+ if [[ ${targets[@]} ]]; then |
241 |
+ esetup.py "${targets[@]}" |
242 |
+ fi |
243 |
+} |
244 |
+ |
245 |
+python_test() { |
246 |
+ esetup.py test |
247 |
+} |
248 |
+ |
249 |
+python_install() { |
250 |
+ # Install sbin scripts to bindir for python-exec linking |
251 |
+ # they will be relocated in pkg_preinst() |
252 |
+ distutils-r1_python_install \ |
253 |
+ --system-prefix="${EPREFIX}/usr" \ |
254 |
+ --bindir="$(python_get_scriptdir)" \ |
255 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
256 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
257 |
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
258 |
+ --sbindir="$(python_get_scriptdir)" \ |
259 |
+ --sysconfdir="${EPREFIX}/etc" \ |
260 |
+ "${@}" |
261 |
+} |
262 |
+ |
263 |
+python_install_all() { |
264 |
+ distutils-r1_python_install_all |
265 |
+ |
266 |
+ local targets=() |
267 |
+ use doc && targets+=( |
268 |
+ install_docbook |
269 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
270 |
+ ) |
271 |
+ use epydoc && targets+=( |
272 |
+ install_epydoc |
273 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
274 |
+ ) |
275 |
+ |
276 |
+ # install docs |
277 |
+ if [[ ${targets[@]} ]]; then |
278 |
+ esetup.py "${targets[@]}" |
279 |
+ fi |
280 |
+ |
281 |
+ systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf |
282 |
+ |
283 |
+ # Due to distutils/python-exec limitations |
284 |
+ # these must be installed to /usr/bin. |
285 |
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
286 |
+ einfo "Moving admin scripts to the correct directory" |
287 |
+ dodir /usr/sbin |
288 |
+ for target in ${sbin_relocations}; do |
289 |
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
290 |
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
291 |
+ done |
292 |
+} |
293 |
+ |
294 |
+pkg_preinst() { |
295 |
+ # comment out sanity test until it is fixed to work |
296 |
+ # with the new PORTAGE_PYM_PATH |
297 |
+ #if [[ $ROOT == / ]] ; then |
298 |
+ ## Run some minimal tests as a sanity check. |
299 |
+ #local test_runner=$(find "${ED}" -name runTests) |
300 |
+ #if [[ -n $test_runner && -x $test_runner ]] ; then |
301 |
+ #einfo "Running preinst sanity tests..." |
302 |
+ #"$test_runner" || die "preinst sanity tests failed" |
303 |
+ #fi |
304 |
+ #fi |
305 |
+ |
306 |
+ # elog dir must exist to avoid logrotate error for bug #415911. |
307 |
+ # This code runs in preinst in order to bypass the mapping of |
308 |
+ # portage:portage to root:root which happens after src_install. |
309 |
+ keepdir /var/log/portage/elog |
310 |
+ # This is allowed to fail if the user/group are invalid for prefix users. |
311 |
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
312 |
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
313 |
+ fi |
314 |
+ |
315 |
+ if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ |
316 |
+ has_version "<${CATEGORY}/${PN}-2.3.3"; then |
317 |
+ SYNC_DEPTH_UPGRADE=true |
318 |
+ else |
319 |
+ SYNC_DEPTH_UPGRADE=false |
320 |
+ fi |
321 |
+} |
322 |
+ |
323 |
+pkg_postinst() { |
324 |
+ if ${SYNC_DEPTH_UPGRADE}; then |
325 |
+ ewarn "Please note that this release no longer respects sync-depth for" |
326 |
+ ewarn "git repositories. There have been too many problems and" |
327 |
+ ewarn "performance issues. See bugs 552814, 559008" |
328 |
+ fi |
329 |
+ einfo "" |
330 |
+ einfo "This release of portage NO LONGER contains the repoman code base." |
331 |
+ einfo "Repoman has its own ebuild and release package." |
332 |
+ einfo "For repoman functionality please emerge app-portage/repoman" |
333 |
+ einfo "Please report any bugs you may encounter." |
334 |
+ einfo "" |
335 |
+} |