2.1.3_rc5 bump

Package-Manager: portage-2.1.3_rc5

4 files changed, 269 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index c8c3a818e557..c8939f761ac5 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.395 2007/06/17 23:31:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.396 2007/06/23 05:25:54 zmedico Exp $
+
+*portage-2.1.3_rc5 (23 Jun 2007)
+
+  23 Jun 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.3_rc5.ebuild:
+  2.1.3_rc5 bump.  This fixes bugs #143340, #180165, #182428, and #182571.
+  The "save_summary" and "echo" elog modules are now enabled by default.
+  Setting PORTAGE_ELOG_SYSTEM in make.conf will override this, so if you
+  don't want elog set PORTAGE_ELOG_SYSTEM="" in make.conf.
 
 *portage-2.1.3_rc4 (17 Jun 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 35addbd7da78..6cf0717880c0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -21,6 +21,7 @@ DIST portage-2.1.2.7.patch.bz2 52460 RMD160 c6e963d38a1bb5e174b6f2cd8c4e47bac2be
 DIST portage-2.1.2.9.patch.bz2 61579 RMD160 ba315f393f8ecf4a89811c650131f3ad51b754d9 SHA1 0dfdc95e9becd0475e417f93417edfd8c0ab4fbb SHA256 4de01cc201f60438a1973aef146c4bbc715bc271fac0717e960c1d5cef8205a4
 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008
 DIST portage-2.1.3_rc4.patch.bz2 81411 RMD160 6f0c719f1e448fa15eee780d5a0b88fbe0fb3499 SHA1 9a9bbd945e29af038a68d38b8ce22f1a696a56a4 SHA256 601c57306b3dd5dfc1682fbbcb20ac6f709cd4c70abba46901db24a2353c4d70
+DIST portage-2.1.3_rc5.patch.bz2 100073 RMD160 d26d8831b1ae8894b3d0220f7202efb885a45cb8 SHA1 d81c922bd2ce60202ab88f31386bccd5775916e1 SHA256 92750bef8ea86fa72f096f575817a35af43b23aab98b3d1cac1ff3f2835d52ac
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
@@ -48,10 +49,14 @@ EBUILD portage-2.1.3_rc4.ebuild 6465 RMD160 222acd71701d838ad4c192f78afad5409011
 MD5 6b0eb2e4bbc32d7703fb695de1767e4a portage-2.1.3_rc4.ebuild 6465
 RMD160 222acd71701d838ad4c192f78afad54090111847 portage-2.1.3_rc4.ebuild 6465
 SHA256 cefc3487ac8289efaa0e79407ae3fb2746bb6100dd75bb2c9bce42f3d6c02b49 portage-2.1.3_rc4.ebuild 6465
-MISC ChangeLog 15748 RMD160 5b89789596fd30850ed0457edaeedc3e4170cc35 SHA1 1e6cc28834bff9eabcbefddd084571d39094255b SHA256 a86c5e72d1b1e77cea094afea26b32cf51fb42c2465f6b7e4218e663f679bc5b
-MD5 83114557efec2128982607214e828345 ChangeLog 15748
-RMD160 5b89789596fd30850ed0457edaeedc3e4170cc35 ChangeLog 15748
-SHA256 a86c5e72d1b1e77cea094afea26b32cf51fb42c2465f6b7e4218e663f679bc5b ChangeLog 15748
+EBUILD portage-2.1.3_rc5.ebuild 6833 RMD160 8d11cc6eae85e6f4fafd587d7919614f1b8f0900 SHA1 dd6ad7a5f89e27e3197eced1156430f3f224dbc9 SHA256 ea56ab8d1598ad180d6832f380976c2c08b6bbb77615192b7bd05df1e715fa80
+MD5 a5fb729f25b46286c4bc08bf2ea235b1 portage-2.1.3_rc5.ebuild 6833
+RMD160 8d11cc6eae85e6f4fafd587d7919614f1b8f0900 portage-2.1.3_rc5.ebuild 6833
+SHA256 ea56ab8d1598ad180d6832f380976c2c08b6bbb77615192b7bd05df1e715fa80 portage-2.1.3_rc5.ebuild 6833
+MISC ChangeLog 16137 RMD160 7df011be9fc084d080b0abd915ef903b719945ce SHA1 1499cd44cf135ebc0dccf25e1de8abf7ed37db77 SHA256 b7af8dc393af646757513c6ffa204d34fab573966947011c6d4cf9941e06b40a
+MD5 af81c72a1350e5b42bf9a928f54217a1 ChangeLog 16137
+RMD160 7df011be9fc084d080b0abd915ef903b719945ce ChangeLog 16137
+SHA256 b7af8dc393af646757513c6ffa204d34fab573966947011c6d4cf9941e06b40a ChangeLog 16137
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282
 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282
@@ -74,10 +79,13 @@ SHA256 930cabb025bc5f9e963cc4f044688bbffb1cbc1e46c4b715ff2314d1469de01c files/di
 MD5 0c5981e30f46e36acf06e1f14fca348e files/digest-portage-2.1.3_rc4 765
 RMD160 d65835ed153d1d9fce78b579b2fbb35965b61e81 files/digest-portage-2.1.3_rc4 765
 SHA256 0a2aa54bbf1c3ae46df7a3607739cce9ceb88be1c3a76d3f9a4bddd896843215 files/digest-portage-2.1.3_rc4 765
+MD5 af8e96deb7c714574af5ec4cd20cdaa0 files/digest-portage-2.1.3_rc5 768
+RMD160 650db26d9e426fad9617655a4d15c346e2e67535 files/digest-portage-2.1.3_rc5 768
+SHA256 3b05192f1a0307e118449a861de248095ea66f565466033709e1c2900b50c4f7 files/digest-portage-2.1.3_rc5 768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGdcRN/ejvha5XGaMRApWPAJsFDdIugSJQ2L7t9klKuXqY3KnXCACgoXDo
-1tqB3jL6RdEFra0ELsb892k=
-=CWLG
+iD8DBQFGfK7n/ejvha5XGaMRAqJsAKCQ4I5Z03R1DG4OFeqgM1noVs9GXACgx7B1
+bNklRyW3ytDKvHl19pmu9p8=
+=DQYu
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.3_rc5 b/sys-apps/portage/files/digest-portage-2.1.3_rc5
new file mode 100644
index 000000000000..fbd72265c764
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.3_rc5
@@ -0,0 +1,9 @@
+MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
+RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
+SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
+MD5 a9a343101a8dcc7b16ebce7ee8c1cf30 portage-2.1.3_rc5.patch.bz2 100073
+RMD160 d26d8831b1ae8894b3d0220f7202efb885a45cb8 portage-2.1.3_rc5.patch.bz2 100073
+SHA256 92750bef8ea86fa72f096f575817a35af43b23aab98b3d1cac1ff3f2835d52ac portage-2.1.3_rc5.patch.bz2 100073
+MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893
+RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893
+SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893
diff --git a/sys-apps/portage/portage-2.1.3_rc5.ebuild b/sys-apps/portage/portage-2.1.3_rc5.ebuild
new file mode 100644
index 000000000000..90ed2aa421d7
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.3_rc5.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3_rc5.ebuild,v 1.1 2007/06/23 05:25:54 zmedico Exp $
+
+inherit toolchain-funcs eutils flag-o-matic multilib
+
+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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~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="build doc epydoc selinux linguas_pl userland_GNU ${IUSE_ELIBC}"
+DEPEND=">=dev-lang/python-2.4
+	!build? ( >=sys-apps/sed-4.0.5 )
+	doc? ( app-text/xmlto )
+	epydoc? ( >=dev-python/epydoc-2.0 )"
+RDEPEND=">=dev-lang/python-2.4
+	!build? ( >=sys-apps/sed-4.0.5
+		dev-python/python-fchksum
+		>=app-shells/bash-3.0 )
+	elibc_FreeBSD? ( dev-python/py-freebsd )
+	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
+	>=app-misc/pax-utils-0.1.13
+	userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	selinux? ( >=dev-python/python-selinux-2.16 )
+	doc? ( app-portage/portage-manpages )
+	>=dev-python/pycrypto-2.0.1-r5
+	>=net-misc/rsync-2.6.4"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# rsync-2.6.4 rdep is for the --filter option #167668
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV="2.1.2"
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	${SRC_ARCHIVES}/${PN}-${TARBALL_PV}.tar.bz2
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
+
+PATCHVER="${PVR}"
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	${SRC_ARCHIVES}/${PN}-${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}-${TARBALL_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}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
+		die "Failed to patch portage.VERSION"
+	eend 0
+	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 doc; then
+		cd "${S}"/doc
+		touch fragment/date
+		sed -i "s/svn-trunk/${PVR}/" fragment/version
+		make xhtml-nochunks || die "failed to make docs"
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		mkdir "${WORKDIR}"/api
+		local my_modules
+		my_modules="$(find "${S}/pym" -name "*.py" \
+			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
+			 -e 's:/:.:g')" || die "error listing modules"
+		PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \
+			-qqqqq --ignore-param-mismatch --no-frames --show-imports \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${my_modules} || die "epydoc failed"
+	fi
+}
+
+src_test() {
+	./tests/runTests || \
+		die "test(s) failed"
+}
+
+src_install() {
+	local libdir=$(get_libdir)
+	local portage_base="/usr/${libdir}/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
+
+	insinto /etc/logrotate.d
+	doins "${S}"/cnf/logrotate.d/elog-save-summary
+
+	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
+	use doc && dohtml "${S}"/doc/*.html
+	use epydoc && dohtml -r "${WORKDIR}"/api
+
+	dodir /usr/bin
+	for x in ebuild emerge portageq repoman tbz2tool xpak; do
+		dosym ../${libdir}/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 ../${libdir}/portage/bin/${x} /usr/sbin/${x}
+	done
+	dosym env-update /usr/sbin/update-env
+	dosym etc-update /usr/sbin/update-etc
+
+	dodir /etc/portage
+	keepdir /etc/portage
+
+	echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd
+	doenvd "${WORKDIR}"/05portage.envd
+}
+
+pkg_preinst() {
+	local portage_base="/usr/$(get_libdir)/portage"
+	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+		rm -rf "${D}"/${portage_base}/pym/*
+		mv "${D}"/${portage_base}/bin/tbz2tool "${T}"
+		rm -rf "${D}"/${portage_base}/bin/*
+		mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/
+	fi
+	remove_python_bytecodes
+}
+
+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
+}
+
+pkg_postrm() {
+	remove_python_bytecodes
+}
+
+remove_python_bytecodes() {
+	local d="${ROOT}/usr/$(get_libdir)/portage/pym"
+	[ -d "${d}" ] || return
+	find "${d}" -type d -print0 | \
+	while read -d $'\0' d ; do
+		cd "${d}"
+		rm -f *.pyc *.pyo
+	done
+}