From: Brian Dolbec Date: Sun, 8 Feb 2015 18:06:30 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0935d34a9aadf70dfab2a817b9959ab514a63728;p=gentoo.git Version bump Package-Manager: portage-2.2.16/cvs/Linux x86_64 Manifest-Sign-Key: 0xD80F5F1E1245142E --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 88090b6dfdd9..bd3a4b1eb07a 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1427 2015/01/15 09:48:44 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1428 2015/02/08 18:06:12 dolsen Exp $ + +*portage-2.2.16 (08 Feb 2015) + + 08 Feb 2015; Brian Dolbec +portage-2.2.16.ebuild: + Version bump. First release with the new plug-in sync system. Fixes bugs + 583512, 538314, 537298, 534722, 536926, 536392, 492932, 142579, 282927, + 535850, 533036, 463266, 533884, 531656, 531724, 534070, 532670, 532784, + 532594, 525718, 532224, 504116, 412471, 531690, 531854, 522032. 15 Jan 2015; Raúl Porcel portage-2.2.14.ebuild: alpha/arm64/ia64/m68k/s390/sh/sparc stable wrt #531594 diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index b55595d1701e..648b27c1ea24 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -4,18 +4,32 @@ Hash: SHA256 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5 DIST portage-2.2.14.tar.bz2 896674 SHA256 8dd65971e0f1c31dca922b0f7be06e622aabbed8d012d056ff25a169fc9946d8 SHA512 c8724b42d9932adf6065ff9f9c3bb3d22ec3258dcdb23e041ce704f2c7b634d459a36764f3ec5aa4613843733c70725025af10439816c538ec12837db50dc1ab WHIRLPOOL 82bb660fcc1f0bb4639b53829cf8207fc40ee01a0cb9935ad46fb5039f0558fbbbb3af3d12d208289e9701e0874d77a7990911fd50fe04806948c6c6955625fc DIST portage-2.2.15.tar.bz2 907786 SHA256 be62ee5e104272f9e6472a60db7e05136e6acf212003159b500fa3132a9a68d7 SHA512 4e0ca51ddbe94ce0595e56f549c8cdff68d3d2f7d0d7fdece78adc10a9657ed848f084672840f2533bc7c87c6aaa06e02861c7f9d92bdcc1647c9b40b7a3a5a1 WHIRLPOOL 689e62a261b8fa404c8aedfcc825135ba3005ab920db6cb2ce1040ec252f24f67a5d5c01a84db908598390fc97f6df9d9ba78a106ee16aa748a049bf425bf28d +DIST portage-2.2.16.tar.bz2 931768 SHA256 355418291cb778d2d25825795a294bdf71ed894f1ba8e79c40af53ac8c0aefe0 SHA512 a6d5f947a51649b51fa618471b68c08c4c2b0a5cdf608e48db6b714f51ea93d167f7d98500fe61cfe6499ac18eaf24bb55439c4696b3a18b956148285b0f5525 WHIRLPOOL 9c980fec1a827d2e28b36ed73d0c0a084ddbe56f2f30a34276eb5a24911f9988ccb5bd20301b83dcce03b1dee8033b099f8960ae0545da2337eddb653ff73d3d DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2 EBUILD portage-2.2.14.ebuild 11345 SHA256 015330cff1b0c7529a3b030715e5837cdf81199a10a1553e60750b69a4c365d4 SHA512 aeef1d6a08303251052afb35818c4d15dcc1943ce23bf4749aa27e5fb88dbd3bc1338d589f5a5192cc70eafd5ea23a1febe6168201edcd99263e4d587f45b08b WHIRLPOOL 0e562264d9edd2e16e93eec382cdab776bc491e9bcb0c41800beb255a6652df73aac057c8dc5616492a2f9dbde12c8c112fb3a890f2801964ec8dba20c86d684 EBUILD portage-2.2.15.ebuild 11355 SHA256 2aa97a2e3ec8e4b5df74d66566e64cc164e3e59829411f35ced9961f3b766504 SHA512 46427c710b064613df744af82c6ff2ef7ca59e8c6a2fa048347cf6fd1c6b59bd147227f68787ea4d25452cc43c74f4d819d8de7fe43998d67564e7a71105f1b1 WHIRLPOOL 1f995c48c05c291e2ae3e64950e5afef606529e79ebb18ebd64cec430d4a2f14406bfe1206c279c4dc201e63235d629174c4e5e59a693cd52ad59cb1f147e162 +EBUILD portage-2.2.16.ebuild 11355 SHA256 76dbc9c56efdaa7757b8e68d691bb9a06b4be1c73c16d8eeb9c479c50244b815 SHA512 0e4e59abfcc3376ea806a6a7eae38cffbdd27ff93261c25c94bd61829a025782539f11815a5d231662d2890dfd46045c87a95845641112e22f03c2d5562e2f67 WHIRLPOOL b17da137d21ad108a227408cfc5f98e8e32366e88333423b68c01ac09c79e4794177d8befc192a668e5f8d1059b8e12562746b9f2f458e898212f35a79506ddf EBUILD portage-2.2.8-r2.ebuild 19246 SHA256 e5117305e6132b0460e73b6f05de6f0c408a7ecb7d3303f3ea19c65d37e485cf SHA512 64bb817cb9467335117c96b69aa533b7e34edb0f0c3d50b87278f2c35c49d7074d3b702447cd18a646c66fc512a163b584bb1d5ec023a8077123ffde171785c7 WHIRLPOOL 99fcf94232e0de66fa33e0f0150a56b085cf67bf1a2c1434f8cc773561e5390cdbe33ca4a8d3d940c80f5209a94b9803d27503d4152420b8e1f3127a590a8666 EBUILD portage-9999.ebuild 8356 SHA256 f4cc53024d0e6a352050ac5a0fb119b979c8623383ddbce7e5e2b8f1e44b2401 SHA512 1f66e43964f1040acf7b3653d5f355b822b8c08579c1f9032a03769b79319d3eb6bd444355627e7f0de29ca498dbadc7fab73e0d6dbb184e0b679592adf0e674 WHIRLPOOL 806a6c2172b69277c083457d5698f779381fe3e609e5071dd4089e1161054af64ab6824b2b9bd5c04ed020fee0ddae223c440a90cabe98cd937fdea079cf11c0 -MISC ChangeLog 62118 SHA256 bb7b81069a78dfce04f2aaccc00996d091e42d00ec9517e601a8ccadccc76f80 SHA512 81eff44d13f059f2bac1f24d2a56643739fb468f2918e76850701fc4ad63a60fb3596db2363ae2e23aae2581525f8194f430c6ce4a431f2c887f7b140c4b3939 WHIRLPOOL b2ff36a6c9dc828d3538c81e4b979feb899ebae059d6f81b214356b4ff14b1947699f630b806832d137e49b081048329cae8bfc2f8eddc5c5c3c09a3a863465d +MISC ChangeLog 62511 SHA256 c7a93b94d9715714a803698ac96c595b884fbe959cf4052116914e20aef31291 SHA512 67d8594124f5cd827b2d058727dbe56b8f63816180bc362a797f2cd8de6e11ffba8bdedfb834524a84ad3bcbda0e173f0cb79658b728f9a9e4d31401f60e441d WHIRLPOOL c41fabc8d4fc01634ca1ebbf200b16fc5d17c505694172d8a53dbf31d29482f1641a6ea792027d70eacf8c33e48d9597ed0c7222c4cd08d6242a1f80ad58fa5b MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f MISC metadata.xml 1028 SHA256 c3c8eaafc55327db46f7851b816118637c3f81ba908fb7c536036122a807a874 SHA512 287af0b907a1890ad8ab53cf33001ad1cb6f2c2c8efc022ffa27647afa0e0fc75060e7268d2b7f0932258e12204ac23f927f49d99130714d025e5610e2526e83 WHIRLPOOL a332c3d7208a4bf6bb5caa155331956f6123e73d999200c09e3a477136f9090de492f6455e2b19e49d7d6782a2bfe1aafd147df382db7927bbb12ae553a2d3bb -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlS3kgwACgkQuQc30/atMkCFwACfYJ13R7S0iZ2F/12Kvk7aY0EE -oroAnRZf4m/vmu1K7Wgo0+QpTFgkKGxj -=xKLL +iQJ8BAEBCABmBQJU16WWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNUQ3Qzc0RTA4MUNDNzBEQjRBNEFBRjVG +QkJEMDg3Mjc1ODIwRUQ4AAoJEPu9CHJ1gg7YOmwP/0vnGhLBURqhBo+oR+NZr6FE +Znj1P0YC9sXLcZ/w8yICDPhZ9u9ZOAfFgYUvHNqC8EYgI/YHdSzcIEMuDODnicuX +DR7YFh4jEeRGAiZvppUNj2r8c+rO7wiFMJSG+MH5CL2hAsSDJVKgunoJu8COeUlZ +SKBSxThrf20LejZXPuwrG/3KlthA5H0Q/xiz8TVuEim/ZmNnulETmT+CZJKhInuc +w87u5M+vInIdRTralEHn7AXbXFI3FUdmjeXD1I62C2Oc+bQ8UsUwqDVHMOn8x/XV +JCUkq64VCBuEaqYquPsghLlEILEIldpLRJqm4GIhfGEN+8s8UXhoszw5bRPzNRBY +9c8tmaUpPuDeQUwIm4patu0UWdZgJ2bWEllZlLP/4YFjDg06goJF0F95ffxfDmrP +o+IQImiSH4bFc1zTyXFuTji9IOS+jcS041gs+YdPNzLyfZVPeM4PcCOEPHmBNVZp +6ZJrX7MTjjYaxO11iKlob9TWBdkVghoOf9KXfW9MbgiiYqNLtMvDuFNWj/JunXrI +t7d03fRNeAExqi18NlmB6I6pbZHPhbmzP34bBNyU5kzvxW4W6j1qPpWEOHM2/AOC +tnNeYZJZcJhB7dyIqKlLymiCKhpnfccC6HFrcxFYRlP8VKGSDaeLyQshN2IkBaw7 +MPCtMd+6WYqW37F8rU6+ +=OQ2a -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.2.16.ebuild b/sys-apps/portage/portage-2.2.16.ebuild new file mode 100644 index 000000000000..3063197f29a0 --- /dev/null +++ b/sys-apps/portage/portage-2.2.16.ebuild @@ -0,0 +1,352 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.16.ebuild,v 1.1 2015/02/08 18:06:12 dolsen Exp $ + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_2 python3_3 python3_4 + python2_7 +) +# Note: substituted below +PYTHON_REQ_USE='bzip2(+)' + +inherit distutils-r1 multilib + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +SLOT="0" +IUSE="build doc epydoc +ipc linguas_ru selinux xattr" + +DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +RDEPEND=" + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ + python{2_7,3_2} pypy) + ) ) + !> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ + -i pym/portage/const.py || \ + die "Failed to patch portage.const.EPREFIX" + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + + einfo "Adjusting make.globals ..." + sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ + -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ + -i cnf/make.globals || die "sed failed" + + einfo "Adjusting repos.conf ..." + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use epydoc && targets+=( epydoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( install_docbook ) + use epydoc && targets+=( install_epydoc ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + # comment out sanity test until it is fixed to work + # with the new PORTAGE_PYM_PATH + #if [[ $ROOT == / ]] ; then + ## Run some minimal tests as a sanity check. + #local test_runner=$(find "${ED}" -name runTests) + #if [[ -n $test_runner && -x $test_runner ]] ; then + #einfo "Running preinst sanity tests..." + #"$test_runner" || die "preinst sanity tests failed" + #fi + #fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.1.13" || \ + { + has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \ + has_version "<${CATEGORY}/${PN}-2.2.0_alpha189" + } ; then + USERPRIV_UPGRADE=true + USERSYNC_UPGRADE=true + REPOS_CONF_UPGRADE=true + REPOS_CONF_SYNC= + type -P portageq >/dev/null 2>&1 && \ + REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC) + else + USERPRIV_UPGRADE=false + USERSYNC_UPGRADE=false + REPOS_CONF_UPGRADE=false + fi +} + +get_ownership() { + case ${USERLAND} in + BSD) + stat -f '%Su:%Sg' "${1}" + ;; + *) + stat -c '%U:%G' "${1}" + ;; + esac +} + +new_config_protect() { + # Generate a ._cfg file even if the target file + # does not exist, ensuring that the user will + # notice the config change. + local basename=${1##*/} + local dirname=${1%/*} + local i=0 + while true ; do + local filename=$( + echo -n "${dirname}/._cfg" + printf "%04d" ${i} + echo -n "_${basename}" + ) + [[ -e ${filename} ]] || break + (( i++ )) + done + echo "${filename}" +} + +pkg_postinst() { + + if ${REPOS_CONF_UPGRADE} ; then + einfo "Generating repos.conf" + local repo_name= + [[ -f ${PORTDIR}/profiles/repo_name ]] && \ + repo_name=$(< "${PORTDIR}/profiles/repo_name") + if [[ -z ${REPOS_CONF_SYNC} ]] ; then + REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf") + REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } + fi + local sync_type= + [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git + + if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then + sync_type=cvs + REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} + fi + + cat <<-EOF > "${T}/repos.conf" + [DEFAULT] + main-repo = ${repo_name:-gentoo} + + [${repo_name:-gentoo}] + location = ${PORTDIR:-${EPREFIX}/usr/portage} + sync-type = ${sync_type:-rsync} + sync-uri = ${REPOS_CONF_SYNC} + EOF + + [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" + + local dest=${EROOT:-${ROOT}}etc/portage/repos.conf + if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then + dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf + fi + # Don't install the config update if the desired repos.conf directory + # and config file exist, since users may accept it blindly and break + # their config (bug #478726). + [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ + mv "${T}/repos.conf" "$(new_config_protect "${dest}")" + + if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then + einfo "Generating make.conf PORTDIR setting for backward compatibility" + for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do + [[ -e ${dest} ]] && break + done + [[ -d ${dest} ]] && dest=${dest}/portdir.conf + rm -rf "${T}/make.conf" + [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf" + cat <<-EOF >> "${T}/make.conf" + + # Set PORTDIR for backward compatibility with various tools: + # gentoo-bashcomp - bug #478444 + # euse - bug #474574 + # euses and ufed - bug #478318 + PORTDIR="${EPREFIX}/usr/portage" + EOF + mkdir -p "${dest%/*}" + mv "${T}/make.conf" "$(new_config_protect "${dest}")" + fi + fi + + local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}} + + if ${USERSYNC_UPGRADE} && \ + [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then + local ownership=$(get_ownership "${PORTDIR}") + if [[ -n ${ownership} ]] ; then + einfo "Adjusting PORTDIR permissions for usersync" + find "${PORTDIR}" -path "${distdir%/}" -prune -o \ + ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \ + -exec chown "${ownership}" {} + + fi + fi + + # Do this last, since it could take a long time if there + # are lots of live sources, and the user may be tempted + # to kill emerge while it is running. + if ${USERPRIV_UPGRADE} && \ + [[ -d ${distdir} && -w ${distdir} ]] ; then + local ownership=$(get_ownership "${distdir}") + if [[ ${ownership#*:} == portage ]] ; then + einfo "Adjusting DISTDIR permissions for userpriv" + find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \ + -exec chown -R portage:portage {} + + fi + fi +}