portage-2.1_pre5 release

Package-Manager: portage-2763-svn

5 files changed, 242 insertions, 2 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index adbe3d136a7f..dbb1c39e0874 100644
--- 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.79 2006/02/19 22:32:16 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.80 2006/02/26 03:33:17 zmedico Exp $
+
+*portage-2.1_pre5 (25 Feb 2006)
+
+  25 Feb 2006; Zac Medico <zmedico@gentoo.org>
+  +portage-2.1_pre5.ebuild:
+  Bug fix release for 2.1.
 
   19 Feb 2006; Joshua Kinard <kumba@gentoo.org> portage-2.0.54.ebuild:
   Marked stable on mips.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index e32bfa113d43..30c2effd881e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,17 +1,60 @@
-MD5 8d80d7efa250303df04319f81e8e4fcd ChangeLog 5078
+MD5 f6312ff04cf008bb55fe505b3e6f13cf ChangeLog 5216
+RMD160 92f55bcf6475423cd92c3935f9d7995573c05209 ChangeLog 5216
+SHA256 369ca456288be9f3feb5423536d348927ce6f300f5a0557f759dbb67b2772aca ChangeLog 5216
 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34
+RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34
+SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 files/05portage.envd 34
 MD5 bb9cb80f927bcc2b9e0f512d8a200e18 files/2.0.51.22-fixes.patch 10579
+RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 files/2.0.51.22-fixes.patch 10579
+SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c files/2.0.51.22-fixes.patch 10579
 MD5 e3d8f54d06dce6fa8c4b9a9ff660f96e files/2.1_pre4-r1.patch 1581
+RMD160 6bb0f83e5c562b71ce63b2ab51af89144f28cce4 files/2.1_pre4-r1.patch 1581
+SHA256 057f3599ccda5f07091b3e9da51575fe56f3e9307e51224c68b9e63887ff99da files/2.1_pre4-r1.patch 1581
+MD5 3f6f964cc783d83e19d5243f954a5f72 files/2.1_pre5.patch 1125
+RMD160 16f8e79df5d16835ff00fe3d8f31fe7b472b2d30 files/2.1_pre5.patch 1125
+SHA256 73352f24339f1a64ceabbdd77939fbb6eede31bd0399cdbcd6bb8940cd9f01d6 files/2.1_pre5.patch 1125
 MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137
+RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137
+SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137
 MD5 159e3519c10187285ab4b0a536b2a1d3 files/digest-portage-2.0.51.22-r3 70
+RMD160 83622ce2dacdcd61f98cf30e2074f887dd704bf5 files/digest-portage-2.0.51.22-r3 70
+SHA256 b5dc4e877796440a39d3db5cd425e3ba3255184aff90fa69b3f484df433cd5ec files/digest-portage-2.0.51.22-r3 70
 MD5 ca24230fc57489944e69c7dd6aaa88b3 files/digest-portage-2.0.53 67
+RMD160 31981560e6fc52427f65c13e80068f2ac1b7a97a files/digest-portage-2.0.53 67
+SHA256 e5661b26e9c043f3794557ad15362848435ed610d187500185274c5a744c601d files/digest-portage-2.0.53 67
 MD5 4101f8f17ec33dc7b8c39e4d318cb79d files/digest-portage-2.0.54 67
+RMD160 41074091123631ce46f52648e7d2489f135a467c files/digest-portage-2.0.54 67
+SHA256 107cb0415db823c2126df69b267bdf88607daa7df697240aad28384b8a081d32 files/digest-portage-2.0.54 67
 MD5 2e597ebca5c4c3f101022a5a35d091c7 files/digest-portage-2.1_pre3-r1 253
+RMD160 c0cf87ab1669aea8b35951f9ded0a477377f0265 files/digest-portage-2.1_pre3-r1 253
+SHA256 31fbf92704c8c3836a781144c1fe6c1a5d7a81e14fa79973821df688baf3f63d files/digest-portage-2.1_pre3-r1 253
 MD5 ab666914bfcfa91049d1df6dee3980b1 files/digest-portage-2.1_pre4-r1 253
+RMD160 441595004e217e45c80c5bb793709b2414bcf875 files/digest-portage-2.1_pre4-r1 253
+SHA256 c5fe2a7d208a3e73056160d113ebe433bd4f039b1d0edf0261afe657a47bdb57 files/digest-portage-2.1_pre4-r1 253
+MD5 0ad32101e0f506d39355653da01063db files/digest-portage-2.1_pre5 253
+RMD160 0fda55221331fa51f8a16e2dc1dbe917d6029f08 files/digest-portage-2.1_pre5 253
+SHA256 d35accf261e03854d47f27e0b03e01bbad0768a0d0fcc8e1a7f0934af6e4b3a0 files/digest-portage-2.1_pre5 253
 MD5 9e669b11a86a57aa8d2a452531085bb6 files/xterm-titles.patch 1115
+RMD160 60cea5a3cfd37b6a3a15ced00a778defaca09212 files/xterm-titles.patch 1115
+SHA256 0e23efd78cff2d7702a4e3ddcf6b53cd7de417f03234397321281066ea8c026c files/xterm-titles.patch 1115
 MD5 e57748276505fab96a2ab4e64de45366 metadata.xml 220
+RMD160 ec986e8b7f4016018c27b127114f671a8a9304a8 metadata.xml 220
+SHA256 52eb00c9449f0740fbdd83232f30c5384ccda4ad35862fbb53deb91becd9b4ce metadata.xml 220
 MD5 4df85686b65f5591383e16bf3d6845ba portage-2.0.51.22-r3.ebuild 5796
+RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 portage-2.0.51.22-r3.ebuild 5796
+SHA256 f634d807fcc92500d9acc3dd5d79aadd2f565dbf1ee64a0f75a3543e2a372e25 portage-2.0.51.22-r3.ebuild 5796
 MD5 74f65b9f31d3d8baef97314065d2d720 portage-2.0.53.ebuild 3696
+RMD160 4eeb5fabedcb6ab4f51c076218fbab279e31ec65 portage-2.0.53.ebuild 3696
+SHA256 f167640e6dfcaaf626a9dfd6614c1b712f895410eaa77ea23f524956167aa4eb portage-2.0.53.ebuild 3696
 MD5 daf6422b5f97afa34fd6c30a2af5ceec portage-2.0.54.ebuild 3697
+RMD160 0ef35f1c9e01b7bb2e4fb8b9bd508ea74d7fe497 portage-2.0.54.ebuild 3697
+SHA256 513174598be3ccc0afd2b1e5b216ada0aec67ae6cb2a1745efaa5c3a0cb11fbe portage-2.0.54.ebuild 3697
 MD5 908c5af92ff8ea543ed011aefd0832ea portage-2.1_pre3-r1.ebuild 4715
+RMD160 e73644193a07d9957562ea6442b4e7759d8c35a8 portage-2.1_pre3-r1.ebuild 4715
+SHA256 6f7f1500f7a6ab4a7d651a7dbe44695995fdd2a37e4c6826d5eb9de5749b458a portage-2.1_pre3-r1.ebuild 4715
 MD5 156418acea4b688132aa58236b85b065 portage-2.1_pre4-r1.ebuild 4734
+RMD160 4af37c32e2eff9d15a7ec3c4db28b55f4fd4ddc1 portage-2.1_pre4-r1.ebuild 4734
+SHA256 eec24ea13ee7ad39ad41e2a98488c4a7ff0c71a146112fbf806e9d24ee77ae23 portage-2.1_pre4-r1.ebuild 4734
+MD5 e447e6256764e84b3f1047b9ab274178 portage-2.1_pre5.ebuild 4760
+RMD160 bb73284d3cba2317010e1a7198f1608099116109 portage-2.1_pre5.ebuild 4760
+SHA256 708d89bfa40279cdc33a8247d2b905b9cb974a5d75e323fefaf31116b42951f7 portage-2.1_pre5.ebuild 4760
diff --git a/sys-apps/portage/files/2.1_pre5.patch b/sys-apps/portage/files/2.1_pre5.patch
new file mode 100644
index 000000000000..315877a5b7ae
--- /dev/null
+++ b/sys-apps/portage/files/2.1_pre5.patch
@@ -0,0 +1,24 @@
+diff -Nur portage-2.1_pre5/bin/emerge portage-2.1_pre5.patched/bin/emerge
+--- portage-2.1_pre5/bin/emerge	2006-02-20 16:58:13.000000000 -0800
++++ portage-2.1_pre5.patched/bin/emerge	2006-02-22 16:44:48.000000000 -0800
+@@ -1934,7 +1934,7 @@
+ 			y=portage.portdb.findname(x[pkgindex])
+ 			if not "--pretend" in myopts:
+ 				print ">>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1]
+-				emergelog(" >>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
++				emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1])
+ 
+ 			self.pkgsettings["EMERGE_FROM"] = x[0][:]
+ 			self.pkgsettings.backup_changes("EMERGE_FROM")
+diff -Nur portage-2.1_pre5/pym/portage.py portage-2.1_pre5.patched/pym/portage.py
+--- portage-2.1_pre5/pym/portage.py	2006-02-21 02:01:08.000000000 -0800
++++ portage-2.1_pre5.patched/pym/portage.py	2006-02-22 16:44:32.000000000 -0800
+@@ -5334,6 +5334,8 @@
+ 		return 1
+ 
+ 	def update_ents(self, update_iter):
++		if len(update_iter) == 0:
++			return
+ 		if not self.populated:
+ 			self.populate()
+ 
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre5 b/sys-apps/portage/files/digest-portage-2.1_pre5
new file mode 100644
index 000000000000..c818d7ae4b7c
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1_pre5
@@ -0,0 +1,3 @@
+MD5 d389d9e87957429d4b49647d1339b220 portage-2.1_pre5.tar.bz2 256872
+RMD160 6d296e089345ddc44866cea7649005870a91786c portage-2.1_pre5.tar.bz2 256872
+SHA256 bdbd2e6e922750250592fbbd9e0cf91cd3f9024a33cf32b979bf2dd8cb344c13 portage-2.1_pre5.tar.bz2 256872
diff --git a/sys-apps/portage/portage-2.1_pre5.ebuild b/sys-apps/portage/portage-2.1_pre5.ebuild
new file mode 100644
index 000000000000..b780608c0e2d
--- /dev/null
+++ b/sys-apps/portage/portage-2.1_pre5.ebuild
@@ -0,0 +1,164 @@
+# 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_pre5.ebuild,v 1.1 2006/02/26 03:33:17 zmedico Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo."
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2"
+LICENSE="GPL-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
+
+SLOT="0"
+IUSE="build doc selinux"
+DEPEND=">=dev-lang/python-2.3"
+RDEPEND="!build? ( >=sys-apps/sed-4.0.5 \
+					dev-python/python-fchksum \
+					>=dev-lang/python-2.3 \
+					userland_GNU? ( sys-apps/debianutils ) \
+					>=app-shells/bash-2.05a ) \
+		!userland_Darwin? ( app-misc/pax-utils sys-apps/sandbox ) \
+		selinux? ( >=dev-python/python-selinux-2.15 ) \
+		doc? ( app-portage/portage-manpages )
+		>=dev-python/pycrypto-2.0.1-r4"
+
+PROVIDE="virtual/portage"
+
+S=${WORKDIR}/${PN}-${PV}
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	patch -p1 < "${FILESDIR}"/2.1_pre5.patch || die "Failed to apply patch"
+}
+
+src_compile() {
+	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
+
+	cd "${S}"/src
+	$(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c
+
+	if ! use userland_Darwin; then
+		cd "${S}"/src/python-missingos
+		chmod +x setup.py
+		./setup.py build || die "Failed to build missingos module"
+	fi
+
+	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() {
+	cd "${S}"/cnf
+	insinto /etc
+	doins etc-update.conf dispatch-conf.conf make.globals
+	if [ -f "make.conf.${ARCH}" ]; then
+		newins make.conf.${ARCH} 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 userland_Darwin; then
+		cd "${S}"/src/python-missingos
+		./setup.py install --root ${D} || die "Failed to install missingos module"
+	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 /usr/lib/portage/bin
+	exeinto /usr/lib/portage/bin
+	cd "${S}"/bin
+	doexe *
+	doexe "${S}"/src/tbz2tool
+	dosym newins /usr/lib/portage/bin/donewins
+
+	dodir /usr/lib/portage/pym
+	insinto /usr/lib/portage/pym
+	cd "${S}"/pym
+	doins *
+
+	dodir /usr/lib/portage/pym/cache
+	insinto /usr/lib/portage/pym/cache
+	cd "${S}"/pym/cache
+	doins *
+
+	dodir /usr/lib/portage/pym/elog_modules
+	insinto /usr/lib/portage/pym/elog_modules
+	cd "${S}"/pym/elog_modules
+	doins *
+
+	doman "${S}"/man/*.[0-9]
+	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
+	for x in archive-conf dispatch-conf emaint emerge-webrsync env-update etc-update fixpackages quickpkg regenworld; do
+		dosym ../lib/portage/bin/${x} /usr/sbin/${x}
+	done
+
+	dodir /etc/portage
+	keepdir /etc/portage
+
+	doenvd "${FILESDIR}"/05portage.envd
+}
+
+pkg_preinst() {
+	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+		rm -rf ${IMAGE}/usr/lib/portage/pym/*
+		mv ${IMAGE}/usr/lib/portage/bin/tbz2tool ${T}
+		rm -rf ${IMAGE}/usr/lib/portage/bin/*
+		mv ${T}/tbz2tool ${IMAGE}/usr/lib/portage/bin/
+	else
+		rm /usr/lib/portage/pym/*.pyc >& /dev/null
+		rm /usr/lib/portage/pym/*.pyo >& /dev/null
+	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 "This series contains a completely rewritten caching framework."
+	ewarn "If you are using any cache modules (such as the CDB cache"
+	ewarn "module) portage will not work until they have been disabled."
+	echo
+	einfo "The default cache format has changed beginning with this"
+	einfo "version. Before using emerge, run \`emerge --metadata\` to"
+	einfo "restore portage's local cache."
+	echo
+	einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
+	einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
+	einfo "to restore the previous ordering."
+	echo
+	einfo "See NEWS and RELEASE-NOTES for further changes."
+}