2.1.2_rc4-r9 revbump. This fixes bugs #9870, #50738, #69021, #88485, #141867, #14438...

Package-Manager: portage-2.1.2_rc4-r9

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d414f6f978b77115ae2b15af7d74b91194447315..72732ef18936437202b02f72bfaf06fab189fdd6 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -18,8 +18,8 @@ DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d
 DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1
 DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28e489 SHA1 4eaedfedf867346d67744d95d5cb3ad5b0da4417 SHA256 4d2bc33b66c6354f008d798507137a347e35ef7448a10ef17e5108160acb0414
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
-DIST portage-2.1.2_rc4-r7.patch.bz2 29675 RMD160 c2301154006d157b2a179f2f7d189e8d7b28cf3a SHA1 1b744d5e041eb44f7ad896017bc7e3766afaab39 SHA256 5cb1f497e958fe59c46e61bdc86c6071a39e1e430c7b6c812e9d62548d39ad97
-DIST portage-2.1.2_rc4-r8.patch.bz2 43005 RMD160 f12e54fdd1917728eddcdbe4dc1a824444f42d00 SHA1 1684b2f148bfdff43863b5b141f72132b06090e3 SHA256 600ed46b75f4f79d4bbd75d1b8be24921e6277b2a5918cd0b763fc3c48da0128
+DIST portage-2.1.2_rc4-r8.patch.bz2 42744 RMD160 03252dde42eacd4882208cba44a0bb03fb8ab3fb SHA1 4cb33eaee48ea23d0e03d0cf315ae9cdbea8602f SHA256 5b3b8d075af8431e2cef49cec039e759052a0efb0d30734a29bae22745e958e9
+DIST portage-2.1.2_rc4-r9.patch.bz2 65440 RMD160 008c079fd0273016fe2ed967f734484d0c8beb19 SHA1 72e73fab4082356594b4e158bc1a9b6e98e82d8a SHA256 ccf60f76914aeb84a20baf5e8747b4f435dba4fdbe132b1bb8adaa6a1b5c7b73
 DIST portage-2.1.2_rc4.tar.bz2 342408 RMD160 a5ff27e1db02929940aa90108cb8d9219c7f1a48 SHA1 7c5aea96360e067c9d6163caa4e6682b07ea2104 SHA256 15d33e3845850b7e6866cf1973256ad98f018e4cb097a1146161c58e7c7a601d
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2_rc1.tar.bz2 53030 RMD160 9ed9037256f3eba59600028f2d8f78792a33383a SHA1 a511121897609bd5a261981fcc7f6789eb1deaaf SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a
@@ -40,18 +40,18 @@ EBUILD portage-2.1.1-r2.ebuild 7234 RMD160 7516a62adb99ae3e88d6db389cccee1efca3b
 MD5 c583bfb1e33476953f90a66ab2557c53 portage-2.1.1-r2.ebuild 7234
 RMD160 7516a62adb99ae3e88d6db389cccee1efca3b532 portage-2.1.1-r2.ebuild 7234
 SHA256 2e517ceee2ec5a426effa4716c2e95b22db3acc62faab3fd637b78498634ef61 portage-2.1.1-r2.ebuild 7234
-EBUILD portage-2.1.2_rc4-r7.ebuild 6874 RMD160 d5856357e9526f22d418aba365e136dc524c6d9c SHA1 50a1eb5f4f7ecd5ec001db79c7a0c4a06e58b1f9 SHA256 48f9337c3aaa79d37b57888059970b38142f83cd8d13b32d5070578387f2b54d
-MD5 4f80e10e20cd5a90930b01bba38ee25f portage-2.1.2_rc4-r7.ebuild 6874
-RMD160 d5856357e9526f22d418aba365e136dc524c6d9c portage-2.1.2_rc4-r7.ebuild 6874
-SHA256 48f9337c3aaa79d37b57888059970b38142f83cd8d13b32d5070578387f2b54d portage-2.1.2_rc4-r7.ebuild 6874
 EBUILD portage-2.1.2_rc4-r8.ebuild 6772 RMD160 1a9a383fdfcf8331e8036124fdeb1db66b94e30e SHA1 c76af9b7ee939dcceb486677344c26b008a042dc SHA256 a88a9e518320420aa1ba0d904188c1a1d91f9116891662f039fd8750b1bf2c84
 MD5 74cc997e8e68882ccaf8128381ee523d portage-2.1.2_rc4-r8.ebuild 6772
 RMD160 1a9a383fdfcf8331e8036124fdeb1db66b94e30e portage-2.1.2_rc4-r8.ebuild 6772
 SHA256 a88a9e518320420aa1ba0d904188c1a1d91f9116891662f039fd8750b1bf2c84 portage-2.1.2_rc4-r8.ebuild 6772
-MISC ChangeLog 20138 RMD160 2f31c849867537931c7850536e238ff53e15eb05 SHA1 69ffcf3c487659eb6bdea63337d3e7d660017ddc SHA256 78b6a35f3580d27b8e443d47cd35e6521e467ec1dae580ce9f9c3cb997f4575b
-MD5 9e2fe51991b5738cda91fda111b1157f ChangeLog 20138
-RMD160 2f31c849867537931c7850536e238ff53e15eb05 ChangeLog 20138
-SHA256 78b6a35f3580d27b8e443d47cd35e6521e467ec1dae580ce9f9c3cb997f4575b ChangeLog 20138
+EBUILD portage-2.1.2_rc4-r9.ebuild 6772 RMD160 179b5dc852a048bddf3243417f38277a2c5ab54a SHA1 6a64c866908490270fe1dccd02a6bf9ca5dc4855 SHA256 5f7fb88d9711ad2d5ac156e8a85f683597aa489efc4d7a1a1e7beeedb9b5a399
+MD5 a74aa537e7e052715e3314919f502879 portage-2.1.2_rc4-r9.ebuild 6772
+RMD160 179b5dc852a048bddf3243417f38277a2c5ab54a portage-2.1.2_rc4-r9.ebuild 6772
+SHA256 5f7fb88d9711ad2d5ac156e8a85f683597aa489efc4d7a1a1e7beeedb9b5a399 portage-2.1.2_rc4-r9.ebuild 6772
+MISC ChangeLog 20402 RMD160 04b7c1e974df482133940698fd88a359c89bbf1d SHA1 fe0cf2e3affbb89d73c8b5f30c55666e9fc48479 SHA256 f39dbfc35187374c29ef2ca035bd90136801d1f99013761774d90a402c260045
+MD5 598a1974af83774201c8d11961e6f0ee ChangeLog 20402
+RMD160 04b7c1e974df482133940698fd88a359c89bbf1d ChangeLog 20402
+SHA256 f39dbfc35187374c29ef2ca035bd90136801d1f99013761774d90a402c260045 ChangeLog 20402
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -68,16 +68,16 @@ SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/di
 MD5 3add5888d02ad00946eb670f1d6eff5c files/digest-portage-2.1.1-r2 1021
 RMD160 082589ba69cde6b349a156722316ba10bdcfe0cd files/digest-portage-2.1.1-r2 1021
 SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/digest-portage-2.1.1-r2 1021
-MD5 a2fb45fc0725d1a1d062e4520bc25d6c files/digest-portage-2.1.2_rc4-r7 798
-RMD160 2108bf5ae7bae866d8a578c1b491fcc9411a604e files/digest-portage-2.1.2_rc4-r7 798
-SHA256 e24e9d8573b95ace966e7162ba68b62462869d5595626b54c3dada330157ee01 files/digest-portage-2.1.2_rc4-r7 798
-MD5 ba4edbfd4e52c1dab5005657b18f2d41 files/digest-portage-2.1.2_rc4-r8 798
-RMD160 d5ba4a42da555d0228307956328716fa6e1b5f3e files/digest-portage-2.1.2_rc4-r8 798
-SHA256 40f48a5cf73a2301f7af7fa76f6894359dd85bb73b82e26d26c5c3778e18b1d6 files/digest-portage-2.1.2_rc4-r8 798
+MD5 d9784e4b1534c812dcd923f2991535d0 files/digest-portage-2.1.2_rc4-r8 798
+RMD160 10a126088b9f517727a9e889361eeddb1df77b0d files/digest-portage-2.1.2_rc4-r8 798
+SHA256 3c6c1533da1b0fd4fa46ec8651ca138e1f918b63468bc93f43ae59bc95029730 files/digest-portage-2.1.2_rc4-r8 798
+MD5 67a782252f55849bd67e1a9b9ccb48c5 files/digest-portage-2.1.2_rc4-r9 798
+RMD160 2936343fd26324494e69adb88ca0ea0a1238f34c files/digest-portage-2.1.2_rc4-r9 798
+SHA256 4bcc3ddfd46b02d367188c2dfec3ddbf83149738342a984d6ce631acd6523347 files/digest-portage-2.1.2_rc4-r9 798
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFpblJ/ejvha5XGaMRApAoAKCCMuzikZilaNntfKJGSMAVd4BqMwCeKkjA
-U650sV8oQPPCZdV+Kiwpo9M=
-=8KgW
+iD8DBQFFqHwB/ejvha5XGaMRAi/sAJ0aoXaN56e2wzwsvgbRvXW3lBtxcgCeOQ/b
+yYWW9G0ZboO7bio5oCw/U+o=
+=s9++
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc4-r7 b/sys-apps/portage/files/digest-portage-2.1.2_rc4-r7
deleted file mode 100644 (file)
index 4ec06cb..0000000
--- a/sys-apps/portage/files/digest-portage-2.1.2_rc4-r7
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 cefbb1e4176eb52b0460342da272e0ec portage-2.1.2_rc4-r7.patch.bz2 29675
-RMD160 c2301154006d157b2a179f2f7d189e8d7b28cf3a portage-2.1.2_rc4-r7.patch.bz2 29675
-SHA256 5cb1f497e958fe59c46e61bdc86c6071a39e1e430c7b6c812e9d62548d39ad97 portage-2.1.2_rc4-r7.patch.bz2 29675
-MD5 efe9c50862533049db266ac46c903f82 portage-2.1.2_rc4.tar.bz2 342408
-RMD160 a5ff27e1db02929940aa90108cb8d9219c7f1a48 portage-2.1.2_rc4.tar.bz2 342408
-SHA256 15d33e3845850b7e6866cf1973256ad98f018e4cb097a1146161c58e7c7a601d portage-2.1.2_rc4.tar.bz2 342408
-MD5 624d18249325e364c13dc7ef7647f986 portage-man-pl-2.1.2_rc1.tar.bz2 53030
-RMD160 9ed9037256f3eba59600028f2d8f78792a33383a portage-man-pl-2.1.2_rc1.tar.bz2 53030
-SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a portage-man-pl-2.1.2_rc1.tar.bz2 53030

diff --git a/sys-apps/portage/portage-2.1.2_rc4-r7.ebuild b/sys-apps/portage/portage-2.1.2_rc4-r7.ebuild
deleted file mode 100644 (file)
index 40d6b3b..0000000
--- a/sys-apps/portage/portage-2.1.2_rc4-r7.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2_rc4-r7.ebuild,v 1.1 2007/01/07 20:11:48 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-PROVIDE="virtual/portage"
-SLOT="0"
-# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
-IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
-IUSE_USERLAND="userland_Darwin userland_GNU"
-IUSE="build doc epydoc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-       !build? ( >=sys-apps/sed-4.0.5 )
-       epydoc? ( >=dev-python/epydoc-2.0 )"
-RDEPEND=">=dev-lang/python-2.3
-       !build? ( >=sys-apps/sed-4.0.5
-               dev-python/python-fchksum
-               !userland_Darwin? ( >=app-shells/bash-3.0 ) )
-       elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
-       elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
-       !userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
-       selinux? ( >=dev-python/python-selinux-2.16 )
-       doc? ( app-portage/portage-manpages )
-       >=dev-python/pycrypto-2.0.1-r5"
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2_rc1"
-PATCHVER_PL=""
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-       ${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
-       linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-       ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
-
-PATCHVER=""
-[ "${PR}" != "r0" ] && PATCHVER="-${PR}"
-if [ -n "${PATCHVER}" ]; then
-       SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
-       ${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-if [ -n "${PATCHVER_PL}" ]; then
-       SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2
-       ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-portage_docs() {
-       elog ""
-       elog "For help with using portage please consult the Gentoo Handbook"
-       elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-       elog ""
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       if [ -n "${PATCHVER}" ]; then
-               cd "${S}"
-               epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-       fi
-       if [ "${PR}" != "r0" ]; then
-               elog "Setting portage.VERSION to ${PVR} ..."
-               sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-                       die "Failed to patch portage.VERSION"
-               eend 0
-       fi
-       if [ -n "${PATCHVER_PL}" ]; then
-               use linguas_pl && \
-                       epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-       fi
-}
-
-src_compile() {
-       append-lfs-flags
-
-       cd "${S}"/src
-       $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-               die "Failed to build tbz2tool"
-
-       if use elibc_FreeBSD; then
-               cd "${S}"/src/bsd-flags
-               chmod +x setup.py
-               ./setup.py build || die "Failed to install bsd-chflags module"
-       fi
-
-       if use epydoc; then
-               mkdir "${WORKDIR}"/api
-               local my_modules
-               my_modules="$(find "${S}/pym" -name "*.py" \
-                       | sed -e 's:.*__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-                        -e 's:/:.:g')" || die "error listing modules"
-               PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \
-                       -qqqqq --ignore-param-mismatch ${my_modules} || die "epydoc failed"
-       fi
-}
-
-src_test() {
-       local test_runner="./tests/runTests"
-       chmod +x ${test_runner}
-       PYTHONPATH="${S}:${S}/pym:${PYTHONPATH}" ${test_runner} || \
-               die "test(s) failed"
-}
-
-src_install() {
-       local portage_base="/usr/lib/portage"
-       cd "${S}"/cnf
-       insinto /etc
-       doins etc-update.conf dispatch-conf.conf make.globals
-       if [ -f "make.conf.${ARCH}".diff ]; then
-               patch make.conf "make.conf.${ARCH}".diff || \
-                       die "Failed to patch make.conf.example"
-               newins make.conf 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 ""
-               newins make.conf make.conf.example
-       fi
-
-       if use elibc_FreeBSD; then
-               cd "${S}"/src/bsd-flags
-               ./setup.py install --root "${D}" || \
-                       die "Failed to install bsd-chflags module"
-       fi
-
-       dodir ${portage_base}/bin
-       exeinto ${portage_base}/bin
-       # BSD and OSX need a sed wrapper so that find/xargs work properly
-       if use userland_GNU; then
-               rm "${S}"/bin/sed || die "Failed to remove sed wrapper"
-       fi
-       cd "${S}"/bin
-       doexe *
-       doexe "${S}"/src/tbz2tool
-       dosym newins ${portage_base}/bin/donewins
-
-       for mydir in pym pym/cache pym/elog_modules; do
-               dodir ${portage_base}/${mydir}
-               insinto ${portage_base}/${mydir}
-               cd "${S}"/${mydir}
-               doins *.py
-       done
-
-       doman "${S}"/man/*.[0-9]
-       if use linguas_pl; then
-               doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
-               doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
-       fi
-       dodoc "${S}"/ChangeLog
-       dodoc "${S}"/NEWS
-       dodoc "${S}"/RELEASE-NOTES
-       use epydoc && dohtml -r "${WORKDIR}"/api
-
-       dodir /usr/bin
-       for x in ebuild emerge portageq repoman tbz2tool xpak; do
-               dosym ../lib/portage/bin/${x} /usr/bin/${x}
-       done
-
-       dodir /usr/sbin
-       local my_syms="archive-conf
-               dispatch-conf
-               emaint
-               emerge-webrsync
-               env-update
-               etc-update
-               fixpackages
-               quickpkg
-               regenworld"
-       local x
-       for x in ${my_syms}; do
-               dosym ../lib/portage/bin/${x} /usr/sbin/${x}
-       done
-
-       dodir /etc/portage
-       keepdir /etc/portage
-
-       doenvd "${FILESDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-       local portage_base="/usr/lib/portage"
-       if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-               rm -rf "${IMAGE}"/${portage_base}/pym/*
-               mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-               rm -rf "${IMAGE}"/${portage_base}/bin/*
-               mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
-       else
-               for mydir in bin pym pym/cache pym/elog_modules; do
-                       rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
-                       rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
-               done
-       fi
-}
-
-pkg_postinst() {
-       local x
-
-       if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
-          [ -f "${ROOT}"/var/cache/edb/world ] &&
-          [ ! -h "${ROOT}"/var/cache/edb/world ]; then
-               mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
-               ln -s ../../lib/portage/world /var/cache/edb/world
-       fi
-
-       for x in "${ROOT}"/etc/._cfg????_make.globals; do
-               # Overwrite the globals file automatically.
-               [ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
-       done
-
-       ewarn "In portage-2.1.2, installation actions do not necessarily pull in build time"
-       ewarn "dependencies that are not strictly required.  This behavior is adjustable"
-       ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
-       ewarn "For more information regarding this change, please refer to bug #148870."
-       echo
-       elog "See NEWS and RELEASE-NOTES for further changes."
-       echo
-       portage_docs
-}