2.1.1_pre3-r1 revbump. This fixes bugs #37124 and #140694.

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 230 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 154d326c3701..1ef7dc6836c1 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.207 2006/07/15 16:51:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.208 2006/07/17 01:15:20 zmedico Exp $
+
+*portage-2.1.1_pre3-r1 (17 Jul 2006)
+
+  17 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre3-r1.ebuild:
+  2.1.1_pre3-r1 revbump.  This fixes bugs #37124 and #140694.
 
 *portage-2.1.1_pre3 (15 Jul 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 52d613084757..7fe346397b86 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -26,6 +26,7 @@ DIST portage-2.0.54.tar.bz2 234784 RMD160 26c724df242a7d0c44d7fd06067bfcdbc4e355
 DIST portage-2.1-r1.patch.bz2 12201 RMD160 ceff46c18d8e28f341cc0c1a0c41150733c2dc98 SHA1 0948e3de6cdd8869c9abbb7c8a3ad54e0aebb937 SHA256 78bdf92a43e8d34d090592bcd92779383dbaca9a9295418e4cc9b39f217fbf80
 DIST portage-2.1.1_pre2-r7.patch.bz2 20013 RMD160 098bdee8781a159502901b8e59b7b727e28c18ac SHA1 11a1eb1531981077221cce5645748418eee265c7 SHA256 75c65676fbf10ffc653498d475b242448c687fce6504a9739611402588bb53d7
 DIST portage-2.1.1_pre2.tar.bz2 283920 RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a SHA1 069cc6e1d1d317b1db0000f5b5d9be9557101001 SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4
+DIST portage-2.1.1_pre3-r1.patch.bz2 6443 RMD160 bc9e6e807b17e0c773040f0eb5a8c3753a52a40d SHA1 83fb84dfd890a95687fc27b0212bc03b6b9b6135 SHA256 ed1090437786c53d26f338e22ff32bfbc84bd04b1883fa03ce2afdd099f40dc2
 DIST portage-2.1.1_pre3.tar.bz2 287206 RMD160 f3224349459899e33b9f29e60c5a8c49f63807af SHA1 c661aa975e2b02f8f13ee32bfd19d49d798e4508 SHA256 baf1535f9d02201b7bbeba55953aeee588727d8e43dc10dabe7c91eaba772363
 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
@@ -47,14 +48,18 @@ EBUILD portage-2.1.1_pre2-r8.ebuild 5817 RMD160 93cd821fbb8aa9cf2ff6bf3b1d2e5f09
 MD5 260c64ffb733ebf848af91dff119ece3 portage-2.1.1_pre2-r8.ebuild 5817
 RMD160 93cd821fbb8aa9cf2ff6bf3b1d2e5f091cacf655 portage-2.1.1_pre2-r8.ebuild 5817
 SHA256 ecd7d002bd70461827fc8892d3c273f663d99c3aab7a96383013beb8c84d292f portage-2.1.1_pre2-r8.ebuild 5817
+EBUILD portage-2.1.1_pre3-r1.ebuild 5740 RMD160 fa182d1623ad3edb2c0278c31673e7078a26b541 SHA1 ac4d34673189d679207190862a12f1a6f6e21d20 SHA256 3c2534e6572c7298a61fe5e32e21676e5dc52287de92df39365424aeca12cad6
+MD5 bb7820a52013adca1fb4716e5f6b668d portage-2.1.1_pre3-r1.ebuild 5740
+RMD160 fa182d1623ad3edb2c0278c31673e7078a26b541 portage-2.1.1_pre3-r1.ebuild 5740
+SHA256 3c2534e6572c7298a61fe5e32e21676e5dc52287de92df39365424aeca12cad6 portage-2.1.1_pre3-r1.ebuild 5740
 EBUILD portage-2.1.1_pre3.ebuild 5731 RMD160 de3421f0bf1df7a4c4c2750034ecd806d2e62ee2 SHA1 f7f13962f063411726ca2e237a43781fa13ff8aa SHA256 5806c5bb45881e30607d9e20b056c17d8a7d8cafccfc3ba45c4d5bee1288fda3
 MD5 bb8327b2808053b56943e9f72b7590ce portage-2.1.1_pre3.ebuild 5731
 RMD160 de3421f0bf1df7a4c4c2750034ecd806d2e62ee2 portage-2.1.1_pre3.ebuild 5731
 SHA256 5806c5bb45881e30607d9e20b056c17d8a7d8cafccfc3ba45c4d5bee1288fda3 portage-2.1.1_pre3.ebuild 5731
-MISC ChangeLog 17599 RMD160 f4b21695b606ddfa7553beb94772e17678461cff SHA1 e5657db70f38f62264fce70669f529e86d30d07a SHA256 13b3bda51a319db7f9bb24b5772357b185c921bddf1005fcf3632b7fc6c614fe
-MD5 429b5afce5ab795ac252ec8deb11fc0f ChangeLog 17599
-RMD160 f4b21695b606ddfa7553beb94772e17678461cff ChangeLog 17599
-SHA256 13b3bda51a319db7f9bb24b5772357b185c921bddf1005fcf3632b7fc6c614fe ChangeLog 17599
+MISC ChangeLog 17778 RMD160 6b45f87e0d8cff874d3b618d7865be63bd336063 SHA1 6319d2408fb210f18388a5dbadfbd355b0591676 SHA256 b4e5ffad378afa982a167a618b348801dafbb33c75b38cd339959f6ff0e492c7
+MD5 0a790a665a0e2b9d1c18961587e0bf2b ChangeLog 17778
+RMD160 6b45f87e0d8cff874d3b618d7865be63bd336063 ChangeLog 17778
+SHA256 b4e5ffad378afa982a167a618b348801dafbb33c75b38cd339959f6ff0e492c7 ChangeLog 17778
 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 58f2f65b45aa2b1f51db361d0c9c174245917520852ee5dc9108b02d4e51f896 files/di
 MD5 644fb53f23e73624555845deca18ade9 files/digest-portage-2.1.1_pre3 783
 RMD160 f8e4085fd91653a58c04dd72b88035277e6ab2cc files/digest-portage-2.1.1_pre3 783
 SHA256 0a6cb66ee62d41bde4a8586da24006d854a4ac3fb3e69d3ff0183afe96baa66f files/digest-portage-2.1.1_pre3 783
+MD5 a2aed6debbc258ec0f5d2a18058a0478 files/digest-portage-2.1.1_pre3-r1 1051
+RMD160 524b26c4219a753e79aedce39d3b8a8fe08c19f6 files/digest-portage-2.1.1_pre3-r1 1051
+SHA256 811e4aa81ab2fc5f71b3f123288bdb84a53328f3b7c6b48342d559b523761f68 files/digest-portage-2.1.1_pre3-r1 1051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuRzo/ejvha5XGaMRAqrOAJwJlgTRF438lTQt/JwVHytd9Z0cNACg8sZN
-UAY4LO5zMZ0TijU5JFvodnE=
-=Z+6a
+iD8DBQFEuuSw/ejvha5XGaMRAhmgAKCuMItbZEB84uRoKbJZTBIQ2RxBegCgngC6
+iegX6Ds6+8xdKbCdoeA9YTk=
+=gPcS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre3-r1 b/sys-apps/portage/files/digest-portage-2.1.1_pre3-r1
new file mode 100644
index 000000000000..2109c174dafe
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.1_pre3-r1
@@ -0,0 +1,12 @@
+MD5 728bab227fe5dc635769f11b4598434a portage-2.1.1_pre3-r1.patch.bz2 6443
+RMD160 bc9e6e807b17e0c773040f0eb5a8c3753a52a40d portage-2.1.1_pre3-r1.patch.bz2 6443
+SHA256 ed1090437786c53d26f338e22ff32bfbc84bd04b1883fa03ce2afdd099f40dc2 portage-2.1.1_pre3-r1.patch.bz2 6443
+MD5 78baab083cf81f14f5929da16550584a portage-2.1.1_pre3.tar.bz2 287206
+RMD160 f3224349459899e33b9f29e60c5a8c49f63807af portage-2.1.1_pre3.tar.bz2 287206
+SHA256 baf1535f9d02201b7bbeba55953aeee588727d8e43dc10dabe7c91eaba772363 portage-2.1.1_pre3.tar.bz2 287206
+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_pre3-r1.ebuild b/sys-apps/portage/portage-2.1.1_pre3-r1.ebuild
new file mode 100644
index 000000000000..f223f3bebc7b
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.1_pre3-r1.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_pre3-r1.ebuild,v 1.1 2006/07/17 01:15:21 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
+}