2.1.2_rc3-r4 revbump just to fix bug #157897. This patch fixes a KeyError exception...
authorZac Medico <zmedico@gentoo.org>
Tue, 12 Dec 2006 12:22:33 +0000 (12:22 +0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 12 Dec 2006 12:22:33 +0000 (12:22 +0000)
Package-Manager: portage-2.1.2_rc3-r4

sys-apps/portage/Manifest
sys-apps/portage/files/digest-portage-2.1.2_rc3-r3 [deleted file]
sys-apps/portage/portage-2.1.2_rc3-r3.ebuild [deleted file]

index ec3ffbb7a505a03e7ecb3b275d0d5f468b0b50c5..c65129c0417bd7e4488a08d829f838bfc9d25377 100644 (file)
@@ -13,6 +13,10 @@ AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8f
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
+AUX bug_157897.patch 420 RMD160 3c4c9d16530f12b6850459af8474f7de0328e553 SHA1 603e22dbb9214d90efc1dfe4edb1988fc5bf342e SHA256 0f1268c659bda986102986777f33d47d541a04117714cd239f52ab4ae3955885
+MD5 594126ee7446285851943376c1fe26b6 files/bug_157897.patch 420
+RMD160 3c4c9d16530f12b6850459af8474f7de0328e553 files/bug_157897.patch 420
+SHA256 0f1268c659bda986102986777f33d47d541a04117714cd239f52ab4ae3955885 files/bug_157897.patch 420
 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c
 DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
 DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1
@@ -39,18 +43,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_rc3-r3.ebuild 7863 RMD160 82d96be50d6a7e20b3197ae3eba9cb64b5e3a4fb SHA1 d313797d0781ea40dac5f285b67a741983a05b33 SHA256 f3449c1ad4d20fd262fa1f7bf72db3d9028f05684c9103195a83a5e7ea257120
-MD5 427e1077d289b8d9fea0f0fd281a73c7 portage-2.1.2_rc3-r3.ebuild 7863
-RMD160 82d96be50d6a7e20b3197ae3eba9cb64b5e3a4fb portage-2.1.2_rc3-r3.ebuild 7863
-SHA256 f3449c1ad4d20fd262fa1f7bf72db3d9028f05684c9103195a83a5e7ea257120 portage-2.1.2_rc3-r3.ebuild 7863
+EBUILD portage-2.1.2_rc3-r4.ebuild 7907 RMD160 5865f78a20edd9ac154283a0a6420344bfe1bb93 SHA1 f1b3978a3aa05bfeb64bdf7923b4dbabf2ae78d4 SHA256 e2331ac62f4fb462b80b732a974407a9e8ff196d38908d228ccffa522bc5cfe7
+MD5 35fa595b5581c54702176cc6e2e3f8fa portage-2.1.2_rc3-r4.ebuild 7907
+RMD160 5865f78a20edd9ac154283a0a6420344bfe1bb93 portage-2.1.2_rc3-r4.ebuild 7907
+SHA256 e2331ac62f4fb462b80b732a974407a9e8ff196d38908d228ccffa522bc5cfe7 portage-2.1.2_rc3-r4.ebuild 7907
 EBUILD portage-2.1.2_rc3.ebuild 7860 RMD160 23c146fe4b1529720c20bf9839c82ca11028cb66 SHA1 25f54ab24bf11d88e459db105f94601c3fa72947 SHA256 facfeb1f297993a51c4cfe36c52fcec706d409528a9bba2a62990456c06feb55
 MD5 3daf64c4d73c3bddbafe517fe7ebcb52 portage-2.1.2_rc3.ebuild 7860
 RMD160 23c146fe4b1529720c20bf9839c82ca11028cb66 portage-2.1.2_rc3.ebuild 7860
 SHA256 facfeb1f297993a51c4cfe36c52fcec706d409528a9bba2a62990456c06feb55 portage-2.1.2_rc3.ebuild 7860
-MISC ChangeLog 21156 RMD160 8efe5f2e268ce58d81b10dd9d5117842236908bb SHA1 8b7d6b9f5d982313eecd3a2d756a1ed8b632b0f7 SHA256 33eda233dd351d4aa6d8a4a9ac51b24a3937690c13079ea29e3c9516d3de1565
-MD5 6be2612f05b1f2536cd7e651b02a260b ChangeLog 21156
-RMD160 8efe5f2e268ce58d81b10dd9d5117842236908bb ChangeLog 21156
-SHA256 33eda233dd351d4aa6d8a4a9ac51b24a3937690c13079ea29e3c9516d3de1565 ChangeLog 21156
+MISC ChangeLog 21467 RMD160 f9172aafaa78729d03dc77d263562f3116324f50 SHA1 22879156200407a8f28b2da7464ba4c70a30499b SHA256 39f7aa7a00e81629267b7fbd6089330ed09f75b87f262e33fad6e60e1209d9cf
+MD5 45c4c32b972e0d42a7d601062a9c9fde ChangeLog 21467
+RMD160 f9172aafaa78729d03dc77d263562f3116324f50 ChangeLog 21467
+SHA256 39f7aa7a00e81629267b7fbd6089330ed09f75b87f262e33fad6e60e1209d9cf ChangeLog 21467
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -70,13 +74,13 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di
 MD5 751568bb8edb2468806a596f06b4cfcb files/digest-portage-2.1.2_rc3 530
 RMD160 6409faa66b3cfce612474516be061e4b4e5514d7 files/digest-portage-2.1.2_rc3 530
 SHA256 0b6331d7a25052d2dd0be1018dd89f82f33bc4ae5c18ad89a51aab48b8d1d2c5 files/digest-portage-2.1.2_rc3 530
-MD5 35c1c428b0a6c704c3796605ac2ae646 files/digest-portage-2.1.2_rc3-r3 798
-RMD160 54978f9a0b089762f6a8ea211e6e68db75ceea12 files/digest-portage-2.1.2_rc3-r3 798
-SHA256 92cdb69bb36139720fab6cef0c8774d23e4754282bfd86f6368b2e452e409a76 files/digest-portage-2.1.2_rc3-r3 798
+MD5 35c1c428b0a6c704c3796605ac2ae646 files/digest-portage-2.1.2_rc3-r4 798
+RMD160 54978f9a0b089762f6a8ea211e6e68db75ceea12 files/digest-portage-2.1.2_rc3-r4 798
+SHA256 92cdb69bb36139720fab6cef0c8774d23e4754282bfd86f6368b2e452e409a76 files/digest-portage-2.1.2_rc3-r4 798
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfj0O/ejvha5XGaMRAqcBAJ9aeYSBCM2jzB87qgW+0DFM2kEqPACg5uGv
-xw6zhEfIKaOLQKC/eoQQl8U=
-=amQs
+iD8DBQFFfp62/ejvha5XGaMRAsDhAJ9c9fUAD3jSZSGXm1rRgUA81XWJyQCg20UJ
+J+HKuVNdW/axJBdYhvzNORs=
+=ca6n
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc3-r3 b/sys-apps/portage/files/digest-portage-2.1.2_rc3-r3
deleted file mode 100644 (file)
index 096cddc..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 13cffdb3558bdf90ba80a7b5eb59a2c7 portage-2.1.2_rc3-r3.patch.bz2 11231
-RMD160 6cbd9b86e7929c47d95bc372b473cba4680270e3 portage-2.1.2_rc3-r3.patch.bz2 11231
-SHA256 efa4659b013e0ae0a68e1091907372d9f8f7342afb0dea799f958dde63cb6ed0 portage-2.1.2_rc3-r3.patch.bz2 11231
-MD5 2fb183cd39a87178d3772a938dd06223 portage-2.1.2_rc3.tar.bz2 334999
-RMD160 98af2da9c8e698fe511d53c604c4c2b7703812cd portage-2.1.2_rc3.tar.bz2 334999
-SHA256 547d4d3be34eeea555ea7b1b87bc0f51aef9d4099767d232a79086acdeacf862 portage-2.1.2_rc3.tar.bz2 334999
-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_rc3-r3.ebuild b/sys-apps/portage/portage-2.1.2_rc3-r3.ebuild
deleted file mode 100644 (file)
index 8783e99..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2006 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_rc3-r3.ebuild,v 1.1 2006/12/12 05:24:37 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
-       ewarn "In portage-2.1.2_rc2, the implicit RDEPEND behavior has been reverted back to"
-       ewarn "the way it was in <portage-2.0.52. This change restricts implicit RDEPEND to"
-       ewarn "the ebuild level, making it independent of whatever RDEPEND may or may not be"
-       ewarn "defined in the inherited eclasses.  As a result, some ebuilds will get"
-       ewarn "implicit RDEPEND that they did not get previously.  Also, some ebuilds will"
-       ewarn "loose some implicit RDEPEND that they previously got from eclasses.  Users"
-       ewarn "that sync with the rsync mirrors will have their metadata cache automatically"
-       ewarn "updated on the next sync (or the next time that they run"
-       ewarn "\`emerge --metadata\`).  Users of the gentoo-x86 CVS repository, in order to"
-       ewarn "make the change immediately effective, will have to manually remove the"
-       ewarn "entire contents of /var/cache/edb/dep/ and then run \`emerge --regen\`."
-       ewarn "If necessary, please refer to bug #153591 for more information."
-       echo
-       elog "See NEWS and RELEASE-NOTES for further changes."
-       echo
-       portage_docs
-}