2.1_pre9-r2 bug fix revbump

Package-Manager: portage-2.1_pre9-r2

8 files changed, 323 insertions, 1 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index e810ba6ff7fc..c0d615fac9b2 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,16 @@
 # 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.118 2006/04/18 14:31:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.119 2006/04/21 06:13:07 zmedico Exp $
+
+*portage-2.1_pre9-r2 (21 Apr 2006)
+
+  21 Apr 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1_pre9-r2.ebuild,
+  +files/2.1/pre9/1020_r3176_bug_130406_bz.patch,
+  +files/2.1/pre9/1040_r3178_bug_127585_other_phase.patch,
+  +files/2.1/pre9/1030_r3177_bug_130541_auto_manifest.patch,
+  +files/2.1/pre9/1050_r3179_commitmsgfile.patch,
+  +files/2.1/pre9/1060_r3181_gpg_dir.patch:
+  2.1_pre9-r2 bug fix revbump for #127585, #130406, and #130541.
 
   18 Apr 2006; <solar@gentoo.org> +portage-2.0.54-r1.ebuild:
   - added back 2.0.54-r1 but moved the patches into a tarball
diff --git a/sys-apps/portage/files/2.1/pre9/1020_r3176_bug_130406_bz.patch b/sys-apps/portage/files/2.1/pre9/1020_r3176_bug_130406_bz.patch
new file mode 100644
index 000000000000..ef3302bd2e81
--- /dev/null
+++ b/sys-apps/portage/files/2.1/pre9/1020_r3176_bug_130406_bz.patch
@@ -0,0 +1,13 @@
+Modified: bin/ebuild.sh
+===================================================================
+--- bin/ebuild.sh	2006-04-18 22:54:25 UTC (rev 3175)
++++ bin/ebuild.sh	2006-04-19 04:52:34 UTC (rev 3176)
+@@ -384,7 +384,7 @@
+ 					gzip -dc "${srcdir}${x}" > ${x%.*} || die "$myfail"
+ 				fi
+ 				;;
+-			bz2)
++			bz2|bz)
+ 				if [ "${y}" == "tar" ]; then
+ 					bzip2 -dc "${srcdir}${x}" | tar xf - ${tarvars}
+ 					assert "$myfail"
diff --git a/sys-apps/portage/files/2.1/pre9/1030_r3177_bug_130541_auto_manifest.patch b/sys-apps/portage/files/2.1/pre9/1030_r3177_bug_130541_auto_manifest.patch
new file mode 100644
index 000000000000..d21f9033ddba
--- /dev/null
+++ b/sys-apps/portage/files/2.1/pre9/1030_r3177_bug_130541_auto_manifest.patch
@@ -0,0 +1,15 @@
+Modified: bin/repoman
+===================================================================
+--- bin/repoman	2006-04-19 04:52:34 UTC (rev 3176)
++++ bin/repoman	2006-04-20 05:48:30 UTC (rev 3177)
+@@ -795,6 +795,10 @@
+ 				fails["CVS/Entries.IO_error"].append(checkdir+"/files/CVS/Entries")
+ 			continue
+ 
++	if mymode == "commit":
++		repoman_settings["O"] = checkdir
++		portage.digestgen([], repoman_settings, manifestonly=1)
++
+ 	mf = Manifest(checkdir,
+ 		portage.FetchlistDict(checkdir, repoman_settings),
+ 		repoman_settings["DISTDIR"])
diff --git a/sys-apps/portage/files/2.1/pre9/1040_r3178_bug_127585_other_phase.patch b/sys-apps/portage/files/2.1/pre9/1040_r3178_bug_127585_other_phase.patch
new file mode 100644
index 000000000000..2c7d8a86cda4
--- /dev/null
+++ b/sys-apps/portage/files/2.1/pre9/1040_r3178_bug_127585_other_phase.patch
@@ -0,0 +1,27 @@
+Modified: bin/isolated-functions.sh
+===================================================================
+--- bin/isolated-functions.sh	2006-04-20 05:48:30 UTC (rev 3177)
++++ bin/isolated-functions.sh	2006-04-20 18:06:37 UTC (rev 3178)
+@@ -16,7 +16,7 @@
+ 			return 1
+ 			;;
+ 	esac
+-	echo "$*" >> ${T}/logging/${EBUILD_PHASE}.${messagetype}
++	echo "$*" >> ${T}/logging/${EBUILD_PHASE:-other}.${messagetype}
+ 	return 0
+ }
+ 
+
+Modified: pym/portage_const.py
+===================================================================
+--- pym/portage_const.py	2006-04-20 05:48:30 UTC (rev 3177)
++++ pym/portage_const.py	2006-04-20 18:06:37 UTC (rev 3178)
+@@ -43,7 +43,8 @@
+ 
+ INCREMENTALS=["USE","USE_EXPAND","USE_EXPAND_HIDDEN","FEATURES","ACCEPT_KEYWORDS","ACCEPT_LICENSE","CONFIG_PROTECT_MASK","CONFIG_PROTECT","PRELINK_PATH","PRELINK_PATH_MASK"]
+ STICKIES=["KEYWORDS_ACCEPT","USE","CFLAGS","CXXFLAGS","MAKEOPTS","EXTRA_ECONF","EXTRA_EINSTALL","EXTRA_EMAKE"]
+-EBUILD_PHASES			= ["setup","unpack","compile","test","install","preinst","postinst","prerm","postrm"]
++EBUILD_PHASES           = ["setup", "unpack", "compile", "test", "install",
++                          "preinst", "postinst", "prerm", "postrm", "other"]
+ 
+ EAPI = 0
diff --git a/sys-apps/portage/files/2.1/pre9/1050_r3179_commitmsgfile.patch b/sys-apps/portage/files/2.1/pre9/1050_r3179_commitmsgfile.patch
new file mode 100644
index 000000000000..1c976d0adb7c
--- /dev/null
+++ b/sys-apps/portage/files/2.1/pre9/1050_r3179_commitmsgfile.patch
@@ -0,0 +1,35 @@
+Modified: bin/repoman
+===================================================================
+--- bin/repoman	2006-04-20 18:06:37 UTC (rev 3178)
++++ bin/repoman	2006-04-20 20:13:18 UTC (rev 3179)
+@@ -1519,7 +1519,20 @@
+ 		print "myheaders:",myheaders
+ 		print
+ 	unlinkfile=0
+-	if not (commitmessage or commitmessagefile):
++	if commitmessagefile:
++		try:
++			f = open(commitmessagefile)
++			commitmessage = f.read()
++			f.close()
++			del f
++		except (IOError, OSError), e:
++			if e.errno == errno.ENOENT:
++				portage.writemsg("!!! File Not Found: --commitmsgfile='%s'\n" % commitmessagefile)
++			else:
++				raise
++		# We've read the content so the file is no longer needed.
++		commitmessagefile = None
++	if not commitmessage:
+ 		print "Please enter a CVS commit message at the prompt:"
+ 		while not commitmessage:
+ 			try:
+@@ -1528,7 +1541,7 @@
+ 				exithandler()
+ 	try:
+ 		commitmessage+="\n(Portage version: "+str(portage.VERSION)+")"
+-	except:
++	except AttributeError:
+ 		print "Failed to insert portage version in message!"
+ 		commitmessage+="\n(Portage version: Unknown)"
+ 	if not commitmessagefile:
diff --git a/sys-apps/portage/files/2.1/pre9/1060_r3181_gpg_dir.patch b/sys-apps/portage/files/2.1/pre9/1060_r3181_gpg_dir.patch
new file mode 100644
index 000000000000..5768bebe3ff6
--- /dev/null
+++ b/sys-apps/portage/files/2.1/pre9/1060_r3181_gpg_dir.patch
@@ -0,0 +1,18 @@
+=== modified file 'bin/repoman'
+--- bin/repoman	
++++ bin/repoman	
+@@ -1574,7 +1574,12 @@
+ 		if "PORTAGE_GPG_KEY" not in repoman_settings:
+ 			raise portage_exception.MissingParameter("PORTAGE_GPG_KEY is unset!")
+ 		if "PORTAGE_GPG_DIR" not in repoman_settings:
+-			raise portage_exception.MissingParameter("PORTAGE_GPG_DIR is unset!")
++			if os.environ.has_key("HOME"):
++				repoman_settings["PORTAGE_GPG_DIR"] = os.path.join(os.environ["HOME"], ".gnupg")
++				if quiet < 1:
++					print "Automatically setting PORTAGE_GPG_DIR to",repoman_settings["PORTAGE_GPG_DIR"]
++			else:
++				raise portage_exception.MissingParameter("PORTAGE_GPG_DIR is unset!")
+ 		if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK):
+ 			raise portage_exception.InvalidLocation(
+ 				"Unable to access directory: PORTAGE_GPG_DIR='%s'" % \
+
diff --git a/sys-apps/portage/files/digest-portage-2.1_pre9-r2 b/sys-apps/portage/files/digest-portage-2.1_pre9-r2
new file mode 100644
index 000000000000..b8605c1727f7
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1_pre9-r2
@@ -0,0 +1,3 @@
+MD5 da49b427cd47b47cca13703d7e3f5949 portage-2.1_pre9.tar.bz2 260738
+RMD160 6a31123ff904395c5d22f631241293e808b5f94f portage-2.1_pre9.tar.bz2 260738
+SHA256 aef6464ee7bb732038e31250252d544c81ad642691ee78fb2f90074b92c9d726 portage-2.1_pre9.tar.bz2 260738
diff --git a/sys-apps/portage/portage-2.1_pre9-r2.ebuild b/sys-apps/portage/portage-2.1_pre9-r2.ebuild
new file mode 100644
index 000000000000..252b4735d011
--- /dev/null
+++ b/sys-apps/portage/portage-2.1_pre9-r2.ebuild
@@ -0,0 +1,201 @@
+# 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_pre9-r2.ebuild,v 1.1 2006/04/21 06:13:07 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/~zmedico/portage/archives/${PN}-${PV}.tar.bz2"
+LICENSE="GPL-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+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 ) \
+		elibc_glibc? ( sys-apps/sandbox )
+		elibc_uclibc? ( sys-apps/sandbox )
+		!userland_Darwin? ( >=app-misc/pax-utils-0.1.10 )
+		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}
+
+portage_docs() {
+	einfo ""
+	einfo "For help with using portage please consult the Gentoo Handbook"
+	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	einfo ""
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	local my_patches="1000_r3171_readDigests.patch
+		1010_r3173_bug_57445_gpgsign.patch
+		1020_r3176_bug_130406_bz.patch
+		1030_r3177_bug_130541_auto_manifest.patch
+		1040_r3178_bug_127585_other_phase.patch
+		1050_r3179_commitmsgfile.patch
+		1060_r3181_gpg_dir.patch"
+	local patches_dir="${PV%_*}/${PV/*_}"
+	for patch_name in ${my_patches}; do
+		einfo "Applying ${patch_name} ..."
+		patch -p0 --no-backup-if-mismatch < \
+			"${FILESDIR}"/${patches_dir}/${patch_name} >/dev/null || \
+			die "Failed to apply patch"
+	done
+	if [ "${PR}" != "r0" ]; then
+		einfo "Setting portage.VERSION to ${PVR} ..."
+		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
+			die "Failed to patch portage.VERSION"
+	fi
+}
+
+src_compile() {
+	python -O -c "import compileall; compileall.compile_dir('${S}/pym')"
+
+	cd "${S}"/src
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
+		die "Failed to build tbz2tool"
+
+	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}".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 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
+
+	for mydir in pym pym/cache pym/elog_modules; do
+		dodir /usr/lib/portage/${mydir}
+		insinto /usr/lib/portage/${mydir}
+		cd "${S}"/${mydir}
+		doins *.py *.pyo
+	done
+
+	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
+	local my_syms="archive-conf
+		dispatch-conf
+		emaint
+		emerge-webrsync
+		env-update
+		etc-update
+		fixpackages
+		quickpkg
+		regenworld"
+	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() {
+	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
+		for mydir in pym pym/cache pym/elog_modules; do
+			rm /usr/lib/portage/${mydir}/*.pyc >& /dev/null
+			rm /usr/lib/portage/${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
+
+	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 between 2.0.x and 2.1"
+	einfo "versions. If you have upgraded from 2.0.x, before using"
+	einfo "emerge, run \`emerge --metadata\` to restore portage's local"
+	einfo "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."
+
+	portage_docs
+}