Gentoo Archives: gentoo-commits

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