1 |
commit: fc29bf45412c227e5b0995472132913289d0f8f2 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 30 06:18:27 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 30 06:21:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc29bf45 |
7 |
|
8 |
sys-apps/portage: version bump to 2.3.21 |
9 |
|
10 |
#612972 - fix global scope DISTDIR setting to be consistent |
11 |
#645416 - dep_zapdeps: fix virtual/rust handling |
12 |
#645780 - add --changed-deps-report option |
13 |
|
14 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
15 |
|
16 |
# Please enter the commit message for your changes. Lines starting |
17 |
# with '#' will be kept; you may remove them yourself if you want to. |
18 |
# An empty message aborts the commit. |
19 |
# |
20 |
# Date: Mon Jan 29 22:18:27 2018 -0800 |
21 |
# |
22 |
# On branch master |
23 |
# Your branch is ahead of 'gentoo/master' by 1 commit. |
24 |
# (use "git push" to publish your local commits) |
25 |
# |
26 |
# Changes to be committed: |
27 |
# modified: Manifest |
28 |
# new file: portage-2.3.21.ebuild |
29 |
# |
30 |
|
31 |
sys-apps/portage/Manifest | 1 + |
32 |
sys-apps/portage/portage-2.3.21.ebuild | 271 +++++++++++++++++++++++++++++++++ |
33 |
2 files changed, 272 insertions(+) |
34 |
|
35 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
36 |
index f256bdfa605..dd7014a2b64 100644 |
37 |
--- a/sys-apps/portage/Manifest |
38 |
+++ b/sys-apps/portage/Manifest |
39 |
@@ -3,5 +3,6 @@ DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f5 |
40 |
DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf |
41 |
DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d |
42 |
DIST portage-2.3.20.tar.bz2 956633 BLAKE2B cf166a10522c5fab6b273674be4d7a673b961fe1c2ca649c7fa6d3759364dd1454ea57edd1e99fd2648b47244fde6f311fb925f50b9a118a1d2880048eb9f39e SHA512 e4fde56f5293b25ef5f484cf601c1db71c350603987e1b2736d9b8434158e8778c637dd5891401e6d484c7a11f1982bbe8213a352c185fc4c6b0039006756764 |
43 |
+DIST portage-2.3.21.tar.bz2 958588 BLAKE2B 01dadfa582e5810c42b389708b108016697ad78c1d184b06d5a2f0d4ce8086232200fa135920d4a1ab9fbde0020f2c8ce4322cd087fd70cb4aa6c42b92226dda SHA512 a6acc6b553f3ecd57479328a0261f09dbe92a84b2a7ae21a97d4651ee392d420c76b51384054d6a3ea41bce19a9b2178faf491273afc6d4af9e0559ca7b79f2c |
44 |
DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 |
45 |
DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 |
46 |
|
47 |
diff --git a/sys-apps/portage/portage-2.3.21.ebuild b/sys-apps/portage/portage-2.3.21.ebuild |
48 |
new file mode 100644 |
49 |
index 00000000000..4bd08154f1c |
50 |
--- /dev/null |
51 |
+++ b/sys-apps/portage/portage-2.3.21.ebuild |
52 |
@@ -0,0 +1,271 @@ |
53 |
+# Copyright 1999-2018 Gentoo Foundation |
54 |
+# Distributed under the terms of the GNU General Public License v2 |
55 |
+ |
56 |
+EAPI=5 |
57 |
+ |
58 |
+PYTHON_COMPAT=( |
59 |
+ pypy |
60 |
+ python3_4 python3_5 python3_6 |
61 |
+ python2_7 |
62 |
+) |
63 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
64 |
+ |
65 |
+inherit distutils-r1 systemd |
66 |
+ |
67 |
+DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
68 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
69 |
+ |
70 |
+LICENSE="GPL-2" |
71 |
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
72 |
+SLOT="0" |
73 |
+IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr" |
74 |
+ |
75 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
76 |
+ >=app-arch/tar-1.27 |
77 |
+ dev-lang/python-exec:2 |
78 |
+ >=sys-apps/sed-4.0.5 sys-devel/patch |
79 |
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
80 |
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
81 |
+# Require sandbox-2.2 for bug #288863. |
82 |
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
83 |
+# quite slow, so it's not considered in the dependencies as an alternative to |
84 |
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
85 |
+# for now, don't pull in xattr deps for other kernels. |
86 |
+# For whirlpool hash, require python[ssl] (bug #425046). |
87 |
+# For compgen, require bash[readline] (bug #445576). |
88 |
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling |
89 |
+# the executable. |
90 |
+RDEPEND=" |
91 |
+ >=app-arch/tar-1.27 |
92 |
+ dev-lang/python-exec:2 |
93 |
+ !build? ( |
94 |
+ >=sys-apps/sed-4.0.5 |
95 |
+ app-shells/bash:0[readline] |
96 |
+ >=app-admin/eselect-1.2 |
97 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
98 |
+ python{2_7,3_4,3_5} pypy) |
99 |
+ ) |
100 |
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
101 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
102 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
103 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
104 |
+ >=app-misc/pax-utils-0.1.17 |
105 |
+ rsync-verify? ( |
106 |
+ >=app-portage/gemato-10 |
107 |
+ app-crypt/gentoo-keys |
108 |
+ ) |
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 native-extensions; then |
149 |
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
150 |
+ setup.cfg || die |
151 |
+ fi |
152 |
+ |
153 |
+ if ! use ipc ; then |
154 |
+ einfo "Disabling ipc..." |
155 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
156 |
+ -i pym/_emerge/AbstractEbuildProcess.py || \ |
157 |
+ die "failed to patch AbstractEbuildProcess.py" |
158 |
+ fi |
159 |
+ |
160 |
+ if use xattr && use kernel_linux ; then |
161 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
162 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
163 |
+ || die "failed to append to make.globals" |
164 |
+ fi |
165 |
+ |
166 |
+ if ! use rsync-verify; then |
167 |
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
168 |
+ -i cnf/repos.conf || die "sed failed" |
169 |
+ fi |
170 |
+ |
171 |
+ if [[ -n ${EPREFIX} ]] ; then |
172 |
+ einfo "Setting portage.const.EPREFIX ..." |
173 |
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
174 |
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
175 |
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
176 |
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
177 |
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
178 |
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
179 |
+ -i pym/portage/const.py || \ |
180 |
+ die "Failed to patch portage.const.EPREFIX" |
181 |
+ |
182 |
+ einfo "Prefixing shebangs ..." |
183 |
+ while read -r -d $'\0' ; do |
184 |
+ local shebang=$(head -n1 "$REPLY") |
185 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
186 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
187 |
+ die "sed failed" |
188 |
+ fi |
189 |
+ done < <(find . -type f -print0) |
190 |
+ |
191 |
+ einfo "Adjusting make.globals ..." |
192 |
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
193 |
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
194 |
+ -i cnf/make.globals || die "sed failed" |
195 |
+ |
196 |
+ einfo "Adjusting repos.conf ..." |
197 |
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
198 |
+ -i cnf/repos.conf || die "sed failed" |
199 |
+ if use prefix-guest ; then |
200 |
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
201 |
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
202 |
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
203 |
+ -i cnf/repos.conf || die "sed failed" |
204 |
+ fi |
205 |
+ |
206 |
+ einfo "Adding FEATURES=force-prefix to make.globals ..." |
207 |
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
208 |
+ || die "failed to append to make.globals" |
209 |
+ fi |
210 |
+ |
211 |
+ cd "${S}/cnf" || die |
212 |
+ if [ -f "make.conf.example.${ARCH}".diff ]; then |
213 |
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
214 |
+ die "Failed to patch make.conf.example" |
215 |
+ else |
216 |
+ eerror "" |
217 |
+ eerror "Portage does not have an arch-specific configuration for this arch." |
218 |
+ eerror "Please notify the arch maintainer about this issue. Using generic." |
219 |
+ eerror "" |
220 |
+ fi |
221 |
+} |
222 |
+ |
223 |
+python_compile_all() { |
224 |
+ local targets=() |
225 |
+ use doc && targets+=( docbook ) |
226 |
+ use epydoc && targets+=( epydoc ) |
227 |
+ |
228 |
+ if [[ ${targets[@]} ]]; then |
229 |
+ esetup.py "${targets[@]}" |
230 |
+ fi |
231 |
+} |
232 |
+ |
233 |
+python_test() { |
234 |
+ esetup.py test |
235 |
+} |
236 |
+ |
237 |
+python_install() { |
238 |
+ # Install sbin scripts to bindir for python-exec linking |
239 |
+ # they will be relocated in pkg_preinst() |
240 |
+ distutils-r1_python_install \ |
241 |
+ --system-prefix="${EPREFIX}/usr" \ |
242 |
+ --bindir="$(python_get_scriptdir)" \ |
243 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
244 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
245 |
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
246 |
+ --sbindir="$(python_get_scriptdir)" \ |
247 |
+ --sysconfdir="${EPREFIX}/etc" \ |
248 |
+ "${@}" |
249 |
+} |
250 |
+ |
251 |
+python_install_all() { |
252 |
+ distutils-r1_python_install_all |
253 |
+ |
254 |
+ local targets=() |
255 |
+ use doc && targets+=( |
256 |
+ install_docbook |
257 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
258 |
+ ) |
259 |
+ use epydoc && targets+=( |
260 |
+ install_epydoc |
261 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
262 |
+ ) |
263 |
+ |
264 |
+ # install docs |
265 |
+ if [[ ${targets[@]} ]]; then |
266 |
+ esetup.py "${targets[@]}" |
267 |
+ fi |
268 |
+ |
269 |
+ systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf |
270 |
+ |
271 |
+ # Due to distutils/python-exec limitations |
272 |
+ # these must be installed to /usr/bin. |
273 |
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
274 |
+ einfo "Moving admin scripts to the correct directory" |
275 |
+ dodir /usr/sbin |
276 |
+ for target in ${sbin_relocations}; do |
277 |
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
278 |
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
279 |
+ done |
280 |
+} |
281 |
+ |
282 |
+pkg_preinst() { |
283 |
+ # comment out sanity test until it is fixed to work |
284 |
+ # with the new PORTAGE_PYM_PATH |
285 |
+ #if [[ $ROOT == / ]] ; then |
286 |
+ ## Run some minimal tests as a sanity check. |
287 |
+ #local test_runner=$(find "${ED}" -name runTests) |
288 |
+ #if [[ -n $test_runner && -x $test_runner ]] ; then |
289 |
+ #einfo "Running preinst sanity tests..." |
290 |
+ #"$test_runner" || die "preinst sanity tests failed" |
291 |
+ #fi |
292 |
+ #fi |
293 |
+ |
294 |
+ # elog dir must exist to avoid logrotate error for bug #415911. |
295 |
+ # This code runs in preinst in order to bypass the mapping of |
296 |
+ # portage:portage to root:root which happens after src_install. |
297 |
+ keepdir /var/log/portage/elog |
298 |
+ # This is allowed to fail if the user/group are invalid for prefix users. |
299 |
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
300 |
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
301 |
+ fi |
302 |
+ |
303 |
+ if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ |
304 |
+ has_version "<${CATEGORY}/${PN}-2.3.3"; then |
305 |
+ SYNC_DEPTH_UPGRADE=true |
306 |
+ else |
307 |
+ SYNC_DEPTH_UPGRADE=false |
308 |
+ fi |
309 |
+} |
310 |
+ |
311 |
+pkg_postinst() { |
312 |
+ if ${SYNC_DEPTH_UPGRADE}; then |
313 |
+ ewarn "Please note that this release no longer respects sync-depth for" |
314 |
+ ewarn "git repositories. There have been too many problems and" |
315 |
+ ewarn "performance issues. See bugs 552814, 559008" |
316 |
+ fi |
317 |
+ einfo "" |
318 |
+ einfo "This release of portage NO LONGER contains the repoman code base." |
319 |
+ einfo "Repoman has its own ebuild and release package." |
320 |
+ einfo "For repoman functionality please emerge app-portage/repoman" |
321 |
+ einfo "Please report any bugs you may encounter." |
322 |
+ einfo "" |
323 |
+} |