1 |
commit: d57fade44620fdd58e4e75d77136887a617ce674 |
2 |
Author: Zac Medico <zachary.medico <AT> sony <DOT> com> |
3 |
AuthorDate: Mon Feb 11 19:35:37 2019 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 11 19:42:07 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57fade4 |
7 |
|
8 |
sys-apps/portage: version bump to 2.3.60 |
9 |
|
10 |
#636798 handle lock file removal on NFS |
11 |
|
12 |
Bug: https://bugs.gentoo.org/636798 |
13 |
Bug: https://bugs.gentoo.org/671498 |
14 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
15 |
Copyright: Sony Interactive Entertainment Inc. |
16 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
17 |
|
18 |
sys-apps/portage/Manifest | 1 + |
19 |
sys-apps/portage/portage-2.3.60.ebuild | 271 +++++++++++++++++++++++++++++++++ |
20 |
2 files changed, 272 insertions(+) |
21 |
|
22 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
23 |
index 45be67b2e14..6cf47ac1a57 100644 |
24 |
--- a/sys-apps/portage/Manifest |
25 |
+++ b/sys-apps/portage/Manifest |
26 |
@@ -4,5 +4,6 @@ DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664 |
27 |
DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a |
28 |
DIST portage-2.3.51.tar.bz2 1013015 BLAKE2B f7f5e6c9e627db5a9e4bfcc9a6cbebb40fda910d3cc928922870b295c706a9f669d3d812e726b220610efe6b182460811eb9420d6fa5b8756481df64a88fe2b9 SHA512 6c22b97959d4b5be263b9a1de6bb343b1f8300e989f37c7334a9d5d6fb65fe2390958e222bc5379ec95099124fc51a049ecca6e1bfc18f0a6c57e4601342bb94 |
29 |
DIST portage-2.3.59.tar.bz2 1019295 BLAKE2B 705e51343be5a522cfb9d4cc7935042cd1e5b697b2d78aa283bcc6cbdd3163fa54a572824355221915141b14c2f847c3810e5d4088e8784f23a0111d2bcf321a SHA512 abd188a6b6e4a2c19379e15278cfea31f45eaeb327307e6011877b1babf8460066d6f2b3879d77b5d4aee5120387beaa0318ec2764d2039cd10a3aeb26973658 |
30 |
+DIST portage-2.3.60.tar.bz2 1019434 BLAKE2B ef6cd672cf0a0781d836c3090de099a6da19e36c8d6650b3b9a9eedd0c106259824cdb34ff968cdbc38fdd1bee43aa1ef76f0914c98a45b3cf79edaf9742cae7 SHA512 ad5145c1b82fef50224df3a299375d3e9def03f5b7aaf0e616b6dd646141e1bb94dcb7cef0f210e64c705b0e6142bcf969f85a989c423084f33706a15e6b2e07 |
31 |
DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 |
32 |
DIST portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch 1584 BLAKE2B 452cd4cb25e42dcfa05c4f9da2bd3cc279556b9cd87037d0d965d39678f347b701dac0eaa59bfdebee9e3715abb506bf3744900ebefafa8fa729a1eb442889b9 SHA512 5bbe163e8eec00ece831c113676e87f0cf61a40f30a75a0de548490eeb789479336feec5bf81868a284bf32bafa00209176156cfb9ce557390d0f4a2ab6d1c1a |
33 |
|
34 |
diff --git a/sys-apps/portage/portage-2.3.60.ebuild b/sys-apps/portage/portage-2.3.60.ebuild |
35 |
new file mode 100644 |
36 |
index 00000000000..4bf3a6b2ded |
37 |
--- /dev/null |
38 |
+++ b/sys-apps/portage/portage-2.3.60.ebuild |
39 |
@@ -0,0 +1,271 @@ |
40 |
+# Copyright 1999-2019 Gentoo Authors |
41 |
+# Distributed under the terms of the GNU General Public License v2 |
42 |
+ |
43 |
+EAPI=5 |
44 |
+ |
45 |
+PYTHON_COMPAT=( |
46 |
+ pypy |
47 |
+ python3_4 python3_5 python3_6 python3_7 |
48 |
+ python2_7 |
49 |
+) |
50 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
51 |
+ |
52 |
+inherit distutils-r1 epatch linux-info systemd |
53 |
+ |
54 |
+DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
55 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
56 |
+ |
57 |
+LICENSE="GPL-2" |
58 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" |
59 |
+SLOT="0" |
60 |
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
61 |
+ |
62 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
63 |
+ >=app-arch/tar-1.27 |
64 |
+ dev-lang/python-exec:2 |
65 |
+ >=sys-apps/sed-4.0.5 sys-devel/patch |
66 |
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
67 |
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
68 |
+# Require sandbox-2.2 for bug #288863. |
69 |
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
70 |
+# quite slow, so it's not considered in the dependencies as an alternative to |
71 |
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
72 |
+# for now, don't pull in xattr deps for other kernels. |
73 |
+# For whirlpool hash, require python[ssl] (bug #425046). |
74 |
+# For compgen, require bash[readline] (bug #445576). |
75 |
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling |
76 |
+# the executable. |
77 |
+RDEPEND=" |
78 |
+ >=app-arch/tar-1.27 |
79 |
+ dev-lang/python-exec:2 |
80 |
+ !build? ( |
81 |
+ >=sys-apps/sed-4.0.5 |
82 |
+ app-shells/bash:0[readline] |
83 |
+ >=app-admin/eselect-1.2 |
84 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
85 |
+ python{2_7,3_4,3_5} pypy) |
86 |
+ rsync-verify? ( |
87 |
+ >=app-portage/gemato-14[${PYTHON_USEDEP}] |
88 |
+ >=app-crypt/openpgp-keys-gentoo-release-20180706 |
89 |
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)] |
90 |
+ ) |
91 |
+ ) |
92 |
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
93 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
94 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
95 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
96 |
+ kernel_linux? ( sys-apps/util-linux ) |
97 |
+ >=app-misc/pax-utils-0.1.17 |
98 |
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
99 |
+ xattr? ( kernel_linux? ( |
100 |
+ >=sys-apps/install-xattr-0.3 |
101 |
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
102 |
+ python2_7 pypy) |
103 |
+ ) ) |
104 |
+ !<app-admin/logrotate-3.8.0 |
105 |
+ !<app-portage/repoman-2.3.10" |
106 |
+PDEPEND=" |
107 |
+ !build? ( |
108 |
+ >=net-misc/rsync-2.6.4 |
109 |
+ userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
110 |
+ )" |
111 |
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
112 |
+# NOTE: FEATURES=installsources requires debugedit and rsync |
113 |
+ |
114 |
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
115 |
+ |
116 |
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
117 |
+ |
118 |
+prefix_src_archives() { |
119 |
+ local x y |
120 |
+ for x in ${@}; do |
121 |
+ for y in ${SRC_ARCHIVES}; do |
122 |
+ echo ${y}/${x} |
123 |
+ done |
124 |
+ done |
125 |
+} |
126 |
+ |
127 |
+TARBALL_PV=${PV} |
128 |
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
129 |
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
130 |
+ |
131 |
+pkg_pretend() { |
132 |
+ local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS" |
133 |
+ |
134 |
+ check_extra_config |
135 |
+} |
136 |
+ |
137 |
+pkg_setup() { |
138 |
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
139 |
+} |
140 |
+ |
141 |
+python_prepare_all() { |
142 |
+ distutils-r1_python_prepare_all |
143 |
+ |
144 |
+ if use gentoo-dev; then |
145 |
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
146 |
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
147 |
+ -i lib/_emerge/create_depgraph_params.py || \ |
148 |
+ die "failed to patch create_depgraph_params.py" |
149 |
+ |
150 |
+ einfo "Enabling additional FEATURES for gentoo-dev..." |
151 |
+ echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ |
152 |
+ >> cnf/make.globals || die |
153 |
+ fi |
154 |
+ |
155 |
+ if use native-extensions; then |
156 |
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
157 |
+ setup.cfg || die |
158 |
+ fi |
159 |
+ |
160 |
+ if ! use ipc ; then |
161 |
+ einfo "Disabling ipc..." |
162 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
163 |
+ -i lib/_emerge/AbstractEbuildProcess.py || \ |
164 |
+ die "failed to patch AbstractEbuildProcess.py" |
165 |
+ fi |
166 |
+ |
167 |
+ if use xattr && use kernel_linux ; then |
168 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
169 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
170 |
+ || die "failed to append to make.globals" |
171 |
+ fi |
172 |
+ |
173 |
+ if use build || ! use rsync-verify; then |
174 |
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
175 |
+ -i cnf/repos.conf || die "sed failed" |
176 |
+ fi |
177 |
+ |
178 |
+ if [[ -n ${EPREFIX} ]] ; then |
179 |
+ einfo "Setting portage.const.EPREFIX ..." |
180 |
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
181 |
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
182 |
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
183 |
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
184 |
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
185 |
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
186 |
+ -i lib/portage/const.py || \ |
187 |
+ die "Failed to patch portage.const.EPREFIX" |
188 |
+ |
189 |
+ einfo "Prefixing shebangs ..." |
190 |
+ while read -r -d $'\0' ; do |
191 |
+ local shebang=$(head -n1 "$REPLY") |
192 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
193 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
194 |
+ die "sed failed" |
195 |
+ fi |
196 |
+ done < <(find . -type f -print0) |
197 |
+ |
198 |
+ einfo "Adjusting make.globals ..." |
199 |
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
200 |
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
201 |
+ -i cnf/make.globals || die "sed failed" |
202 |
+ |
203 |
+ einfo "Adjusting repos.conf ..." |
204 |
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
205 |
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ |
206 |
+ -i cnf/repos.conf || die "sed failed" |
207 |
+ if use prefix-guest ; then |
208 |
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
209 |
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
210 |
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ |
211 |
+ -i cnf/repos.conf || die "sed failed" |
212 |
+ fi |
213 |
+ |
214 |
+ einfo "Adding FEATURES=force-prefix to make.globals ..." |
215 |
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
216 |
+ || die "failed to append to make.globals" |
217 |
+ fi |
218 |
+ |
219 |
+ cd "${S}/cnf" || die |
220 |
+ if [ -f "make.conf.example.${ARCH}".diff ]; then |
221 |
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
222 |
+ die "Failed to patch make.conf.example" |
223 |
+ else |
224 |
+ eerror "" |
225 |
+ eerror "Portage does not have an arch-specific configuration for this arch." |
226 |
+ eerror "Please notify the arch maintainer about this issue. Using generic." |
227 |
+ eerror "" |
228 |
+ fi |
229 |
+} |
230 |
+ |
231 |
+python_compile_all() { |
232 |
+ local targets=() |
233 |
+ use doc && targets+=( docbook ) |
234 |
+ use epydoc && targets+=( epydoc ) |
235 |
+ |
236 |
+ if [[ ${targets[@]} ]]; then |
237 |
+ esetup.py "${targets[@]}" |
238 |
+ fi |
239 |
+} |
240 |
+ |
241 |
+python_test() { |
242 |
+ esetup.py test |
243 |
+} |
244 |
+ |
245 |
+python_install() { |
246 |
+ # Install sbin scripts to bindir for python-exec linking |
247 |
+ # they will be relocated in pkg_preinst() |
248 |
+ distutils-r1_python_install \ |
249 |
+ --system-prefix="${EPREFIX}/usr" \ |
250 |
+ --bindir="$(python_get_scriptdir)" \ |
251 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
252 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
253 |
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
254 |
+ --sbindir="$(python_get_scriptdir)" \ |
255 |
+ --sysconfdir="${EPREFIX}/etc" \ |
256 |
+ "${@}" |
257 |
+} |
258 |
+ |
259 |
+python_install_all() { |
260 |
+ distutils-r1_python_install_all |
261 |
+ |
262 |
+ local targets=() |
263 |
+ use doc && targets+=( |
264 |
+ install_docbook |
265 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
266 |
+ ) |
267 |
+ use epydoc && targets+=( |
268 |
+ install_epydoc |
269 |
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
270 |
+ ) |
271 |
+ |
272 |
+ # install docs |
273 |
+ if [[ ${targets[@]} ]]; then |
274 |
+ esetup.py "${targets[@]}" |
275 |
+ fi |
276 |
+ |
277 |
+ systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf |
278 |
+ |
279 |
+ # Due to distutils/python-exec limitations |
280 |
+ # these must be installed to /usr/bin. |
281 |
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
282 |
+ einfo "Moving admin scripts to the correct directory" |
283 |
+ dodir /usr/sbin |
284 |
+ for target in ${sbin_relocations}; do |
285 |
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
286 |
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
287 |
+ done |
288 |
+} |
289 |
+ |
290 |
+pkg_preinst() { |
291 |
+ # comment out sanity test until it is fixed to work |
292 |
+ # with the new PORTAGE_PYM_PATH |
293 |
+ #if [[ $ROOT == / ]] ; then |
294 |
+ ## Run some minimal tests as a sanity check. |
295 |
+ #local test_runner=$(find "${ED}" -name runTests) |
296 |
+ #if [[ -n $test_runner && -x $test_runner ]] ; then |
297 |
+ #einfo "Running preinst sanity tests..." |
298 |
+ #"$test_runner" || die "preinst sanity tests failed" |
299 |
+ #fi |
300 |
+ #fi |
301 |
+ |
302 |
+ # elog dir must exist to avoid logrotate error for bug #415911. |
303 |
+ # This code runs in preinst in order to bypass the mapping of |
304 |
+ # portage:portage to root:root which happens after src_install. |
305 |
+ keepdir /var/log/portage/elog |
306 |
+ # This is allowed to fail if the user/group are invalid for prefix users. |
307 |
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
308 |
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
309 |
+ fi |
310 |
+} |