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: Mon, 11 Dec 2017 00:22:06
Message-Id: 1512951712.f134d2906e43edf5d594808798c375a220d560bc.zmedico@gentoo
1 commit: f134d2906e43edf5d594808798c375a220d560bc
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 11 00:18:05 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 11 00:21:52 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f134d290
7
8 sys-apps/portage: remove 2.3.17 due to bug 640376
9
10 Bug: https://bugs.gentoo.org/640376
11 Package-Manager: Portage-2.3.17, Repoman-2.3.6
12
13 sys-apps/portage/Manifest | 1 -
14 sys-apps/portage/portage-2.3.17.ebuild | 258 ---------------------------------
15 2 files changed, 259 deletions(-)
16
17 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
18 index 684876dd10c..e2ee6a158ef 100644
19 --- a/sys-apps/portage/Manifest
20 +++ b/sys-apps/portage/Manifest
21 @@ -1,6 +1,5 @@
22 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
23 DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f57ad97029d7bb3d9ac89fd0ee939fb3a2aaa624a0f40959820903d70e6c209518d97df6b82501325963c963db9df SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732
24 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
25 -DIST portage-2.3.17.tar.bz2 953854 BLAKE2B 8b4367d647d29550fb50c807013a896eceac5ca137ea8d85157c32b7a99b6af7f39b60173ad40df7606d4c213025d8fbd617e9b6f3bf6f580c09cd07d4ce6d37 SHA512 9864ceae200b2137c695cd5af856a277971ab3bb0bedafcb1ed59aa4f647f3a412bf22bf0f4067f87716a4296f76d4a602bb4e7714ba1c89213720e34d11e152
26 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
27 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
28
29 diff --git a/sys-apps/portage/portage-2.3.17.ebuild b/sys-apps/portage/portage-2.3.17.ebuild
30 deleted file mode 100644
31 index b4f03d91d2d..00000000000
32 --- a/sys-apps/portage/portage-2.3.17.ebuild
33 +++ /dev/null
34 @@ -1,258 +0,0 @@
35 -# Copyright 1999-2017 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
54 -SLOT="0"
55 -IUSE="build doc epydoc +ipc linguas_ru +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 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
78 - python{2_7,3_4,3_5} pypy)
79 - )
80 - elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
81 - elibc_glibc? ( >=sys-apps/sandbox-2.2 )
82 - elibc_musl? ( >=sys-apps/sandbox-2.2 )
83 - elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
84 - >=app-misc/pax-utils-0.1.17
85 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
86 - xattr? ( kernel_linux? (
87 - >=sys-apps/install-xattr-0.3
88 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
89 - python2_7 pypy)
90 - ) )
91 - !<app-admin/logrotate-3.8.0"
92 -PDEPEND="
93 - !build? (
94 - >=net-misc/rsync-2.6.4
95 - userland_GNU? ( >=sys-apps/coreutils-6.4 )
96 - )"
97 -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
98 -# NOTE: FEATURES=installsources requires debugedit and rsync
99 -
100 -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
101 -
102 -SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
103 -
104 -prefix_src_archives() {
105 - local x y
106 - for x in ${@}; do
107 - for y in ${SRC_ARCHIVES}; do
108 - echo ${y}/${x}
109 - done
110 - done
111 -}
112 -
113 -TARBALL_PV=${PV}
114 -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
115 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
116 -
117 -pkg_setup() {
118 - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
119 -}
120 -
121 -python_prepare_all() {
122 - distutils-r1_python_prepare_all
123 -
124 - if use native-extensions; then
125 - printf "[build_ext]\nportage-ext-modules=true\n" >> \
126 - setup.cfg || die
127 - fi
128 -
129 - if ! use ipc ; then
130 - einfo "Disabling ipc..."
131 - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
132 - -i pym/_emerge/AbstractEbuildProcess.py || \
133 - die "failed to patch AbstractEbuildProcess.py"
134 - fi
135 -
136 - if use xattr && use kernel_linux ; then
137 - einfo "Adding FEATURES=xattr to make.globals ..."
138 - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
139 - || die "failed to append to make.globals"
140 - fi
141 -
142 - if [[ -n ${EPREFIX} ]] ; then
143 - einfo "Setting portage.const.EPREFIX ..."
144 - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
145 - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
146 - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
147 - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
148 - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
149 - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
150 - -i pym/portage/const.py || \
151 - die "Failed to patch portage.const.EPREFIX"
152 -
153 - einfo "Prefixing shebangs ..."
154 - while read -r -d $'\0' ; do
155 - local shebang=$(head -n1 "$REPLY")
156 - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
157 - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
158 - die "sed failed"
159 - fi
160 - done < <(find . -type f -print0)
161 -
162 - einfo "Adjusting make.globals ..."
163 - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
164 - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
165 - -i cnf/make.globals || die "sed failed"
166 -
167 - einfo "Adjusting repos.conf ..."
168 - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
169 - -i cnf/repos.conf || die "sed failed"
170 - if use prefix-guest ; then
171 - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
172 - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
173 - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
174 - -i cnf/repos.conf || die "sed failed"
175 - fi
176 -
177 - einfo "Adding FEATURES=force-prefix to make.globals ..."
178 - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
179 - || die "failed to append to make.globals"
180 - fi
181 -
182 - cd "${S}/cnf" || die
183 - if [ -f "make.conf.example.${ARCH}".diff ]; then
184 - patch make.conf.example "make.conf.example.${ARCH}".diff || \
185 - die "Failed to patch make.conf.example"
186 - else
187 - eerror ""
188 - eerror "Portage does not have an arch-specific configuration for this arch."
189 - eerror "Please notify the arch maintainer about this issue. Using generic."
190 - eerror ""
191 - fi
192 -}
193 -
194 -python_compile_all() {
195 - local targets=()
196 - use doc && targets+=( docbook )
197 - use epydoc && targets+=( epydoc )
198 -
199 - if [[ ${targets[@]} ]]; then
200 - esetup.py "${targets[@]}"
201 - fi
202 -}
203 -
204 -python_test() {
205 - esetup.py test
206 -}
207 -
208 -python_install() {
209 - # Install sbin scripts to bindir for python-exec linking
210 - # they will be relocated in pkg_preinst()
211 - distutils-r1_python_install \
212 - --system-prefix="${EPREFIX}/usr" \
213 - --bindir="$(python_get_scriptdir)" \
214 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
215 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
216 - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
217 - --sbindir="$(python_get_scriptdir)" \
218 - --sysconfdir="${EPREFIX}/etc" \
219 - "${@}"
220 -}
221 -
222 -python_install_all() {
223 - distutils-r1_python_install_all
224 -
225 - local targets=()
226 - use doc && targets+=(
227 - install_docbook
228 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
229 - )
230 - use epydoc && targets+=(
231 - install_epydoc
232 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
233 - )
234 -
235 - # install docs
236 - if [[ ${targets[@]} ]]; then
237 - esetup.py "${targets[@]}"
238 - fi
239 -
240 - # Due to distutils/python-exec limitations
241 - # these must be installed to /usr/bin.
242 - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
243 - einfo "Moving admin scripts to the correct directory"
244 - dodir /usr/sbin
245 - for target in ${sbin_relocations}; do
246 - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
247 - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
248 - done
249 -}
250 -
251 -pkg_preinst() {
252 - # comment out sanity test until it is fixed to work
253 - # with the new PORTAGE_PYM_PATH
254 - #if [[ $ROOT == / ]] ; then
255 - ## Run some minimal tests as a sanity check.
256 - #local test_runner=$(find "${ED}" -name runTests)
257 - #if [[ -n $test_runner && -x $test_runner ]] ; then
258 - #einfo "Running preinst sanity tests..."
259 - #"$test_runner" || die "preinst sanity tests failed"
260 - #fi
261 - #fi
262 -
263 - # elog dir must exist to avoid logrotate error for bug #415911.
264 - # This code runs in preinst in order to bypass the mapping of
265 - # portage:portage to root:root which happens after src_install.
266 - keepdir /var/log/portage/elog
267 - # This is allowed to fail if the user/group are invalid for prefix users.
268 - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
269 - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
270 - fi
271 -
272 - if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
273 - has_version "<${CATEGORY}/${PN}-2.3.3"; then
274 - SYNC_DEPTH_UPGRADE=true
275 - else
276 - SYNC_DEPTH_UPGRADE=false
277 - fi
278 -}
279 -
280 -pkg_postinst() {
281 - if ${SYNC_DEPTH_UPGRADE}; then
282 - ewarn "Please note that this release no longer respects sync-depth for"
283 - ewarn "git repositories. There have been too many problems and"
284 - ewarn "performance issues. See bugs 552814, 559008"
285 - fi
286 - einfo ""
287 - einfo "This release of portage NO LONGER contains the repoman code base."
288 - einfo "Repoman has its own ebuild and release package."
289 - einfo "For repoman functionality please emerge app-portage/repoman"
290 - einfo "Please report any bugs you may encounter."
291 - einfo ""
292 -}