Version bump
authorBrian Dolbec <dolsen@gentoo.org>
Wed, 4 Mar 2015 21:16:27 +0000 (21:16 +0000)
committerBrian Dolbec <dolsen@gentoo.org>
Wed, 4 Mar 2015 21:16:27 +0000 (21:16 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD80F5F1E1245142E

sys-apps/portage/ChangeLog
sys-apps/portage/Manifest
sys-apps/portage/portage-2.2.18.ebuild [new file with mode: 0644]

index af1be8de3bdebd6f98a31e97181b23603edd4a1c..290588d12c617dc33f95302ab4553452acce8fa0 100644 (file)
@@ -1,6 +1,12 @@
 # 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.1431 2015/03/02 09:27:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1432 2015/03/04 21:16:04 dolsen Exp $
+
+*portage-2.2.18 (04 Mar 2015)
+
+  04 Mar 2015; Brian Dolbec <dolsen@gentoo.org> +portage-2.2.18.ebuild:
+  Version bump. Fixes bugs 539706, 538980, 282639, 540882, 541188, 541198,
+  541302, 500436, 540482, 511806, 541746, 542052.
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> portage-2.2.14.ebuild:
   Stable for ppc, wrt bug #531594
index f8c3838fb9837e888c5e5a441d3ffa568b78f6f3..739a1a9efb36634744a2f3ed7a5e660edf3b77aa 100644 (file)
@@ -5,29 +5,33 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd1
 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.17.tar.bz2 931533 SHA256 6f4023ea8acacb9b14e6a8b5b4e0636c5098e1246917ed184f88bed0930e0480 SHA512 efddfd3ab9d725db2ccafcfbb19baff8b16cd09d9f3a7b42bea9578855d8e73291fdf692932c3e6d4de21183d0384c02055e87f434c19d8cc04d17cc3c57adb1 WHIRLPOOL 4d0d696b8b96723dbf27472d4f77872122d231f2beb87d6023c269796ea74f3505df638ec286c847a1dcefe2174356045feb3a415afb086936c444554349dc6d
+DIST portage-2.2.18.tar.bz2 942561 SHA256 e0d54f2fbcdc8b5fce716475183fa6e889b6fa8178c92d65a850df73f1636560 SHA512 be4f95bc04a61cdb371fc66a03d2183961bfd458e9b2b89cf8cab8c9e70bde4119be266177d947e31429627609ed75a75c21abfe4b674ca529632d5728e8e8a6 WHIRLPOOL f334bf5198d2214de557a046ed3217e23d48d8f8d7d64fb0bd2611dd5c8725139eaf7d1e1065f822d8816f3979e86d6a6f8df4d2f4605df0b5c157d6bbf09a6d
 DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
 EBUILD portage-2.2.14.ebuild 11341 SHA256 0c2a414b345ac67d4a3f2e899c44f8a91a432e14e5b58142180736b0aa6f9cd2 SHA512 d342280185b051dc3c4318f152ac7bb789cb51ff2cff1746b285e15a7ace56b4ed903df032555232bcd9aa107bdfac227b97a941963a20ed2ab30eb02a88ccff WHIRLPOOL dbc8ac58089c109687236ba4441318b93a502acb83b79fa7d49f8efdb727efa9d9ee490ae0986fb54879f57c07c990f657a3a05bd7b2ebb86d7077413f567b57
 EBUILD portage-2.2.15.ebuild 11355 SHA256 2aa97a2e3ec8e4b5df74d66566e64cc164e3e59829411f35ced9961f3b766504 SHA512 46427c710b064613df744af82c6ff2ef7ca59e8c6a2fa048347cf6fd1c6b59bd147227f68787ea4d25452cc43c74f4d819d8de7fe43998d67564e7a71105f1b1 WHIRLPOOL 1f995c48c05c291e2ae3e64950e5afef606529e79ebb18ebd64cec430d4a2f14406bfe1206c279c4dc201e63235d629174c4e5e59a693cd52ad59cb1f147e162
 EBUILD portage-2.2.17.ebuild 11718 SHA256 7fa9a2c2f490db0706fab39a81ba01a5ef90c1484ebaf002a415f3144700f6e8 SHA512 79472219b71394f580ea5b060d3330301d968e9f2614bec6045036864febde0a7636bec7969e92f4dc8edfb9422d1293581f64e029d7d6d31ba508de5574ac71 WHIRLPOOL 7d27af56b26378ae5cbb2c14be56a405a216daa76a0c2a42e10b234e2479e3df44ebd38de924e9eb8a9899dadbdbacb7fe4f37f5a535f4b73861495c6eef9719
+EBUILD portage-2.2.18.ebuild 11355 SHA256 a13b551bc65999a2db17f2c9a366b1422e4e24ab992d13d784c65b49ce36b51e SHA512 c1e9c74733c616ddec56aae30bba2bb19f86d2accff2e75a441d1ff019ee940caac2b5ca391f6bfc972e18364357c00d1628e431fecd468dd10b6477c1f11758 WHIRLPOOL 0c6799154b4af9440a334c2fb3631009f695d40bcd1f8bdd7760c80029796bf1f711da601e645ef5a4845f58f4ecf19aeca7aabb1295ce7e4a639b3448571743
 EBUILD portage-2.2.8-r2.ebuild 19246 SHA256 e5117305e6132b0460e73b6f05de6f0c408a7ecb7d3303f3ea19c65d37e485cf SHA512 64bb817cb9467335117c96b69aa533b7e34edb0f0c3d50b87278f2c35c49d7074d3b702447cd18a646c66fc512a163b584bb1d5ec023a8077123ffde171785c7 WHIRLPOOL 99fcf94232e0de66fa33e0f0150a56b085cf67bf1a2c1434f8cc773561e5390cdbe33ca4a8d3d940c80f5209a94b9803d27503d4152420b8e1f3127a590a8666
 EBUILD portage-9999.ebuild 8356 SHA256 037cc9a68811e161a4181e74f68c7f261ebabb4e161b0040250e56bc5660408d SHA512 5d9f4f91009e729572ba8dec83ec7722437e09d17891f640448ba2e6e7f7386cf921367b04990481b294e7b52eceb00fbbf760bb6b0de39001a188d604698321 WHIRLPOOL ff67ecbd8e6457d6b7b95b80d5ce1d8da8f85a10b0f8a651d84fa21b980a8c4d88991a8dd42eeae2d4d4c89fce35eaa534e5d81094507e46995f261d24bf3f3d
-MISC ChangeLog 63108 SHA256 6454a5cd7de70d0bda103c4bbd138d1b3f8f4511ccf240254f749eb856de46c8 SHA512 caa3a916a0a00c88d8e15db727d2e0a693682f7070d2e6806710a3f3550cf56b6d4ffd79d3b42208723b43a6ccd20084456e119d5ea82b4c023710faa32de0da WHIRLPOOL a04ad588ace32be5aa10a7310f9dda0fab3bd60911b56f54720903f806b35c3491133f5c23ec7e1dc24679d17d658684c013520fb3482af9533e6673c4b990b7
+MISC ChangeLog 63340 SHA256 2056153b99487229b442bec4d2b3fd4e53fc5967fa3647a7e54530b4d30827c1 SHA512 8e36ff3d444946f0a2df40754894d8d51d0af54c34f133db1821a71d7dcfb43be639c4bdcaf821c33c864f3d255ddda3c9c850b732a291366f1258bfca1c6375 WHIRLPOOL 12b1a6757252ffb9a37ad240d0fc8379f119e40b41f4d9a2fe4d8c50c7803f9c53100dba3ab3d3f18ab04e94cfc61338a66e5951562d1094c227d0d6c0f9955a
 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
 
-iQIcBAEBCAAGBQJU9CzmAAoJELp701BxlEWf1fMP/3IjqPJmXV5BCDwtW9315i2T
-IP99Hnrq7+BHm49R1BQeiw0o1qc9ouLRNMwdTum/iFWkQyZzLT2KzaJSX0Rgw/1l
-o8NmqSQgsdsiAkIr1WoaDFH1QCWV212qx/KLwTDNFI/AgB4n3nyNQLu5dSxLJSWn
-ZTrtCfD00uKuoCc2v+g5WSVLkyzeFvNNuT/q5N4Qen8dvt4kQ0/dBX4iHxDGagmY
-099TbVWscnjq4DkXMaWDiqkMIYzq14sacPttVtH4WEK6y2Ks4tqRlEDo2eUw//vT
-qcyhJIJQ/c6LvUU9VdAtzqOieTGD379cgnxdu6Dam/kAD+Q7j0gSAwH5xmS38NoY
-N5QWf2Qjd9xyWy6WwlVbp2rCO5M+mCHe+ssVxMklLAfZC2ljzWRDPU3R3/UTGT9o
-9Q2XXnj/0aW33eR/qcxH6jUQnerwEqxUD6UMbxkI5xXarMjGFjKyd8qYXmN/RNq3
-1uLJo5BIuXdayXsqKrFVtT09CHliENwb//+Pt6E/Ydh27+/z6d2P2/bpP7wsk7pf
-VYQTZYCkmrwMdUrwqbwXxxxQEp38Mihl27x9US2yB6TtszfCzsF8pL1waC6WCNOW
-LtpbZC5EzoTKqsaijLO/167m/qApnGWasDIF/h6I35ltQ/2P3ejTShQ3Su0RKvLY
-YmfMF6XoR2rL5tZ+P/8j
-=gnQJ
+iQJ8BAEBCABmBQJU93YeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNUQ3Qzc0RTA4MUNDNzBEQjRBNEFBRjVG
+QkJEMDg3Mjc1ODIwRUQ4AAoJEPu9CHJ1gg7Y84MP/3D2X5RXk2ZVcfiuK/xUjgGe
+wtM8Sg4H3TjuzlEwDVEs7VwzSy8MMRltwfUY/bi83b1WH9pN6W8vTYT41Ca30823
+YVkoZkzXgmaC6Dj+L4UeWrLDBKEJLNsZLXHVk+2ZTDBEKPspU8JrtueBa3lbBgVK
+YpUwfmN+HRLWexgsHreXYl9JYc08zPrPMEIlBslxD7c5B4eEvUetlRRLCqPL5F/O
+90kL24QPUNi6FZdkjewdhco+wiwydk5wVMpChgj8LuXlKaz266P05oly9cJdzOQl
+Cv0gFjPBoYPxzHwTfZnQeDr9tupUZkKYhpS0c3UtolprCtgp/edbobYQc8/9oAuM
+9jfdj18rA2jV8DZ08UGh3+EGqP0VvI5zx6Phg/AUxRjlffMtx5razUk5wNPyT3iN
+uWGFC7zyxhWMURF6VF13r3tr89Rl0z8VGYE8E+uOP5aOmjsorC1cr6lipMRbdRGQ
+en+OK0zey9JfFIByHJ6oCdmSrL8MNGD1L+HrFjOM1dTdmcpuxdW8JpJCIMuYrhOK
+eThyn9OaPbn0hquY8l+WQeqMuTtxZrOi+OuULKs88y15P6X1LW5OXULrb/DKn1Vu
+j4qppRtIwJsfnFa9vBKn3yJJutDOCan0v6jm8yObJy8Yi0pu0r+w2jHOJ6WGRwgz
+GMLiEi90HrjqRd3vES63
+=CXnr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2.18.ebuild b/sys-apps/portage/portage-2.2.18.ebuild
new file mode 100644 (file)
index 0000000..566ccb0
--- /dev/null
@@ -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.18.ebuild,v 1.1 2015/03/04 21:16:04 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)
+       ) )
+       !<app-admin/logrotate-3.8.0"
+PDEPEND="
+       !build? (
+               >=net-misc/rsync-2.6.4
+               userland_GNU? ( >=sys-apps/coreutils-6.4 )
+       )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="http://dev.gentoo.org/~dolsen/releases/portage"
+
+prefix_src_archives() {
+       local x y
+       for x in ${@}; do
+               for y in ${SRC_ARCHIVES}; do
+                       echo ${y}/${x}
+               done
+       done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+       $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+python_prepare_all() {
+       distutils-r1_python_prepare_all
+
+       if ! use ipc ; then
+               einfo "Disabling ipc..."
+               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+                       -i pym/_emerge/AbstractEbuildProcess.py || \
+                       die "failed to patch AbstractEbuildProcess.py"
+       fi
+
+       if use xattr && use kernel_linux ; then
+               einfo "Adding FEATURES=xattr to make.globals ..."
+               echo -e '\nFEATURES="${FEATURES} xattr"' >> 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
+}