2.1.1_rc1-r6 revbump for bugs #101240, #146412, and #146508.

Package-Manager: portage-4418-svn

4 files changed, 233 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 775cc7cfc71b..12ac9c80da8b 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
 # 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.236 2006/09/06 07:54:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.237 2006/09/06 21:17:19 zmedico Exp $
+
+*portage-2.1.1_rc1-r6 (06 Sep 2006)
+
+  06 Sep 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_rc1-r6.ebuild:
+  2.1.1_rc1-r6 revbump for bugs #101240, #146412, and #146508.
 
 *portage-2.1.1_rc1-r5 (06 Sep 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 50b9a37ceae3..1af0fd2116c8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -22,6 +22,7 @@ DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e355
 DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc
 DIST portage-2.1.1_rc1-r3.patch.bz2 4394 RMD160 3b0949cf71204141e04bc75483ff2bd29341b288 SHA1 9ae4f56ca905caef0a42d82a7a45d825714da3f1 SHA256 82c552476efd6f22245c4771f0f1b4468c9d29fb807ba10364e576daeee005f9
 DIST portage-2.1.1_rc1-r4.patch.bz2 5553 RMD160 49f92e226dd1e1c6179fa2d04f359bb4b7e00665 SHA1 b4bbb9192d873f79821ceb897cf00a774cdec67e SHA256 1dc0cab729ca61e4d5f994a1a848379a3e690b161b600320a8a586a51e7e58b2
+DIST portage-2.1.1_rc1-r6.patch.bz2 6614 RMD160 444f710ced5c4e0a4cdadd006b5d807675b7c2d5 SHA1 45b3da8e5d502ac26f31e28a3f6d9836255e87ae SHA256 8ce1189e8860456cc5c0debec1692c7c8e1c4f0051281b239cd9bb66d12e95af
 DIST portage-2.1.1_rc1.tar.bz2 295029 RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 SHA1 8a341d527b160a30e65ce97ea3455f835fa499c0 SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
@@ -46,10 +47,14 @@ EBUILD portage-2.1.1_rc1-r5.ebuild 5871 RMD160 35abcd67584aff476bafd876f77df317e
 MD5 bf7243cf7f91b9648459829f433b7fe5 portage-2.1.1_rc1-r5.ebuild 5871
 RMD160 35abcd67584aff476bafd876f77df317e7a67ef6 portage-2.1.1_rc1-r5.ebuild 5871
 SHA256 50bae73f3d99b26f669adff8795ceb4e83699d39d4d904c0e283c325db56a80f portage-2.1.1_rc1-r5.ebuild 5871
-MISC ChangeLog 12498 RMD160 bf1b86012855b419cbe82569d20735d5b55b6b0e SHA1 790f87648e12e385ee277dd9e7a16e156c149c4b SHA256 d7ab1ce5f8c5f68a243f12e4a3b6af6da4cb7bb8c809d932aba72157ee80b868
-MD5 298fc48350a27c1a1240588db92aa0be ChangeLog 12498
-RMD160 bf1b86012855b419cbe82569d20735d5b55b6b0e ChangeLog 12498
-SHA256 d7ab1ce5f8c5f68a243f12e4a3b6af6da4cb7bb8c809d932aba72157ee80b868 ChangeLog 12498
+EBUILD portage-2.1.1_rc1-r6.ebuild 5806 RMD160 469b3087c7462aad864889428552296a31f0da6b SHA1 e9aa0cd8e904e1aa24c910c442d5bb76e196a39c SHA256 3e65ad529e1ef4183786342dba0957b36699e06fe9361c6626bdb751ceb9d23d
+MD5 f9731bcfd9cc79dc2cab1fe1986eef55 portage-2.1.1_rc1-r6.ebuild 5806
+RMD160 469b3087c7462aad864889428552296a31f0da6b portage-2.1.1_rc1-r6.ebuild 5806
+SHA256 3e65ad529e1ef4183786342dba0957b36699e06fe9361c6626bdb751ceb9d23d portage-2.1.1_rc1-r6.ebuild 5806
+MISC ChangeLog 12676 RMD160 d5bf15f712de0a2aad820174da60e6a94f7883f9 SHA1 8ead3320732bed6812bb19600f4f0db9907b175d SHA256 028ed86149b702638c1a6bf544c66d64838df6d4f234cfb946e1858bdbf266ab
+MD5 74da60990a21581270ab48f983c6fdc5 ChangeLog 12676
+RMD160 d5bf15f712de0a2aad820174da60e6a94f7883f9 ChangeLog 12676
+SHA256 028ed86149b702638c1a6bf544c66d64838df6d4f234cfb946e1858bdbf266ab ChangeLog 12676
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -69,10 +74,13 @@ SHA256 1523c1efbf7766e2c7a492cb9bae4987e3ec6a0dac253a0c39dc132affa25d7c files/di
 MD5 5fd3e821757cb73cd86a944fbcb7394d files/digest-portage-2.1.1_rc1-r5 1045
 RMD160 095082c241ab7c08820c4e5c76121842eb605e24 files/digest-portage-2.1.1_rc1-r5 1045
 SHA256 9f1e652e4277abcc8c3279be46efccee4451ee351d1c494c7b9d74bfa7f1703e files/digest-portage-2.1.1_rc1-r5 1045
+MD5 bffa24236cd1af298ade3988a81220eb files/digest-portage-2.1.1_rc1-r6 1045
+RMD160 89d608a189433380b5250334f060ad1a0399a99b files/digest-portage-2.1.1_rc1-r6 1045
+SHA256 37c04363cd4c685df05362f3a15495d806634e6a3c3d5381b1ad5dfe2fb01e54 files/digest-portage-2.1.1_rc1-r6 1045
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/n65/ejvha5XGaMRAmLwAKCQXdrdLxlLIG9JbKmWSGFWhuD8FwCfWCzj
-Y4prkpirzoV1M/sdltEsCfg=
-=qSbZ
+iD8DBQFE/zrb/ejvha5XGaMRAhu9AJ9z9kOLEgCvn0MBbg8ZEm/zjNLjoQCgpQXO
+ar+NTAzakazf3/QCVvWubNw=
+=e0sX
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_rc1-r6 b/sys-apps/portage/files/digest-portage-2.1.1_rc1-r6
new file mode 100644
index 000000000000..beeb0a8cfd8c
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.1_rc1-r6
@@ -0,0 +1,12 @@
+MD5 1f593f7482c80f5285b14358989b0335 portage-2.1.1_rc1-r6.patch.bz2 6614
+RMD160 444f710ced5c4e0a4cdadd006b5d807675b7c2d5 portage-2.1.1_rc1-r6.patch.bz2 6614
+SHA256 8ce1189e8860456cc5c0debec1692c7c8e1c4f0051281b239cd9bb66d12e95af portage-2.1.1_rc1-r6.patch.bz2 6614
+MD5 ad76c9fb311fd603e7c3c75f7d5b09c0 portage-2.1.1_rc1.tar.bz2 295029
+RMD160 5c1f8b9bd56843b5248d0be33b702008f9284695 portage-2.1.1_rc1.tar.bz2 295029
+SHA256 d29a6adcb6684c965bfec91796aedbd7ab0cf2bb05794eb1acb79a5408cef95d portage-2.1.1_rc1.tar.bz2 295029
+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_rc1-r6.ebuild b/sys-apps/portage/portage-2.1.1_rc1-r6.ebuild
new file mode 100644
index 000000000000..644747c5d415
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.1_rc1-r6.ebuild
@@ -0,0 +1,200 @@
+# 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_rc1-r6.ebuild,v 1.1 2006/09/06 21:17:19 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 ~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}" != "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
+}
+
+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
+}