1 |
commit: 23cd439117aef5eb54b171feabf0778175f89766 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 14 04:59:40 2017 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 14 05:15:28 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23cd4391 |
7 |
|
8 |
sys-apps/portage: version bump to 2.3.14 |
9 |
|
10 |
#635540 - dep_zapdeps: install new package, avoid downgrade |
11 |
#637284 - vardbapi.removeFromContents: update NEEDED |
12 |
#632026 - dep_check: use DNF to optimize overlapping virtual || deps |
13 |
|
14 |
Package-Manager: Portage-2.3.14, Repoman-2.3.5 |
15 |
|
16 |
sys-apps/portage/Manifest | 1 + |
17 |
sys-apps/portage/portage-2.3.14.ebuild | 253 +++++++++++++++++++++++++++++++++ |
18 |
2 files changed, 254 insertions(+) |
19 |
|
20 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
21 |
index 44eb3590b26..0381a9e0b21 100644 |
22 |
--- a/sys-apps/portage/Manifest |
23 |
+++ b/sys-apps/portage/Manifest |
24 |
@@ -1,4 +1,5 @@ |
25 |
DIST portage-2.3.12.tar.bz2 944929 SHA256 4a6b6c1d038131d141b932b1ad93768a7823acd0704093c6c1e5adb9f913ba1d SHA512 39f6d938e167a96b338dc85191bfc25d6db2328014f13386dd2552b9a3c36308b9b4d444dcd3342e7f6761e26d97fc0b3e2c8a9092ef7aa863d55c26bdccfd3a WHIRLPOOL 34cc7567dfe4913129a451a8e8597c48382c6c423ec1a008db1fc489f5da99d5cf371ffa48b8449d799aa98e3f0dba98f7c8b55a4b8744fdb857f914448b6f5c |
26 |
DIST portage-2.3.13.tar.bz2 945477 SHA256 f3ed1445cf2bbfc6c5986873aff055e4caa3b695f37e033930ad2533bdea8d24 SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3 WHIRLPOOL af9140e46d7e94994b276d93389c4953de77c77e9bf132c20b85bfdd477aaaeef2bb05293e94058158cf7800711ae7d1ff694d6ec9fd5e940849fd538b86c501 |
27 |
+DIST portage-2.3.14.tar.bz2 948535 SHA256 98eaeef4057f4c5a2251638428865d996ae2cd9721dc5d9422c29af607c75772 SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732 WHIRLPOOL e61168eaed5d00a37f1367d27455e111cd7c1bf071dea1ffa337747fd9c60a58e1b845e51151caf1248beb2a945b08184ce0ac402d949f29bf5a651197f95806 |
28 |
DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636 |
29 |
DIST portage-2.3.8.tar.bz2 938062 SHA256 19b73658dca848d215c5527d1d020c8106352007a84d7675e5efd0a7b9b48a8a SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 WHIRLPOOL 0c576bbd8aaf8b27fa1746c863ac02b2a5f361d9011d17250ffbe4b830a8a6bf10a0aee48b5181a8aa6c55d8ad81ad411195da2a6253e9b324d3c7397053fe29 |
30 |
|
31 |
diff --git a/sys-apps/portage/portage-2.3.14.ebuild b/sys-apps/portage/portage-2.3.14.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..ebc47f87460 |
34 |
--- /dev/null |
35 |
+++ b/sys-apps/portage/portage-2.3.14.ebuild |
36 |
@@ -0,0 +1,253 @@ |
37 |
+# Copyright 1999-2017 Gentoo Foundation |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=5 |
41 |
+ |
42 |
+PYTHON_COMPAT=( |
43 |
+ pypy |
44 |
+ python3_4 python3_5 python3_6 |
45 |
+ python2_7 |
46 |
+) |
47 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
48 |
+ |
49 |
+inherit distutils-r1 |
50 |
+ |
51 |
+DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
52 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
53 |
+ |
54 |
+LICENSE="GPL-2" |
55 |
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86" |
56 |
+SLOT="0" |
57 |
+IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr" |
58 |
+ |
59 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
60 |
+ >=app-arch/tar-1.27 |
61 |
+ dev-lang/python-exec:2 |
62 |
+ >=sys-apps/sed-4.0.5 sys-devel/patch |
63 |
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
64 |
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
65 |
+# Require sandbox-2.2 for bug #288863. |
66 |
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
67 |
+# quite slow, so it's not considered in the dependencies as an alternative to |
68 |
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
69 |
+# for now, don't pull in xattr deps for other kernels. |
70 |
+# For whirlpool hash, require python[ssl] (bug #425046). |
71 |
+# For compgen, require bash[readline] (bug #445576). |
72 |
+RDEPEND=" |
73 |
+ >=app-arch/tar-1.27 |
74 |
+ dev-lang/python-exec:2 |
75 |
+ !build? ( |
76 |
+ >=sys-apps/sed-4.0.5 |
77 |
+ app-shells/bash:0[readline] |
78 |
+ >=app-admin/eselect-1.2 |
79 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
80 |
+ python{2_7,3_4,3_5} pypy) |
81 |
+ ) |
82 |
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
83 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
84 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
85 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
86 |
+ >=app-misc/pax-utils-0.1.17 |
87 |
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
88 |
+ xattr? ( kernel_linux? ( |
89 |
+ >=sys-apps/install-xattr-0.3 |
90 |
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
91 |
+ python2_7 pypy) |
92 |
+ ) ) |
93 |
+ !<app-admin/logrotate-3.8.0 |
94 |
+ !<app-portage/repoman-2.3.5" |
95 |
+PDEPEND=" |
96 |
+ !build? ( |
97 |
+ >=net-misc/rsync-2.6.4 |
98 |
+ userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
99 |
+ )" |
100 |
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
101 |
+# NOTE: FEATURES=installsources requires debugedit and rsync |
102 |
+ |
103 |
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
104 |
+ |
105 |
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
106 |
+ |
107 |
+prefix_src_archives() { |
108 |
+ local x y |
109 |
+ for x in ${@}; do |
110 |
+ for y in ${SRC_ARCHIVES}; do |
111 |
+ echo ${y}/${x} |
112 |
+ done |
113 |
+ done |
114 |
+} |
115 |
+ |
116 |
+TARBALL_PV=${PV} |
117 |
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
118 |
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
119 |
+ |
120 |
+pkg_setup() { |
121 |
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
122 |
+} |
123 |
+ |
124 |
+python_prepare_all() { |
125 |
+ distutils-r1_python_prepare_all |
126 |
+ |
127 |
+ if use native-extensions; then |
128 |
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
129 |
+ setup.cfg || die |
130 |
+ fi |
131 |
+ |
132 |
+ if ! use ipc ; then |
133 |
+ einfo "Disabling ipc..." |
134 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
135 |
+ -i pym/_emerge/AbstractEbuildProcess.py || \ |
136 |
+ die "failed to patch AbstractEbuildProcess.py" |
137 |
+ fi |
138 |
+ |
139 |
+ if use xattr && use kernel_linux ; then |
140 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
141 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
142 |
+ || die "failed to append to make.globals" |
143 |
+ fi |
144 |
+ |
145 |
+ if [[ -n ${EPREFIX} ]] ; then |
146 |
+ einfo "Setting portage.const.EPREFIX ..." |
147 |
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
148 |
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
149 |
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
150 |
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
151 |
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
152 |
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
153 |
+ -i pym/portage/const.py || \ |
154 |
+ die "Failed to patch portage.const.EPREFIX" |
155 |
+ |
156 |
+ einfo "Prefixing shebangs ..." |
157 |
+ while read -r -d $'\0' ; do |
158 |
+ local shebang=$(head -n1 "$REPLY") |
159 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
160 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
161 |
+ die "sed failed" |
162 |
+ fi |
163 |
+ done < <(find . -type f -print0) |
164 |
+ |
165 |
+ einfo "Adjusting make.globals ..." |
166 |
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
167 |
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
168 |
+ -i cnf/make.globals || die "sed failed" |
169 |
+ |
170 |
+ einfo "Adjusting repos.conf ..." |
171 |
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
172 |
+ -i cnf/repos.conf || die "sed failed" |
173 |
+ if use prefix-guest ; then |
174 |
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
175 |
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
176 |
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
177 |
+ -i cnf/repos.conf || die "sed failed" |
178 |
+ fi |
179 |
+ |
180 |
+ einfo "Adding FEATURES=force-prefix to make.globals ..." |
181 |
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
182 |
+ || die "failed to append to make.globals" |
183 |
+ fi |
184 |
+ |
185 |
+ cd "${S}/cnf" || die |
186 |
+ if [ -f "make.conf.example.${ARCH}".diff ]; then |
187 |
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
188 |
+ die "Failed to patch make.conf.example" |
189 |
+ else |
190 |
+ eerror "" |
191 |
+ eerror "Portage does not have an arch-specific configuration for this arch." |
192 |
+ eerror "Please notify the arch maintainer about this issue. Using generic." |
193 |
+ eerror "" |
194 |
+ fi |
195 |
+} |
196 |
+ |
197 |
+python_compile_all() { |
198 |
+ local targets=() |
199 |
+ use doc && targets+=( docbook ) |
200 |
+ use epydoc && targets+=( epydoc ) |
201 |
+ |
202 |
+ if [[ ${targets[@]} ]]; then |
203 |
+ esetup.py "${targets[@]}" |
204 |
+ fi |
205 |
+} |
206 |
+ |
207 |
+python_test() { |
208 |
+ esetup.py test |
209 |
+} |
210 |
+ |
211 |
+python_install() { |
212 |
+ # Install sbin scripts to bindir for python-exec linking |
213 |
+ # they will be relocated in pkg_preinst() |
214 |
+ distutils-r1_python_install \ |
215 |
+ --system-prefix="${EPREFIX}/usr" \ |
216 |
+ --bindir="$(python_get_scriptdir)" \ |
217 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
218 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
219 |
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
220 |
+ --sbindir="$(python_get_scriptdir)" \ |
221 |
+ --sysconfdir="${EPREFIX}/etc" \ |
222 |
+ "${@}" |
223 |
+} |
224 |
+ |
225 |
+python_install_all() { |
226 |
+ distutils-r1_python_install_all |
227 |
+ |
228 |
+ local targets=() |
229 |
+ use doc && targets+=( install_docbook ) |
230 |
+ use epydoc && targets+=( install_epydoc ) |
231 |
+ |
232 |
+ # install docs |
233 |
+ if [[ ${targets[@]} ]]; then |
234 |
+ esetup.py "${targets[@]}" |
235 |
+ fi |
236 |
+ |
237 |
+ # Due to distutils/python-exec limitations |
238 |
+ # these must be installed to /usr/bin. |
239 |
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
240 |
+ einfo "Moving admin scripts to the correct directory" |
241 |
+ dodir /usr/sbin |
242 |
+ for target in ${sbin_relocations}; do |
243 |
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
244 |
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
245 |
+ done |
246 |
+} |
247 |
+ |
248 |
+pkg_preinst() { |
249 |
+ # comment out sanity test until it is fixed to work |
250 |
+ # with the new PORTAGE_PYM_PATH |
251 |
+ #if [[ $ROOT == / ]] ; then |
252 |
+ ## Run some minimal tests as a sanity check. |
253 |
+ #local test_runner=$(find "${ED}" -name runTests) |
254 |
+ #if [[ -n $test_runner && -x $test_runner ]] ; then |
255 |
+ #einfo "Running preinst sanity tests..." |
256 |
+ #"$test_runner" || die "preinst sanity tests failed" |
257 |
+ #fi |
258 |
+ #fi |
259 |
+ |
260 |
+ # elog dir must exist to avoid logrotate error for bug #415911. |
261 |
+ # This code runs in preinst in order to bypass the mapping of |
262 |
+ # portage:portage to root:root which happens after src_install. |
263 |
+ keepdir /var/log/portage/elog |
264 |
+ # This is allowed to fail if the user/group are invalid for prefix users. |
265 |
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
266 |
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
267 |
+ fi |
268 |
+ |
269 |
+ if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ |
270 |
+ has_version "<${CATEGORY}/${PN}-2.3.3"; then |
271 |
+ SYNC_DEPTH_UPGRADE=true |
272 |
+ else |
273 |
+ SYNC_DEPTH_UPGRADE=false |
274 |
+ fi |
275 |
+} |
276 |
+ |
277 |
+pkg_postinst() { |
278 |
+ if ${SYNC_DEPTH_UPGRADE}; then |
279 |
+ ewarn "Please note that this release no longer respects sync-depth for" |
280 |
+ ewarn "git repositories. There have been too many problems and" |
281 |
+ ewarn "performance issues. See bugs 552814, 559008" |
282 |
+ fi |
283 |
+ einfo "" |
284 |
+ einfo "This release of portage NO LONGER contains the repoman code base." |
285 |
+ einfo "Repoman has its own ebuild and release package." |
286 |
+ einfo "For repoman functionality please emerge app-portage/repoman" |
287 |
+ einfo "Please report any bugs you may encounter." |
288 |
+ einfo "" |
289 |
+} |