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