| 1 |
commit: adca31f32c6af0be80798e27035e5737df1be982 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 4 11:56:01 2015 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 4 11:56:01 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/multilib-portage.git/commit/?id=adca31f3 |
| 7 |
|
| 8 |
Sync with main tree: portage-2.2.22 |
| 9 |
|
| 10 |
sys-apps/portage/Manifest | 3 +- |
| 11 |
sys-apps/portage/portage-2.2.18-r2.ebuild | 349 --------------------- |
| 12 |
...e-2.2.18-r1.ebuild => portage-2.2.22-r1.ebuild} | 2 +- |
| 13 |
3 files changed, 2 insertions(+), 352 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest |
| 16 |
index de97c19..6aab9b5 100644 |
| 17 |
--- a/sys-apps/portage/Manifest |
| 18 |
+++ b/sys-apps/portage/Manifest |
| 19 |
@@ -1,3 +1,2 @@ |
| 20 |
-EBUILD portage-2.2.18-r1.ebuild 11531 SHA256 f76ea14152df9db2a1c5cea42b63da88f3d247b4983bfa91d5b6a1028f10b1ec SHA512 57ebe740d6a8099f1121d06e4b478ce1c889552909fea29eb984276eee1ba9c1784fa47355ee27b11c69574895b4f25596a0a44894d132f226eeb01175218be3 WHIRLPOOL 0135931c190dd8276088aba25b83837debce91c43f60cd96b0972c4ff510ba650d3cccd0c16b4ef80d4c26c69aee5131f7bf531440d3c2a53576ea770f456fe0 |
| 21 |
-EBUILD portage-2.2.18-r2.ebuild 11531 SHA256 929f450333687b27d188418a7d06224158310a3044718dd100c08f1dc50dce57 SHA512 76f2c79498e6f2ef44ea7ca6c02dbd30185aa22f456bab869f98bc5a219745ab3755d99ec303f2f13a1807956483601d8673df831f91206541119433342af0d1 WHIRLPOOL 0f496a99925deb084fccfd81a8636a5782b6c8f1a271bb173140ed453ae79fa919d53a817da4cb0ddca90ce236a77b6dddc32f086c093a8a64127228c6284762 |
| 22 |
+EBUILD portage-2.2.22-r1.ebuild 11531 SHA256 e6037e2d6d1beb24b4a02ae67d1490e0761dc9f9bef2a5db7af888bf161b1194 SHA512 05898a198abaa569f6b4635e943072093889adcf3e5e331d9e298fd3b22996c784e0c73d8277253222bc6d1570ee2c2d188d7f0d976bac133f3da0890cb43a4a WHIRLPOOL 4178fe1de35da39f9f6bd291a37516b0f75765370b59235364d1f67a3154c2afeb57f8908be9ae07f0e240bbbb3f7084ffa0f33436301b7daad04ed10e9a53ef |
| 23 |
MISC metadata.xml 365 SHA256 475a792c24a7db2ae5fab7fb108bf39af08c272d03d87ef942883b297de95d6a SHA512 45a78cd446f546ca81c6d6623e0f7215e13ed81d58d6dfcf7a2614b2ad8250a7af4c9ed8b3d1c301a103f3f17b2f5d8eb16caa82267b7565798fb00383957fb6 WHIRLPOOL 1f744a508a6d6d9225087850a85e47b8effadeff6eb0600daca677f761f22c8ddcc08a972bf4b4c2d6545518710365b560f54dd43d283f19eebdb3b2a0972630 |
| 24 |
|
| 25 |
diff --git a/sys-apps/portage/portage-2.2.18-r2.ebuild b/sys-apps/portage/portage-2.2.18-r2.ebuild |
| 26 |
deleted file mode 100644 |
| 27 |
index ace3816..0000000 |
| 28 |
--- a/sys-apps/portage/portage-2.2.18-r2.ebuild |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,349 +0,0 @@ |
| 31 |
-# Copyright 1999-2015 Gentoo Foundation |
| 32 |
-# Distributed under the terms of the GNU General Public License v2 |
| 33 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.18.ebuild,v 1.9 2015/04/26 15:42:47 zlogene Exp $ |
| 34 |
- |
| 35 |
-EAPI=5 |
| 36 |
- |
| 37 |
-PYTHON_COMPAT=( |
| 38 |
- pypy |
| 39 |
- python3_3 python3_4 |
| 40 |
- python2_7 |
| 41 |
-) |
| 42 |
-# Note: substituted below |
| 43 |
-PYTHON_REQ_USE='bzip2(+)' |
| 44 |
- |
| 45 |
-inherit distutils-r1 git-2 multilib |
| 46 |
- |
| 47 |
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git" |
| 48 |
-EGIT_BRANCH="multilib" |
| 49 |
-EGIT_COMMIT="cf7284cba66a1d6e747ce916de24a5c25b5654f8" |
| 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 55 |
-SLOT="0" |
| 56 |
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr" |
| 57 |
- |
| 58 |
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) |
| 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 |
- >=sys-apps/abi-wrapper-1.0-r6" |
| 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 |
-RDEPEND=" |
| 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_uclibc? ( >=sys-apps/sandbox-2.2 ) |
| 81 |
- >=app-misc/pax-utils-0.1.17 |
| 82 |
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) |
| 83 |
- xattr? ( kernel_linux? ( |
| 84 |
- >=sys-apps/install-xattr-0.3 |
| 85 |
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ |
| 86 |
- python2_7 pypy) |
| 87 |
- ) ) |
| 88 |
- !<app-admin/logrotate-3.8.0 |
| 89 |
- >=sys-apps/abi-wrapper-1.0-r6" |
| 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 |
-python_prepare_all() { |
| 101 |
- distutils-r1_python_prepare_all |
| 102 |
- |
| 103 |
- if ! use ipc ; then |
| 104 |
- einfo "Disabling ipc..." |
| 105 |
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
| 106 |
- -i pym/_emerge/AbstractEbuildProcess.py || \ |
| 107 |
- die "failed to patch AbstractEbuildProcess.py" |
| 108 |
- fi |
| 109 |
- |
| 110 |
- if use xattr && use kernel_linux ; then |
| 111 |
- einfo "Adding FEATURES=xattr to make.globals ..." |
| 112 |
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ |
| 113 |
- || die "failed to append to make.globals" |
| 114 |
- fi |
| 115 |
- |
| 116 |
- if [[ -n ${EPREFIX} ]] ; then |
| 117 |
- einfo "Setting portage.const.EPREFIX ..." |
| 118 |
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ |
| 119 |
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ |
| 120 |
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ |
| 121 |
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ |
| 122 |
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ |
| 123 |
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ |
| 124 |
- -i pym/portage/const.py || \ |
| 125 |
- die "Failed to patch portage.const.EPREFIX" |
| 126 |
- |
| 127 |
- einfo "Prefixing shebangs ..." |
| 128 |
- while read -r -d $'\0' ; do |
| 129 |
- local shebang=$(head -n1 "$REPLY") |
| 130 |
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then |
| 131 |
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ |
| 132 |
- die "sed failed" |
| 133 |
- fi |
| 134 |
- done < <(find . -type f -print0) |
| 135 |
- |
| 136 |
- einfo "Adjusting make.globals ..." |
| 137 |
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ |
| 138 |
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ |
| 139 |
- -i cnf/make.globals || die "sed failed" |
| 140 |
- |
| 141 |
- einfo "Adjusting repos.conf ..." |
| 142 |
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ |
| 143 |
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ |
| 144 |
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ |
| 145 |
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \ |
| 146 |
- -i cnf/repos.conf || die "sed failed" |
| 147 |
- |
| 148 |
- einfo "Adding FEATURES=force-prefix to make.globals ..." |
| 149 |
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ |
| 150 |
- || die "failed to append to make.globals" |
| 151 |
- fi |
| 152 |
- |
| 153 |
- cd "${S}/cnf" || die |
| 154 |
- if [ -f "make.conf.example.${ARCH}".diff ]; then |
| 155 |
- patch make.conf.example "make.conf.example.${ARCH}".diff || \ |
| 156 |
- die "Failed to patch make.conf.example" |
| 157 |
- else |
| 158 |
- eerror "" |
| 159 |
- eerror "Portage does not have an arch-specific configuration for this arch." |
| 160 |
- eerror "Please notify the arch maintainer about this issue. Using generic." |
| 161 |
- eerror "" |
| 162 |
- fi |
| 163 |
-} |
| 164 |
- |
| 165 |
-python_compile_all() { |
| 166 |
- local targets=() |
| 167 |
- use doc && targets+=( docbook ) |
| 168 |
- use epydoc && targets+=( epydoc ) |
| 169 |
- |
| 170 |
- if [[ ${targets[@]} ]]; then |
| 171 |
- esetup.py "${targets[@]}" |
| 172 |
- fi |
| 173 |
-} |
| 174 |
- |
| 175 |
-python_test() { |
| 176 |
- esetup.py test |
| 177 |
-} |
| 178 |
- |
| 179 |
-python_install() { |
| 180 |
- # Install sbin scripts to bindir for python-exec linking |
| 181 |
- # they will be relocated in pkg_preinst() |
| 182 |
- distutils-r1_python_install \ |
| 183 |
- --system-prefix="${EPREFIX}/usr" \ |
| 184 |
- --bindir="$(python_get_scriptdir)" \ |
| 185 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
| 186 |
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
| 187 |
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ |
| 188 |
- --sbindir="$(python_get_scriptdir)" \ |
| 189 |
- --sysconfdir="${EPREFIX}/etc" \ |
| 190 |
- "${@}" |
| 191 |
-} |
| 192 |
- |
| 193 |
-python_install_all() { |
| 194 |
- distutils-r1_python_install_all |
| 195 |
- |
| 196 |
- local targets=() |
| 197 |
- use doc && targets+=( install_docbook ) |
| 198 |
- use epydoc && targets+=( install_epydoc ) |
| 199 |
- |
| 200 |
- # install docs |
| 201 |
- if [[ ${targets[@]} ]]; then |
| 202 |
- esetup.py "${targets[@]}" |
| 203 |
- fi |
| 204 |
- |
| 205 |
- # Due to distutils/python-exec limitations |
| 206 |
- # these must be installed to /usr/bin. |
| 207 |
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' |
| 208 |
- einfo "Moving admin scripts to the correct directory" |
| 209 |
- dodir /usr/sbin |
| 210 |
- for target in ${sbin_relocations}; do |
| 211 |
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" |
| 212 |
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" |
| 213 |
- done |
| 214 |
-} |
| 215 |
- |
| 216 |
-pkg_preinst() { |
| 217 |
- # comment out sanity test until it is fixed to work |
| 218 |
- # with the new PORTAGE_PYM_PATH |
| 219 |
- #if [[ $ROOT == / ]] ; then |
| 220 |
- ## Run some minimal tests as a sanity check. |
| 221 |
- #local test_runner=$(find "${ED}" -name runTests) |
| 222 |
- #if [[ -n $test_runner && -x $test_runner ]] ; then |
| 223 |
- #einfo "Running preinst sanity tests..." |
| 224 |
- #"$test_runner" || die "preinst sanity tests failed" |
| 225 |
- #fi |
| 226 |
- #fi |
| 227 |
- |
| 228 |
- # elog dir must exist to avoid logrotate error for bug #415911. |
| 229 |
- # This code runs in preinst in order to bypass the mapping of |
| 230 |
- # portage:portage to root:root which happens after src_install. |
| 231 |
- keepdir /var/log/portage/elog |
| 232 |
- # This is allowed to fail if the user/group are invalid for prefix users. |
| 233 |
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then |
| 234 |
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} |
| 235 |
- fi |
| 236 |
- |
| 237 |
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \ |
| 238 |
- { |
| 239 |
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \ |
| 240 |
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189" |
| 241 |
- } ; then |
| 242 |
- USERPRIV_UPGRADE=true |
| 243 |
- USERSYNC_UPGRADE=true |
| 244 |
- REPOS_CONF_UPGRADE=true |
| 245 |
- REPOS_CONF_SYNC= |
| 246 |
- type -P portageq >/dev/null 2>&1 && \ |
| 247 |
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC) |
| 248 |
- else |
| 249 |
- USERPRIV_UPGRADE=false |
| 250 |
- USERSYNC_UPGRADE=false |
| 251 |
- REPOS_CONF_UPGRADE=false |
| 252 |
- fi |
| 253 |
-} |
| 254 |
- |
| 255 |
-get_ownership() { |
| 256 |
- case ${USERLAND} in |
| 257 |
- BSD) |
| 258 |
- stat -f '%Su:%Sg' "${1}" |
| 259 |
- ;; |
| 260 |
- *) |
| 261 |
- stat -c '%U:%G' "${1}" |
| 262 |
- ;; |
| 263 |
- esac |
| 264 |
-} |
| 265 |
- |
| 266 |
-new_config_protect() { |
| 267 |
- # Generate a ._cfg file even if the target file |
| 268 |
- # does not exist, ensuring that the user will |
| 269 |
- # notice the config change. |
| 270 |
- local basename=${1##*/} |
| 271 |
- local dirname=${1%/*} |
| 272 |
- local i=0 |
| 273 |
- while true ; do |
| 274 |
- local filename=$( |
| 275 |
- echo -n "${dirname}/._cfg" |
| 276 |
- printf "%04d" ${i} |
| 277 |
- echo -n "_${basename}" |
| 278 |
- ) |
| 279 |
- [[ -e ${filename} ]] || break |
| 280 |
- (( i++ )) |
| 281 |
- done |
| 282 |
- echo "${filename}" |
| 283 |
-} |
| 284 |
- |
| 285 |
-pkg_postinst() { |
| 286 |
- |
| 287 |
- if ${REPOS_CONF_UPGRADE} ; then |
| 288 |
- einfo "Generating repos.conf" |
| 289 |
- local repo_name= |
| 290 |
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \ |
| 291 |
- repo_name=$(< "${PORTDIR}/profiles/repo_name") |
| 292 |
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then |
| 293 |
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf") |
| 294 |
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } |
| 295 |
- fi |
| 296 |
- local sync_type= |
| 297 |
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git |
| 298 |
- |
| 299 |
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then |
| 300 |
- sync_type=cvs |
| 301 |
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} |
| 302 |
- fi |
| 303 |
- |
| 304 |
- cat <<-EOF > "${T}/repos.conf" |
| 305 |
- [DEFAULT] |
| 306 |
- main-repo = ${repo_name:-gentoo} |
| 307 |
- |
| 308 |
- [${repo_name:-gentoo}] |
| 309 |
- location = ${PORTDIR:-${EPREFIX}/usr/portage} |
| 310 |
- sync-type = ${sync_type:-rsync} |
| 311 |
- sync-uri = ${REPOS_CONF_SYNC} |
| 312 |
- EOF |
| 313 |
- |
| 314 |
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" |
| 315 |
- |
| 316 |
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf |
| 317 |
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then |
| 318 |
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf |
| 319 |
- fi |
| 320 |
- # Don't install the config update if the desired repos.conf directory |
| 321 |
- # and config file exist, since users may accept it blindly and break |
| 322 |
- # their config (bug #478726). |
| 323 |
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ |
| 324 |
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")" |
| 325 |
- |
| 326 |
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then |
| 327 |
- einfo "Generating make.conf PORTDIR setting for backward compatibility" |
| 328 |
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do |
| 329 |
- [[ -e ${dest} ]] && break |
| 330 |
- done |
| 331 |
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf |
| 332 |
- rm -rf "${T}/make.conf" |
| 333 |
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf" |
| 334 |
- cat <<-EOF >> "${T}/make.conf" |
| 335 |
- |
| 336 |
- # Set PORTDIR for backward compatibility with various tools: |
| 337 |
- # gentoo-bashcomp - bug #478444 |
| 338 |
- # euse - bug #474574 |
| 339 |
- # euses and ufed - bug #478318 |
| 340 |
- PORTDIR="${EPREFIX}/usr/portage" |
| 341 |
- EOF |
| 342 |
- mkdir -p "${dest%/*}" |
| 343 |
- mv "${T}/make.conf" "$(new_config_protect "${dest}")" |
| 344 |
- fi |
| 345 |
- fi |
| 346 |
- |
| 347 |
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}} |
| 348 |
- |
| 349 |
- if ${USERSYNC_UPGRADE} && \ |
| 350 |
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then |
| 351 |
- local ownership=$(get_ownership "${PORTDIR}") |
| 352 |
- if [[ -n ${ownership} ]] ; then |
| 353 |
- einfo "Adjusting PORTDIR permissions for usersync" |
| 354 |
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \ |
| 355 |
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \ |
| 356 |
- -exec chown "${ownership}" {} + |
| 357 |
- fi |
| 358 |
- fi |
| 359 |
- |
| 360 |
- einfo |
| 361 |
- elog "For setup instructions after switching to portage-multilib" |
| 362 |
- elog "read doc/portage-multilib-instructions inside the multilib overlay" |
| 363 |
- einfo |
| 364 |
- elog "The bin/ dir of the overlay has some scripts to switch from lib32" |
| 365 |
- elog "to MULTILIB_ABI or to add the default MULTILIB_ABI flags" |
| 366 |
- |
| 367 |
- # Do this last, since it could take a long time if there |
| 368 |
- # are lots of live sources, and the user may be tempted |
| 369 |
- # to kill emerge while it is running. |
| 370 |
- if ${USERPRIV_UPGRADE} && \ |
| 371 |
- [[ -d ${distdir} && -w ${distdir} ]] ; then |
| 372 |
- local ownership=$(get_ownership "${distdir}") |
| 373 |
- if [[ ${ownership#*:} == portage ]] ; then |
| 374 |
- einfo "Adjusting DISTDIR permissions for userpriv" |
| 375 |
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \ |
| 376 |
- -exec chown -R portage:portage {} + |
| 377 |
- fi |
| 378 |
- fi |
| 379 |
-} |
| 380 |
|
| 381 |
diff --git a/sys-apps/portage/portage-2.2.18-r1.ebuild b/sys-apps/portage/portage-2.2.22-r1.ebuild |
| 382 |
similarity index 99% |
| 383 |
rename from sys-apps/portage/portage-2.2.18-r1.ebuild |
| 384 |
rename to sys-apps/portage/portage-2.2.22-r1.ebuild |
| 385 |
index d270faf..d8ae83a 100644 |
| 386 |
--- a/sys-apps/portage/portage-2.2.18-r1.ebuild |
| 387 |
+++ b/sys-apps/portage/portage-2.2.22-r1.ebuild |
| 388 |
@@ -16,7 +16,7 @@ inherit distutils-r1 git-2 multilib |
| 389 |
|
| 390 |
EGIT_REPO_URI="git://anongit.gentoo.org/proj/portage.git" |
| 391 |
EGIT_BRANCH="multilib" |
| 392 |
-EGIT_COMMIT="600cb1fd9daed3b01d8f51b38c29f000376b6513" |
| 393 |
+EGIT_COMMIT="0c879b950b70c54cd672ddc0541744d7785ee04b" |
| 394 |
DESCRIPTION="Portage is the package management and distribution system for Gentoo" |
| 395 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" |
Archives