1 |
commit: 9766cef34b23cb3389aa44ebba3d5dbdf44b6863 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 13 01:03:13 2017 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 13 02:48:26 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9766cef3 |
7 |
|
8 |
sys-apps/portage: version bump to 2.3.7 |
9 |
|
10 |
Fixed bugs: |
11 |
|
12 |
#424423 - multilib-strict: disable recursion into subdirectories |
13 |
#608880 - eapply_user: combine sort for all dirs |
14 |
#610670 - man/portage.5: document -* in profile "packages" files |
15 |
#619612 - emerge: warn for --autounmask-continue with --autounmask=n |
16 |
#619620 - depgraph: account for binpkg-multi-instance in unused warning |
17 |
#619626 - depgraph: prune unnecessary rebuilds for --autounmask-continue |
18 |
#622480 - emerge: add --autounmask-keep-keywords option |
19 |
#623648 - fuzzy search: weigh category similarity independently |
20 |
#625246 - emerge --getbinpkg: https support for If-Modified-Since |
21 |
|
22 |
Package-Manager: Portage-2.3.7, Repoman-2.3.2 |
23 |
|
24 |
sys-apps/portage/Manifest | 1 + |
25 |
sys-apps/portage/portage-2.3.7.ebuild | 247 ++++++++++++++++++++++++++++++++++ |
26 |
2 files changed, 248 insertions(+) |
27 |
|
28 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
29 |
index 6b411620c57..6ab49c36264 100644 |
30 |
--- a/sys-apps/portage/Manifest |
31 |
+++ b/sys-apps/portage/Manifest |
32 |
@@ -1,2 +1,3 @@ |
33 |
DIST portage-2.3.5.tar.bz2 933047 SHA256 9b3282eee8f7f5728a4a71864d6b34315d71d43c52b2b650cf0d8f412c871941 SHA512 c403578caf40d97e8081c203d433b515cb2fdb14cb8b7d2652ed664bd079e65db32b54ce12ff495af6dd5fb468c5a1ef58d335e202ede5355d115049e21a6a35 WHIRLPOOL 25dbb6547d6488cebc1baf093a600e2034e17558306fd55f5502346330a78012e32d3c49dcf0445664c69d4e3e6b2580762417324ccd0bf3aa08575245165a24 |
34 |
DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636 |
35 |
+DIST portage-2.3.7.tar.bz2 937153 SHA256 5e0b78766f3392be7562eeb9e7749cda861ebf1c5350929f33b0557310cd16a3 SHA512 a1a5b2c35c20b89b2b50c56695be743011cdebd637c9e27cbdbc359ebae051f7876fd118a7c7dde669ad9ac5072877f5a7ad70083d67f5a51533ccd3abf91fcd WHIRLPOOL 6e36f48a81bbd985e23f2fb9196d8625bacabd5f8c83b6b4c86d832ffd0fa6115f0f9001157a0275b6206d076aa0c1131f0163ea2679f5490747a97919bf3467 |
36 |
|
37 |
diff --git a/sys-apps/portage/portage-2.3.7.ebuild b/sys-apps/portage/portage-2.3.7.ebuild |
38 |
new file mode 100644 |
39 |
index 00000000000..0d289074d71 |
40 |
--- /dev/null |
41 |
+++ b/sys-apps/portage/portage-2.3.7.ebuild |
42 |
@@ -0,0 +1,247 @@ |
43 |
+# Copyright 1999-2017 Gentoo Foundation |
44 |
+# Distributed under the terms of the GNU General Public License v2 |
45 |
+ |
46 |
+EAPI=5 |
47 |
+ |
48 |
+PYTHON_COMPAT=( |
49 |
+ pypy |
50 |
+ python3_3 python3_4 python3_5 python3_6 |
51 |
+ python2_7 |
52 |
+) |
53 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
54 |
+ |
55 |
+inherit distutils-r1 multilib |
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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
62 |
+SLOT="0" |
63 |
+IUSE="build doc epydoc +ipc linguas_ru +native-extensions 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? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
71 |
+# Require sandbox-2.2 for bug #288863. |
72 |
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
73 |
+# quite slow, so it's not considered in the dependencies as an alternative to |
74 |
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
75 |
+# for now, don't pull in xattr deps for other kernels. |
76 |
+# For whirlpool hash, require python[ssl] (bug #425046). |
77 |
+# For compgen, require bash[readline] (bug #445576). |
78 |
+RDEPEND=" |
79 |
+ >=app-arch/tar-1.27 |
80 |
+ dev-lang/python-exec:2 |
81 |
+ !build? ( |
82 |
+ >=sys-apps/sed-4.0.5 |
83 |
+ app-shells/bash:0[readline] |
84 |
+ >=app-admin/eselect-1.2 |
85 |
+ ) |
86 |
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
87 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
88 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
89 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
90 |
+ >=app-misc/pax-utils-0.1.17 |
91 |
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
92 |
+ xattr? ( kernel_linux? ( |
93 |
+ >=sys-apps/install-xattr-0.3 |
94 |
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
95 |
+ python2_7 pypy) |
96 |
+ ) ) |
97 |
+ !<app-admin/logrotate-3.8.0" |
98 |
+PDEPEND=" |
99 |
+ !build? ( |
100 |
+ >=net-misc/rsync-2.6.4 |
101 |
+ userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
102 |
+ )" |
103 |
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
104 |
+# NOTE: FEATURES=installsources requires debugedit and rsync |
105 |
+ |
106 |
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
107 |
+ |
108 |
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
109 |
+ |
110 |
+prefix_src_archives() { |
111 |
+ local x y |
112 |
+ for x in ${@}; do |
113 |
+ for y in ${SRC_ARCHIVES}; do |
114 |
+ echo ${y}/${x} |
115 |
+ done |
116 |
+ done |
117 |
+} |
118 |
+ |
119 |
+TARBALL_PV=${PV} |
120 |
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
121 |
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
122 |
+ |
123 |
+pkg_setup() { |
124 |
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
125 |
+} |
126 |
+ |
127 |
+python_prepare_all() { |
128 |
+ distutils-r1_python_prepare_all |
129 |
+ |
130 |
+ if use native-extensions; then |
131 |
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
132 |
+ setup.cfg || die |
133 |
+ fi |
134 |
+ |
135 |
+ if ! use ipc ; then |
136 |
+ einfo "Disabling ipc..." |
137 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
138 |
+ -i pym/_emerge/AbstractEbuildProcess.py || \ |
139 |
+ die "failed to patch AbstractEbuildProcess.py" |
140 |
+ fi |
141 |
+ |
142 |
+ if use xattr && use kernel_linux ; then |
143 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
144 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
145 |
+ || die "failed to append to make.globals" |
146 |
+ fi |
147 |
+ |
148 |
+ if [[ -n ${EPREFIX} ]] ; then |
149 |
+ einfo "Setting portage.const.EPREFIX ..." |
150 |
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
151 |
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
152 |
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
153 |
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
154 |
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
155 |
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
156 |
+ -i pym/portage/const.py || \ |
157 |
+ die "Failed to patch portage.const.EPREFIX" |
158 |
+ |
159 |
+ einfo "Prefixing shebangs ..." |
160 |
+ while read -r -d $'\0' ; do |
161 |
+ local shebang=$(head -n1 "$REPLY") |
162 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
163 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
164 |
+ die "sed failed" |
165 |
+ fi |
166 |
+ done < <(find . -type f -print0) |
167 |
+ |
168 |
+ einfo "Adjusting make.globals ..." |
169 |
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
170 |
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
171 |
+ -i cnf/make.globals || die "sed failed" |
172 |
+ |
173 |
+ einfo "Adjusting repos.conf ..." |
174 |
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
175 |
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
176 |
+ -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
177 |
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
178 |
+ -i cnf/repos.conf || die "sed failed" |
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 |
+} |