2.1.1_pre4-r4 revbump. This fixes bugs #128598, #140163, #140552, #141185, and ...

Package-Manager: portage-4178-svn

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index a3ea21975781c067048e9f4b2f2a2b8b78f46f15..29831afa3950188c5e1a34780b6dd041427578a4 100644 (file)
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.221 2006/08/05 10:03:18 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.222 2006/08/06 11:09:18 zmedico Exp $
+
+*portage-2.1.1_pre4-r4 (06 Aug 2006)
+
+  06 Aug 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre4-r4.ebuild:
+  2.1.1_pre4-r4 revbump. This fixes bugs #128598, #140163, #140552, #141185,
+  and #142909.
 
   05 Aug 2006; <nixnut@gentoo.org> portage-2.1-r2.ebuild:
   Stable on ppc. Bug #142283

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0acd5666b72f3edf31297f940b1cfc3b1110debb..1c16d2eb15dcde5490a80eb576581648aa6f9512 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -19,6 +19,7 @@ DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2d
 DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
 DIST portage-2.1.1_pre4-r2.patch.bz2 5153 RMD160 a92e3c58b6ec47b5aa3c27dadddc2179bb2721ae SHA1 6d2714e39febd7dc514a550d925b178aa3890f84 SHA256 0c8ec2f12eb4262e3ee4eb3abd9f511b28631949b52af6fca02b3f9a4178ca46
 DIST portage-2.1.1_pre4-r3.patch.bz2 8360 RMD160 a1603f5dd4eacbf181759babc7571a3367b72077 SHA1 cd45d87b505f9968861d1c37ddb5fd22e2d1bcaf SHA256 655b49e98235c5f32e6200c4cf62991d57696a8d4729408ff9d539c4cba24e89
+DIST portage-2.1.1_pre4-r4.patch.bz2 11185 RMD160 84a7f8e7237d1a3b19701ccb530b2ab4725b66e5 SHA1 823da908e9bae8c41bd7d0874179da84c6121825 SHA256 1616a27f1e321b74526954519803e6ae8c09aa29c82202080c989ec72fd34fb4
 DIST portage-2.1.1_pre4.tar.bz2 291237 RMD160 b679a01f045c886ab6d4c1929a1c6231f02add75 SHA1 5bd5812619b8db7faf61077858ead14c72794ba7 SHA256 5027efaed47dba5637fd495aa1b23b2deef4654fba06719d306e4ecc0cb1a3a5
 DIST portage-2.1.tar.bz2 277243 RMD160 e8290e18f0de5935cc263d76e7bce15da5c899d2 SHA1 459f59cc332e6b06d439af2cc18de57969f208d1 SHA256 29560a50df1de053c943582b277beb600c364edfe177d42affc74e98db412ef0
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
@@ -48,10 +49,14 @@ EBUILD portage-2.1.1_pre4-r3.ebuild 5740 RMD160 7b8b1fa4d1dd08a9a31edc2ecbb280db
 MD5 4b5c5fb90953c28a1c2169c3ae24a218 portage-2.1.1_pre4-r3.ebuild 5740
 RMD160 7b8b1fa4d1dd08a9a31edc2ecbb280dbc8948936 portage-2.1.1_pre4-r3.ebuild 5740
 SHA256 863713f10dec0b3b1ebb7a192ce701da2c1650086f975880644dc4d890e859cf portage-2.1.1_pre4-r3.ebuild 5740
-MISC ChangeLog 20127 RMD160 878b8555eee42c1bf0eab970622c100d389fd705 SHA1 0abe28da9204ebd739908903596a21c566c15d97 SHA256 311b0f8797146a3dc199ff19184f6aa6144e7d6137e047fcc22f516ab1ea4605
-MD5 8f55f351921428a1ceafd63b357d90fc ChangeLog 20127
-RMD160 878b8555eee42c1bf0eab970622c100d389fd705 ChangeLog 20127
-SHA256 311b0f8797146a3dc199ff19184f6aa6144e7d6137e047fcc22f516ab1ea4605 ChangeLog 20127
+EBUILD portage-2.1.1_pre4-r4.ebuild 5740 RMD160 41e791635549703011728a5cde509a3ee1277033 SHA1 30c83ceebb7af8c8dc8984d3a45cac1f41e15853 SHA256 a3d1bb3d6c77d4af1c5587fe027f0f0b47c8c0b8265a52a3699d77c0b3462fdf
+MD5 e6b7076fa8488ee442ce8d81d4c20b8b portage-2.1.1_pre4-r4.ebuild 5740
+RMD160 41e791635549703011728a5cde509a3ee1277033 portage-2.1.1_pre4-r4.ebuild 5740
+SHA256 a3d1bb3d6c77d4af1c5587fe027f0f0b47c8c0b8265a52a3699d77c0b3462fdf portage-2.1.1_pre4-r4.ebuild 5740
+MISC ChangeLog 20337 RMD160 dc139753b61e04cb08f7b934d9cfe36029f33ff7 SHA1 e8fd260d6516c4c4810c84e5f60a9b3253a80e67 SHA256 c0fc9619c8ab50c852e8e27134fb16802c79328303298d6501eecc7737f21de9
+MD5 8dd535059acd46468cdaa54743cdc2e6 ChangeLog 20337
+RMD160 dc139753b61e04cb08f7b934d9cfe36029f33ff7 ChangeLog 20337
+SHA256 c0fc9619c8ab50c852e8e27134fb16802c79328303298d6501eecc7737f21de9 ChangeLog 20337
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -74,10 +79,13 @@ SHA256 ce311b2c3a3d274fe9ca12e3a0ddedb855af15d02d9ab82330a6409f6dc304b6 files/di
 MD5 e21519d32a5f09638334a951e8dd0558 files/digest-portage-2.1.1_pre4-r3 1051
 RMD160 2b48d7e739b241a8cfcdb2d4ed5e5463a4f4333e files/digest-portage-2.1.1_pre4-r3 1051
 SHA256 d4efba73936baf5055469118b927b550477e8e9cb0e597a73bd79d0ebf84a461 files/digest-portage-2.1.1_pre4-r3 1051
+MD5 07aefd60fc525bcda567eae9143e2ebe files/digest-portage-2.1.1_pre4-r4 1054
+RMD160 82778e6c93437d7a3e8bb37ddbee33b7c9947a77 files/digest-portage-2.1.1_pre4-r4 1054
+SHA256 86321e7d1a397b9af3503fff4330362d084565c480b012b8bf820a18bf2a9b8c files/digest-portage-2.1.1_pre4-r4 1054
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE1GzlwLwTda5NScMRAg9wAJ9ffxEVZ8hfqd7Ylp8hA6Sr3Qu2DQCggXed
-UHloIhCSttW+O5BI4+J1Nfk=
-=B3BB
+iD8DBQFE1c2w/ejvha5XGaMRAsSDAJ9xv+X32vmkUmcfvFHh1BL4jGfc/gCfdudb
+2X5MiYo+MKxIsXpIZs5QVFk=
+=ezoA
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre4-r4 b/sys-apps/portage/files/digest-portage-2.1.1_pre4-r4
new file mode 100644 (file)
index 0000000..c0f2cb5
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.1_pre4-r4
@@ -0,0 +1,12 @@
+MD5 8e3d9971856d2c613e42181b28a1c0a0 portage-2.1.1_pre4-r4.patch.bz2 11185
+RMD160 84a7f8e7237d1a3b19701ccb530b2ab4725b66e5 portage-2.1.1_pre4-r4.patch.bz2 11185
+SHA256 1616a27f1e321b74526954519803e6ae8c09aa29c82202080c989ec72fd34fb4 portage-2.1.1_pre4-r4.patch.bz2 11185
+MD5 9b9af8d7728ed2ab38361875b744cbcd portage-2.1.1_pre4.tar.bz2 291237
+RMD160 b679a01f045c886ab6d4c1929a1c6231f02add75 portage-2.1.1_pre4.tar.bz2 291237
+SHA256 5027efaed47dba5637fd495aa1b23b2deef4654fba06719d306e4ecc0cb1a3a5 portage-2.1.1_pre4.tar.bz2 291237
+MD5 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076
+RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076
+SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076
+MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425
+RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425
+SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425

diff --git a/sys-apps/portage/portage-2.1.1_pre4-r4.ebuild b/sys-apps/portage/portage-2.1.1_pre4-r4.ebuild
new file mode 100644 (file)
index 0000000..c97afc0
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.1_pre4-r4.ebuild
@@ -0,0 +1,197 @@
+# 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.1_pre4-r4.ebuild,v 1.1 2006/08/06 11:09:18 zmedico Exp $
+
+inherit toolchain-funcs eutils
+
+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 ~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 selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
+DEPEND=">=dev-lang/python-2.3
+       !build? ( >=sys-apps/sed-4.0.5 )"
+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 )
+       elibc_uclibc? ( sys-apps/sandbox )
+       !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"
+PATCHVER_PL="-r1"
+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}"
+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() {
+       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
+}
+
+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
+
+       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 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
+
+       portage_docs
+}