2.1.3_rc6 bump

Package-Manager: portage-2.1.3_rc6

4 files changed, 43 insertions, 22 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index c8939f761ac5..4e055346ba73 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
 # 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.396 2007/06/23 05:25:54 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.397 2007/06/29 02:32:34 zmedico Exp $
+
+*portage-2.1.3_rc6 (29 Jun 2007)
+
+  29 Jun 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.3_rc6.ebuild:
+  2.1.3_rc6 bump.  This fixes bugs #139600, #141550, #142473, #144333,
+  #144440, #147558, #148514, #175891, #180706, #182786, #182964, #183167,
+  and #183431.
 
 *portage-2.1.3_rc5 (23 Jun 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 25aa6519f0cd..98cdafb47756 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -20,8 +20,8 @@ DIST portage-2.1.2.2.patch.bz2 36946 RMD160 cb55d2d2aa68ee149c8f6d9d94dfa3be5a88
 DIST portage-2.1.2.7.patch.bz2 52460 RMD160 c6e963d38a1bb5e174b6f2cd8c4e47bac2bef4bf SHA1 817b1d9dd119a90c8e3d8375d996f194215a9be1 SHA256 477aefd64234b77181ef04d3d7617bb86b26739022ffd8108f8aadc2c5f5b084
 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-2.1.3_rc6.patch.bz2 110936 RMD160 e785c3364c6be31bde573c3ae938a86e22d49178 SHA1 8645bf95c43140bfe6b4e8657e51d6ed83709d15 SHA256 2001b9b32f28d7377abe40aa103e9dd66affab4d12ae9f11f791fd2071600bbe
 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
@@ -45,18 +45,18 @@ EBUILD portage-2.1.2.9.ebuild 7173 RMD160 c9c568e3acca9980d6627c42a35caf47dabb1b
 MD5 92b359f7f81a411a3b73a50e43db363b portage-2.1.2.9.ebuild 7173
 RMD160 c9c568e3acca9980d6627c42a35caf47dabb1ba6 portage-2.1.2.9.ebuild 7173
 SHA256 13b8d90812d55e71560022c62f74a2dd04b4704faf07e754be761fdd7aaba51e portage-2.1.2.9.ebuild 7173
-EBUILD portage-2.1.3_rc4.ebuild 6465 RMD160 222acd71701d838ad4c192f78afad54090111847 SHA1 5becf175e6e1f57d0df643316fd843253a5389ef SHA256 cefc3487ac8289efaa0e79407ae3fb2746bb6100dd75bb2c9bce42f3d6c02b49
-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
 EBUILD portage-2.1.3_rc5.ebuild 6863 RMD160 c7a7806101f3c2bb0e89b8c8f6f434fb5f2bc041 SHA1 e74ee274788c141fb1409b1e3f90af7e224ca00d SHA256 4f7b0f8c22f5f6e109b65d6bc61d216c4a7d0451a9b6f539b82720e3e18cfc4d
 MD5 d7d0b805163f06f36cf4e85a18923c53 portage-2.1.3_rc5.ebuild 6863
 RMD160 c7a7806101f3c2bb0e89b8c8f6f434fb5f2bc041 portage-2.1.3_rc5.ebuild 6863
 SHA256 4f7b0f8c22f5f6e109b65d6bc61d216c4a7d0451a9b6f539b82720e3e18cfc4d portage-2.1.3_rc5.ebuild 6863
-MISC ChangeLog 16137 RMD160 7df011be9fc084d080b0abd915ef903b719945ce SHA1 1499cd44cf135ebc0dccf25e1de8abf7ed37db77 SHA256 b7af8dc393af646757513c6ffa204d34fab573966947011c6d4cf9941e06b40a
-MD5 af81c72a1350e5b42bf9a928f54217a1 ChangeLog 16137
-RMD160 7df011be9fc084d080b0abd915ef903b719945ce ChangeLog 16137
-SHA256 b7af8dc393af646757513c6ffa204d34fab573966947011c6d4cf9941e06b40a ChangeLog 16137
+EBUILD portage-2.1.3_rc6.ebuild 6863 RMD160 511c5f1d48d9bd4d2c19abf57ef332e362c119f2 SHA1 223de7c5d12b73829b71f4a69f84fe43425a8370 SHA256 4e19570c9e2843789917933214e70e87aab7c44f174bd80469334cb12a76ff42
+MD5 efc9fd73fb1dbaddb38a756a8edb39ff portage-2.1.3_rc6.ebuild 6863
+RMD160 511c5f1d48d9bd4d2c19abf57ef332e362c119f2 portage-2.1.3_rc6.ebuild 6863
+SHA256 4e19570c9e2843789917933214e70e87aab7c44f174bd80469334cb12a76ff42 portage-2.1.3_rc6.ebuild 6863
+MISC ChangeLog 16406 RMD160 c3af63f8ca649757e1b44742a09f44f411277828 SHA1 9de2a504f4081c33a63032309f8296daba2f2880 SHA256 36570f9f3c998f804847aaba60fd952c48f63795ac540582174ebad2d881fea7
+MD5 511faad4c9df8d377cc30f13023f0098 ChangeLog 16406
+RMD160 c3af63f8ca649757e1b44742a09f44f411277828 ChangeLog 16406
+SHA256 36570f9f3c998f804847aaba60fd952c48f63795ac540582174ebad2d881fea7 ChangeLog 16406
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282
 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282
@@ -76,16 +76,16 @@ SHA256 a462f9a2c0c9d3d5cb8fe9cbcc25bf7c548af0aa481ecd4ac75baa263de136f1 files/di
 MD5 9ddf2195951bb996621c49dcadc737cb files/digest-portage-2.1.2.9 759
 RMD160 02e8f49fa6522d49ea28c98da7cd211e5f633d16 files/digest-portage-2.1.2.9 759
 SHA256 930cabb025bc5f9e963cc4f044688bbffb1cbc1e46c4b715ff2314d1469de01c files/digest-portage-2.1.2.9 759
-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
+MD5 bb7cc538673e3f6bf35f2e084e3fec47 files/digest-portage-2.1.3_rc6 768
+RMD160 234229941cedb7f3db5305bbec125965f743aab5 files/digest-portage-2.1.3_rc6 768
+SHA256 4bebe79146f5492cd04f3510e0cad6b455f407627c1e65bc2a6e4e5d7931f61d files/digest-portage-2.1.3_rc6 768
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGfu0Ap/wUKkr7RBoRAkURAJ4t08/64JzSoH2jM0lShfFty5Mc4QCeJtWD
-s+BLqJeyaeePaLXqb8kH790=
-=yz+s
+iD8DBQFGhG9H/ejvha5XGaMRAkFKAKDXGZ8RpXgClu5EPzbjcvfz4KBjEwCcD7vI
+gnPbP7SdTtDvZHrEztZhBrs=
+=VOMH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.3_rc4 b/sys-apps/portage/files/digest-portage-2.1.3_rc6
index 726f26104eea..cd7e1a86db3e 100644
--- a/sys-apps/portage/files/digest-portage-2.1.3_rc4
+++ b/sys-apps/portage/files/digest-portage-2.1.3_rc6
@@ -1,9 +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 07928e97ce386d63a7eff9b3eb692c88 portage-2.1.3_rc4.patch.bz2 81411
-RMD160 6f0c719f1e448fa15eee780d5a0b88fbe0fb3499 portage-2.1.3_rc4.patch.bz2 81411
-SHA256 601c57306b3dd5dfc1682fbbcb20ac6f709cd4c70abba46901db24a2353c4d70 portage-2.1.3_rc4.patch.bz2 81411
+MD5 8331b567ea05db0be33eda21c055adaf portage-2.1.3_rc6.patch.bz2 110936
+RMD160 e785c3364c6be31bde573c3ae938a86e22d49178 portage-2.1.3_rc6.patch.bz2 110936
+SHA256 2001b9b32f28d7377abe40aa103e9dd66affab4d12ae9f11f791fd2071600bbe portage-2.1.3_rc6.patch.bz2 110936
 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_rc4.ebuild b/sys-apps/portage/portage-2.1.3_rc6.ebuild
index 1b00a2cd5706..75c7f96eb832 100644
--- a/sys-apps/portage/portage-2.1.3_rc4.ebuild
+++ b/sys-apps/portage/portage-2.1.3_rc6.ebuild
@@ -1,6 +1,6 @@
 # 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_rc4.ebuild,v 1.1 2007/06/17 23:31:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3_rc6.ebuild,v 1.1 2007/06/29 02:32:34 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib
 
@@ -15,6 +15,7 @@ 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 ~app-text/docbook-xml-dtd-4.4 )
 	epydoc? ( >=dev-python/epydoc-2.0 )"
 RDEPEND=">=dev-lang/python-2.4
 	!build? ( >=sys-apps/sed-4.0.5
@@ -86,15 +87,24 @@ src_compile() {
 	$(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/::" \
+			| 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 ${my_modules} || die "epydoc failed"
+			-qqqqq --ignore-param-mismatch --no-frames --show-imports \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${my_modules} || die "epydoc failed"
 	fi
 }
 
@@ -121,6 +131,9 @@ src_install() {
 		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
@@ -147,6 +160,7 @@ src_install() {
 	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