Gentoo Archives: gentoo-commits

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