2.1.1_pre2-r7 revbump. This fixes bugs #95741, #120653, and #135834.

Package-Manager: portage-2.1.1_pre2-r7

4 files changed, 238 insertions, 5 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 81db884bab53..faeee6d91a2c 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.203 2006/07/08 00:53:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.204 2006/07/11 19:21:00 zmedico Exp $
+
+*portage-2.1.1_pre2-r7 (11 Jul 2006)
+
+  11 Jul 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.1_pre2-r7.ebuild:
+  2.1.1_pre2-r7 revbump.  This fixes bugs #95741, #120653, and #135834.
 
 *portage-2.1.1_pre2-r6 (08 Jul 2006)
 
diff --git a/sys-apps/portage/files/digest-portage-2.1.1_pre2-r7 b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r7
new file mode 100644
index 000000000000..f0c5f5a8f4ff
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.1_pre2-r7
@@ -0,0 +1,12 @@
+MD5 eef91eb70d4740d34cc2c1ad232003fa portage-2.1.1_pre2-r7.patch.bz2 20013
+RMD160 098bdee8781a159502901b8e59b7b727e28c18ac portage-2.1.1_pre2-r7.patch.bz2 20013
+SHA256 75c65676fbf10ffc653498d475b242448c687fce6504a9739611402588bb53d7 portage-2.1.1_pre2-r7.patch.bz2 20013
+MD5 2f933f22a47e42e284639097e6abaa4a portage-2.1.1_pre2.tar.bz2 283920
+RMD160 5827bafecf45e4e82f8ecfc5e79b21e323cf130a portage-2.1.1_pre2.tar.bz2 283920
+SHA256 e8168565cf496ac09e0dec77c2a997476218f1acdb418a301253569c78b429f4 portage-2.1.1_pre2.tar.bz2 283920
+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_pre2-r7.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r7.ebuild
new file mode 100644
index 000000000000..ff9275701a7c
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.1_pre2-r7.ebuild
@@ -0,0 +1,198 @@
+# 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_pre2-r7.ebuild,v 1.1 2006/07/11 19:21:00 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_GNU? ( sys-apps/debianutils )
+		!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
+}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index f4b324d58abc..5f8371ff4a31 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 09sandbox 37 RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 SHA1 d1d52cd3076c632f8c7d88c8bcd45f045922bd4e SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe
 MD5 1e4d8cd352642245a1af233d6b9b4e2f files/09sandbox 37
 RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 files/09sandbox 37
@@ -9,6 +12,7 @@ DIST sandbox-1.2.18.1.tar.bz2 236755 RMD160 62e1e33d7f64db14d9c34d103d50256934a6
 DIST sandbox-1.2.18.tar.bz2 236474 RMD160 0a622de5801e775057e24eadd2894f5352a9aa09 SHA1 a6eed1e58ad627706f35f6a30dd0311f78029455 SHA256 3e070150d08f054ae958a67fc1382e2ed0465a5f5ded61b8e34874d0297df8e8
 DIST sandbox-1.2.20alpha1-patches-1.0.tar.bz2 6565 RMD160 1b100080af0dcf49ff4aaaf7aee815b5fa36bfe6 SHA1 85011affdd66afe536a2478e18d876dc97360eff SHA256 477cd01994ada2f335af06b1f976d847e8b6d329e26d803b7f48d7e63344f13b
 DIST sandbox-1.2.20alpha1.tar.bz2 265714 RMD160 d645c64a8bb441a8660a79255574fa3ed16b263c SHA1 dd7e06f977c3982f3362da98fd05112042107139 SHA256 28f91f12c5a648a72d67e93d84a97666f313e4dd1b3159f5f5e54087718f9169
+DIST sandbox-1.2.20alpha2.tar.bz2 278323 RMD160 ebb3ca0963878810f3ac86633f848576fddb225e SHA1 3cd2262e9de3ad642b6e021eab26b50d6202ef41 SHA256 19f7148e259cf5212b8e587789b61c33cd4053c1947219a22749e7fb750b21d3
 EBUILD sandbox-1.2.12.ebuild 3149 RMD160 7499e5ab49ef422051d0945b345c3da0a023bb89 SHA1 7e2352f8da33ce8d6ef096e0d816001cd9b809c1 SHA256 a809812f6d2564df6737940f800dfcb3ae86c134479f175680d6d194f5daf5e6
 MD5 2a9cb52b6d5f510386df939b2e093678 sandbox-1.2.12.ebuild 3149
 RMD160 7499e5ab49ef422051d0945b345c3da0a023bb89 sandbox-1.2.12.ebuild 3149
@@ -33,10 +37,14 @@ EBUILD sandbox-1.2.20_alpha1-r2.ebuild 3219 RMD160 baae871e0333f8aca8dfb2261897e
 MD5 1dac06f7764a929be328a7f8f73d6c76 sandbox-1.2.20_alpha1-r2.ebuild 3219
 RMD160 baae871e0333f8aca8dfb2261897e2dc81508226 sandbox-1.2.20_alpha1-r2.ebuild 3219
 SHA256 59cdf784f68c9eb18a2b3b48b1bf22493cc9b6489825cc88fd342a7423ffedca sandbox-1.2.20_alpha1-r2.ebuild 3219
-MISC ChangeLog 9199 RMD160 c41f4ffc4d33cfdecc9d9dd7e70c2f5a432fbb44 SHA1 3579c539699557dfc2fbd1bb80a59ed54d275808 SHA256 d66ef0fc4b921d33c478911ebf880a326d3736d9b2d1c6a05c821cba0281d808
-MD5 0134eb6e79b23cb5020adb3229dee419 ChangeLog 9199
-RMD160 c41f4ffc4d33cfdecc9d9dd7e70c2f5a432fbb44 ChangeLog 9199
-SHA256 d66ef0fc4b921d33c478911ebf880a326d3736d9b2d1c6a05c821cba0281d808 ChangeLog 9199
+EBUILD sandbox-1.2.20_alpha2.ebuild 3299 RMD160 c3e43e02357d5d3c4dcac3c2f1bb6e283da3fd6d SHA1 ef4e83ec7782a42342c3f268b545bf6607c9f764 SHA256 d152a7f105b31e31568080a1393473d54d348be9a9aebcff001f39c9c18fda54
+MD5 9abb54646fdfdc549b82316fb35f2b46 sandbox-1.2.20_alpha2.ebuild 3299
+RMD160 c3e43e02357d5d3c4dcac3c2f1bb6e283da3fd6d sandbox-1.2.20_alpha2.ebuild 3299
+SHA256 d152a7f105b31e31568080a1393473d54d348be9a9aebcff001f39c9c18fda54 sandbox-1.2.20_alpha2.ebuild 3299
+MISC ChangeLog 9347 RMD160 beed9a306eb5cc0348f2ddd60a812254bc58cf8c SHA1 0d27ad790ded1a48be6ea0d2c349d8c8cc245537 SHA256 848bba883b3c2605755775248166dc4b2573c74ea5469fb5e2daac73b527bac5
+MD5 dc4a2aeb6d4710c92b5811c72779805f ChangeLog 9347
+RMD160 beed9a306eb5cc0348f2ddd60a812254bc58cf8c ChangeLog 9347
+SHA256 848bba883b3c2605755775248166dc4b2573c74ea5469fb5e2daac73b527bac5 ChangeLog 9347
 MISC metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 SHA1 d81a50fa4047e6c0ecf1ab16e4fa6214895c5e9c SHA256 575b378bf8db5526847e6839a3351ec72769d75ed1c5b392559d57f6e6b4294f
 MD5 4a6b419321a7e1ee609c8af41905ff1b metadata.xml 337
 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 metadata.xml 337
@@ -59,3 +67,13 @@ SHA256 0bab4b68b71b653265a17720073d927350749a95a482b8ae18a441efb8ee554d files/di
 MD5 7cc4a98b40559e1cae429de1f3bf221d files/digest-sandbox-1.2.20_alpha1-r2 560
 RMD160 800ef0043b9fe1e638a1c79d8ecf3db1df5d5185 files/digest-sandbox-1.2.20_alpha1-r2 560
 SHA256 7d453d052ed64233f6cdddd915e70c15ef022b13e4b42eaefe111fa1a76833ae files/digest-sandbox-1.2.20_alpha1-r2 560
+MD5 029fb3464c9a7f555b36bf111f123c12 files/digest-sandbox-1.2.20_alpha2 265
+RMD160 0805fbaf35432d9426e0ab9399fb1e5afbfbff6b files/digest-sandbox-1.2.20_alpha2 265
+SHA256 0bb111ea38da430d257ed23ea847c863228fb9096b7a3bdbabfd2bc2662978b5 files/digest-sandbox-1.2.20_alpha2 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEs/tD1ZcsMnZjRyIRAh5UAKCKf5Gs6PWzQS1/b5nPe8pGp3aBNgCdFiyB
+qeCr/lQXgHKNqfTUNKbydrE=
+=Onwd
+-----END PGP SIGNATURE-----