1 |
commit: 05d4de36535c74df5e27784886a7de8d0d8afddb |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 31 06:13:47 2019 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 31 06:21:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d4de36 |
7 |
|
8 |
sys-apps/portage: Bump to version 2.3.74 |
9 |
|
10 |
#587930 glsa-check: add exit code for affected GLSAs |
11 |
#688902 Add FEATURES=pkgdir-index-trusted |
12 |
#690758 Use RTNETLINK to configure the loopback interface |
13 |
#692872 glsa-check: forward port --quiet option from gentoolkit |
14 |
#693026 rsync: proxychains compatibility |
15 |
#693088 glsa-check: forward port remaining changes from gentoolkit |
16 |
#693096 emerge: deprecate --changelog option |
17 |
|
18 |
Bug: https://bugs.gentoo.org/691278 |
19 |
Bug: https://bugs.gentoo.org/587930 |
20 |
Bug: https://bugs.gentoo.org/688902 |
21 |
Bug: https://bugs.gentoo.org/690758 |
22 |
Bug: https://bugs.gentoo.org/692872 |
23 |
Bug: https://bugs.gentoo.org/693026 |
24 |
Bug: https://bugs.gentoo.org/693088 |
25 |
Bug: https://bugs.gentoo.org/693096 |
26 |
Package-Manager: Portage-2.3.74, Repoman-2.3.17 |
27 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
28 |
|
29 |
sys-apps/portage/Manifest | 1 + |
30 |
sys-apps/portage/portage-2.3.74.ebuild | 261 +++++++++++++++++++++++++++++++++ |
31 |
2 files changed, 262 insertions(+) |
32 |
|
33 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
34 |
index bd1d0fe8f5b..e0f9fe93faa 100644 |
35 |
--- a/sys-apps/portage/Manifest |
36 |
+++ b/sys-apps/portage/Manifest |
37 |
@@ -2,4 +2,5 @@ DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83 |
38 |
DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045 |
39 |
DIST portage-2.3.72.tar.bz2 1030924 BLAKE2B 84ecb1cda83a33f7159b86edc915810460f85dd6c97e971a054b5c1cc685077cb784313a666d1867c671e6324a25ea64b0032bb1924af560bd60d261b199c479 SHA512 cc42030bee07b2addc7977a5f206ab35a76ac98d37215d2ee2952d47408c0de1c74387436b85b08f94be5fd01b422cb68bcf908fa8acac8fb9dda0e5caa39f86 |
40 |
DIST portage-2.3.73.tar.bz2 1031001 BLAKE2B f08a639ae587cae8c87670c6d8f8b8f5a860a3d1d8ad960d6da7fac7c0e170d0f19c352d6a31de20de60a4504766724901ef7d2ba026f959ef8dd6bb8e095c73 SHA512 5edda4b235a9bb7574fb5bce79c4a226200ba077580ce0e0237ef209cc935ab94eef24859bf450443a92a6cb9d31a754e1e06c8fd0293efe7e5fa87e4d21652a |
41 |
+DIST portage-2.3.74.tar.bz2 1033130 BLAKE2B e3dc7c994ad2e35a8a8f421d972d4ff12fa2c56241b9a7d374204b0fbea1f457b8a365b56daa7a642383fc2653d7a223f12cf14936c86b5c8856411e286973bd SHA512 947805ca47445de49105867f66ac2b77426511040d3f1936ec5e169219bcf45d320ebabb7455d318043405b043ba4808ce3962af431776ae152c203343607bf9 |
42 |
DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12 |
43 |
|
44 |
diff --git a/sys-apps/portage/portage-2.3.74.ebuild b/sys-apps/portage/portage-2.3.74.ebuild |
45 |
new file mode 100644 |
46 |
index 00000000000..b45fedf3529 |
47 |
--- /dev/null |
48 |
+++ b/sys-apps/portage/portage-2.3.74.ebuild |
49 |
@@ -0,0 +1,261 @@ |
50 |
+# Copyright 1999-2019 Gentoo Authors |
51 |
+# Distributed under the terms of the GNU General Public License v2 |
52 |
+ |
53 |
+EAPI=5 |
54 |
+ |
55 |
+PYTHON_COMPAT=( |
56 |
+ pypy |
57 |
+ python3_5 python3_6 python3_7 |
58 |
+ python2_7 |
59 |
+) |
60 |
+PYTHON_REQ_USE='bzip2(+),threads(+)' |
61 |
+ |
62 |
+inherit distutils-r1 linux-info systemd prefix |
63 |
+ |
64 |
+DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
65 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
66 |
+ |
67 |
+LICENSE="GPL-2" |
68 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" |
69 |
+SLOT="0" |
70 |
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" |
71 |
+ |
72 |
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) |
73 |
+ >=app-arch/tar-1.27 |
74 |
+ dev-lang/python-exec:2 |
75 |
+ >=sys-apps/sed-4.0.5 sys-devel/patch |
76 |
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) |
77 |
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" |
78 |
+# Require sandbox-2.2 for bug #288863. |
79 |
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's |
80 |
+# quite slow, so it's not considered in the dependencies as an alternative to |
81 |
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
82 |
+# for now, don't pull in xattr deps for other kernels. |
83 |
+# For whirlpool hash, require python[ssl] (bug #425046). |
84 |
+# For compgen, require bash[readline] (bug #445576). |
85 |
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling |
86 |
+# the executable. |
87 |
+RDEPEND=" |
88 |
+ >=app-arch/tar-1.27 |
89 |
+ dev-lang/python-exec:2 |
90 |
+ !build? ( |
91 |
+ >=sys-apps/sed-4.0.5 |
92 |
+ app-shells/bash:0[readline] |
93 |
+ >=app-admin/eselect-1.2 |
94 |
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ |
95 |
+ python{2_7,3_5} pypy) |
96 |
+ rsync-verify? ( |
97 |
+ >=app-portage/gemato-14[${PYTHON_USEDEP}] |
98 |
+ >=app-crypt/openpgp-keys-gentoo-release-20180706 |
99 |
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)] |
100 |
+ ) |
101 |
+ ) |
102 |
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
103 |
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
104 |
+ elibc_musl? ( >=sys-apps/sandbox-2.2 ) |
105 |
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
106 |
+ kernel_linux? ( sys-apps/util-linux ) |
107 |
+ >=app-misc/pax-utils-0.1.17 |
108 |
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
109 |
+ xattr? ( kernel_linux? ( |
110 |
+ >=sys-apps/install-xattr-0.3 |
111 |
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
112 |
+ python2_7 pypy) |
113 |
+ ) ) |
114 |
+ !<app-admin/logrotate-3.8.0 |
115 |
+ !<app-portage/gentoolkit-0.4.6 |
116 |
+ !<app-portage/repoman-2.3.10" |
117 |
+PDEPEND=" |
118 |
+ !build? ( |
119 |
+ >=net-misc/rsync-2.6.4 |
120 |
+ userland_GNU? ( >=sys-apps/coreutils-6.4 ) |
121 |
+ )" |
122 |
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 |
123 |
+# NOTE: FEATURES=installsources requires debugedit and rsync |
124 |
+ |
125 |
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" |
126 |
+ |
127 |
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" |
128 |
+ |
129 |
+prefix_src_archives() { |
130 |
+ local x y |
131 |
+ for x in ${@}; do |
132 |
+ for y in ${SRC_ARCHIVES}; do |
133 |
+ echo ${y}/${x} |
134 |
+ done |
135 |
+ done |
136 |
+} |
137 |
+ |
138 |
+TARBALL_PV=${PV} |
139 |
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 |
140 |
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" |
141 |
+ |
142 |
+pkg_pretend() { |
143 |
+ local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS" |
144 |
+ |
145 |
+ check_extra_config |
146 |
+} |
147 |
+ |
148 |
+pkg_setup() { |
149 |
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
150 |
+} |
151 |
+ |
152 |
+python_prepare_all() { |
153 |
+ distutils-r1_python_prepare_all |
154 |
+ |
155 |
+ if use gentoo-dev; then |
156 |
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..." |
157 |
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ |
158 |
+ -i lib/_emerge/create_depgraph_params.py || \ |
159 |
+ die "failed to patch create_depgraph_params.py" |
160 |
+ |
161 |
+ einfo "Enabling additional FEATURES for gentoo-dev..." |
162 |
+ echo 'FEATURES="${FEATURES} strict-keepdir"' \ |
163 |
+ >> cnf/make.globals || die |
164 |
+ fi |
165 |
+ |
166 |
+ if use native-extensions; then |
167 |
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \ |
168 |
+ setup.cfg || die |
169 |
+ fi |
170 |
+ |
171 |
+ if ! use ipc ; then |
172 |
+ einfo "Disabling ipc..." |
173 |
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
174 |
+ -i lib/_emerge/AbstractEbuildProcess.py || \ |
175 |
+ die "failed to patch AbstractEbuildProcess.py" |
176 |
+ fi |
177 |
+ |
178 |
+ if use xattr && use kernel_linux ; then |
179 |
+ einfo "Adding FEATURES=xattr to make.globals ..." |
180 |
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
181 |
+ || die "failed to append to make.globals" |
182 |
+ fi |
183 |
+ |
184 |
+ if use build || ! use rsync-verify; then |
185 |
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ |
186 |
+ -e '/^sync-webrsync-verify-signature/s|yes|no|' \ |
187 |
+ -i cnf/repos.conf || die "sed failed" |
188 |
+ fi |
189 |
+ |
190 |
+ if [[ -n ${EPREFIX} ]] ; then |
191 |
+ einfo "Setting portage.const.EPREFIX ..." |
192 |
+ hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ |
193 |
+ -w "/_BINARY/" lib/portage/const.py |
194 |
+ |
195 |
+ einfo "Prefixing shebangs ..." |
196 |
+ while read -r -d $'\0' ; do |
197 |
+ local shebang=$(head -n1 "$REPLY") |
198 |
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
199 |
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
200 |
+ die "sed failed" |
201 |
+ fi |
202 |
+ done < <(find . -type f ! -name etc-update -print0) |
203 |
+ |
204 |
+ einfo "Adjusting make.globals, repos.conf and etc-update ..." |
205 |
+ hprefixify cnf/{make.globals,repos.conf} bin/etc-update |
206 |
+ |
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 |
+ python_setup |
292 |
+ python_export PYTHON_SITEDIR |
293 |
+ [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" |
294 |
+ env -u DISTDIR \ |
295 |
+ -u PORTAGE_OVERRIDE_EPREFIX \ |
296 |
+ -u PORTAGE_REPOSITORIES \ |
297 |
+ -u PORTDIR \ |
298 |
+ -u PORTDIR_OVERLAY \ |
299 |
+ PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ |
300 |
+ "${PYTHON}" -m portage._compat_upgrade.default_locations || die |
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 |
+} |