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