2.1.2.12 bump.

Package-Manager: portage-2.1.2.12

5 files changed, 52 insertions, 52 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 41b1890feae1..4e4e2ef63152 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # 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.424 2007/08/15 22:14:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.425 2007/08/17 22:13:13 zmedico Exp $
+
+*portage-2.1.2.12 (17 Aug 2007)
+
+  17 Aug 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2.12.ebuild
+  2.1.2.12 bump. This fixes bugs #137483, #187016, #187480, #187518,
+  #187741, #187795, #187806, #188449, #188619, #188782, and #189219.
+  Most notable is the fix for bug #188782 which optimizes merge order
+  for revdep-rebuild (2.1.2.11 has a regression relative to 2.1.2.9
+  that causes revdep-rebuild to produce bad merge order).
 
 *portage-2.1.3.6 (15 Aug 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f8f3ffc22ff1..a6cf2628c374 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -17,10 +17,10 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4
 DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28e489 SHA1 4eaedfedf867346d67744d95d5cb3ad5b0da4417 SHA256 4d2bc33b66c6354f008d798507137a347e35ef7448a10ef17e5108160acb0414
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
 DIST portage-2.1.2.11.tar.bz2 334796 RMD160 cf456fd3da24a3f6df32752253a9db041d8917d6 SHA1 e83c73f3bd496da06274ead2239f5b22ae775d84 SHA256 0982c8d88ba2ec3236dbcfa99cb67d0538fe90c8a744d66d63ad95354cecd7f5
+DIST portage-2.1.2.12.tar.bz2 336043 RMD160 7994d95bad6672f6602b3556a2237c7547ee6a22 SHA1 c0d98d5f1eb0f6f828bc2cf4d748a3f88abe63d2 SHA256 4d75b229009c18f21d5ffab30fda1d1698d4faa0814c7a2ae47703453b4e053a
 DIST portage-2.1.2.2.patch.bz2 36946 RMD160 cb55d2d2aa68ee149c8f6d9d94dfa3be5a884554 SHA1 2897ef16683d7cc8d5b8da04b67b93fcc83634d4 SHA256 1f5dd5105698773d46ce2345e9b5668271147d3b68e223216f965bf75a133f73
 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.5.patch.bz2 11740 RMD160 0562f2cbb1743df65a3f6fff160b289c9540f2b9 SHA1 928f4e23503d11501be2a373d1cbfbd9b20d4045 SHA256 c138a2a52a2001045a9b1a52939251f47d9a78a38bac2dd3e911e734af7ee562
 DIST portage-2.1.3.6.patch.bz2 13821 RMD160 f09a62af969f8aa481796dcadd7b09aea10de722 SHA1 b11a62ea19af6a5271db6272e8a072f481deedd9 SHA256 9c82dcd68bb4b925ae066e209727d14d1648eeeb786ae8ec0c9455d3d0e6c6c1
 DIST portage-2.1.3.tar.bz2 356902 RMD160 064ec10181e3b7f6727810b83dbd1c1d2c9b0462 SHA1 946e9d09cfacaddfa9c3570e3599f763f75be2e4 SHA256 6f06dfebc7a626e88af6a7c99d4c1c380a6ae0ad4adede7cdf2510ba04c43883
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
@@ -38,6 +38,10 @@ EBUILD portage-2.1.2.11.ebuild 7169 RMD160 5b4714b6212429cb9ed2114f875b7c12a89c1
 MD5 a1eda8ff5064833ead6a5eda90b40b71 portage-2.1.2.11.ebuild 7169
 RMD160 5b4714b6212429cb9ed2114f875b7c12a89c1de6 portage-2.1.2.11.ebuild 7169
 SHA256 891d5d26dabe766fd1708beb35848798f37110a4a61ee2ee3e65e6c1ed40e625 portage-2.1.2.11.ebuild 7169
+EBUILD portage-2.1.2.12.ebuild 7171 RMD160 348147fef4a15e0474250e63334780e83bedb081 SHA1 2a758dee217ff45a39df9ec7ab1ec23427e6adf8 SHA256 22de629d0e4ed4ee080b79069f3280cff30b5cc341a1027650db000e572cbec7
+MD5 91ae4ebdb0eece84ca00ffbc9ac4b427 portage-2.1.2.12.ebuild 7171
+RMD160 348147fef4a15e0474250e63334780e83bedb081 portage-2.1.2.12.ebuild 7171
+SHA256 22de629d0e4ed4ee080b79069f3280cff30b5cc341a1027650db000e572cbec7 portage-2.1.2.12.ebuild 7171
 EBUILD portage-2.1.2.2.ebuild 6998 RMD160 ce422f70c71a0d3413566b6d03d5784270d297ff SHA1 ff81076b3ce33504fc9d9e1c486962f37f4446c6 SHA256 73350ebdebe0f3ac56d7d70db64e0284cae83516bc5349f2f773274bfa43d872
 MD5 c435ae0450d3f6908225d9d4df0db1a2 portage-2.1.2.2.ebuild 6998
 RMD160 ce422f70c71a0d3413566b6d03d5784270d297ff portage-2.1.2.2.ebuild 6998
@@ -46,18 +50,14 @@ EBUILD portage-2.1.2.9.ebuild 7160 RMD160 9e84120d079a59fef4a02bed632ffff4be4a80
 MD5 cc5e4b13ce80d09b07e4178c94e14d50 portage-2.1.2.9.ebuild 7160
 RMD160 9e84120d079a59fef4a02bed632ffff4be4a8016 portage-2.1.2.9.ebuild 7160
 SHA256 085c461eae32f5279c6c44eac3b9158e5a340baf7dfa67e068fea6751ad4b664 portage-2.1.2.9.ebuild 7160
-EBUILD portage-2.1.3.5.ebuild 7619 RMD160 3e016d1e542e9cc9caa8670b9616cc6c255fcce6 SHA1 ed4b55d76887404a5a08d0e8d4379c8a07d42b56 SHA256 afaaf4dde367f7a00aa6ebaeb8bfe44da64c6365fd1a9f2796cf49eadf312e6e
-MD5 c22842acb0bc870a766fd6df668a6b15 portage-2.1.3.5.ebuild 7619
-RMD160 3e016d1e542e9cc9caa8670b9616cc6c255fcce6 portage-2.1.3.5.ebuild 7619
-SHA256 afaaf4dde367f7a00aa6ebaeb8bfe44da64c6365fd1a9f2796cf49eadf312e6e portage-2.1.3.5.ebuild 7619
 EBUILD portage-2.1.3.6.ebuild 7619 RMD160 664ab0b3233883a8fde2a895e9a2deed49d4764c SHA1 d646d6dff6434c1dd709d6482a28231a7501c07a SHA256 e889012bb817213417586dc04d6f3802230178057e6602a9e7412e25813889f5
 MD5 7dc452bd7f1ee8363d6ca8cedc32834d portage-2.1.3.6.ebuild 7619
 RMD160 664ab0b3233883a8fde2a895e9a2deed49d4764c portage-2.1.3.6.ebuild 7619
 SHA256 e889012bb817213417586dc04d6f3802230178057e6602a9e7412e25813889f5 portage-2.1.3.6.ebuild 7619
-MISC ChangeLog 21730 RMD160 73033875448f86ff7d7eab5dcbbe9430453ce57e SHA1 d9d3c3f83d765c012af606b34e92bf6b74c4cddb SHA256 c3937d8334f1ef8212f70d68a9143ff5cdd12c6810875953b289878e40191efb
-MD5 d871d5c74fa1260e81f3bd01cb4e998d ChangeLog 21730
-RMD160 73033875448f86ff7d7eab5dcbbe9430453ce57e ChangeLog 21730
-SHA256 c3937d8334f1ef8212f70d68a9143ff5cdd12c6810875953b289878e40191efb ChangeLog 21730
+MISC ChangeLog 22170 RMD160 c0c5662895d67de9b7b2c218dec4963ccb288b43 SHA1 b28abfb06805d9da946642c3004938318e0c25dd SHA256 f1a2622004ce40a8ed242f8c04a80df9b9802a9cf7803a93ae9eafc4ebb72fab
+MD5 b1a76ded4c1c1a5e39df078f1fd337e6 ChangeLog 22170
+RMD160 c0c5662895d67de9b7b2c218dec4963ccb288b43 ChangeLog 22170
+SHA256 f1a2622004ce40a8ed242f8c04a80df9b9802a9cf7803a93ae9eafc4ebb72fab ChangeLog 22170
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282
 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282
@@ -71,22 +71,22 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di
 MD5 cc58fe743b1815814cfbede4feedf6a3 files/digest-portage-2.1.2.11 515
 RMD160 7fbf56d60c9db8a3768beb17409d42759de44871 files/digest-portage-2.1.2.11 515
 SHA256 cf333ff21423fe9ad3969d4ff1479566adf67b2cfe374a1910f6972d52a54b50 files/digest-portage-2.1.2.11 515
+MD5 ae192cd987b367771aeb4bbf914dedce files/digest-portage-2.1.2.12 515
+RMD160 8e064aca53444d52ff2c4077ef29ecd9959a864c files/digest-portage-2.1.2.12 515
+SHA256 d8ef5b821584f0122344f636a81986f9df4e004293b45382107f9fddd7c01434 files/digest-portage-2.1.2.12 515
 MD5 925d42c079e45eec3f978b5f7016bc5e files/digest-portage-2.1.2.2 759
 RMD160 5c05ea1481402ffdc98a69bb6e0f3307596cef33 files/digest-portage-2.1.2.2 759
 SHA256 d8cbd61eab242247e3a0f76d5fafd63a398e4f1b4219e2193dd41f3a926fae05 files/digest-portage-2.1.2.2 759
 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 b572198047415be3d111a88ba91fcaeb files/digest-portage-2.1.3.5 759
-RMD160 db9afa798fb92e1addda426de8f76cb1a9ab4a2a files/digest-portage-2.1.3.5 759
-SHA256 dc798162fd148ee9b531f750e49c5f0a8e6a7b4030420ab207e47f5625926e29 files/digest-portage-2.1.3.5 759
 MD5 9cf3064db6d35d251a039994117e0acf files/digest-portage-2.1.3.6 759
 RMD160 f176fbb1a3587ff01c238a119fd3cc545ec5bd02 files/digest-portage-2.1.3.6 759
 SHA256 67fc0018c0c3f3c76e8e1f5d7b588324b12a93fb111096cda977480cecafd539 files/digest-portage-2.1.3.6 759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGw3rk/ejvha5XGaMRAsGQAJ9u8FJkmqvFRTUhPw6NwVjisQJuRwCeN/CP
-TSC8NqXkhO8bBsPDG2kt8MQ=
-=W+wJ
+iD8DBQFGxh1//ejvha5XGaMRAkF/AJ9VsAwtX8ywyFTHHpqQPaKbG3wPYwCgnL+0
+z1z5el5KkAsjdXwvtNBeWno=
+=ppQC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2.12 b/sys-apps/portage/files/digest-portage-2.1.2.12
new file mode 100644
index 000000000000..b5d1ce3f7896
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.2.12
@@ -0,0 +1,6 @@
+MD5 e05e47a35992cb8f721f108e246251dd portage-2.1.2.12.tar.bz2 336043
+RMD160 7994d95bad6672f6602b3556a2237c7547ee6a22 portage-2.1.2.12.tar.bz2 336043
+SHA256 4d75b229009c18f21d5ffab30fda1d1698d4faa0814c7a2ae47703453b4e053a portage-2.1.2.12.tar.bz2 336043
+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/files/digest-portage-2.1.3.5 b/sys-apps/portage/files/digest-portage-2.1.3.5
deleted file mode 100644
index 7abf5902b818..000000000000
--- a/sys-apps/portage/files/digest-portage-2.1.3.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 1d721634dc50b0f1f958d21ffde48be3 portage-2.1.3.5.patch.bz2 11740
-RMD160 0562f2cbb1743df65a3f6fff160b289c9540f2b9 portage-2.1.3.5.patch.bz2 11740
-SHA256 c138a2a52a2001045a9b1a52939251f47d9a78a38bac2dd3e911e734af7ee562 portage-2.1.3.5.patch.bz2 11740
-MD5 c8b48f9de6763a020dd9a44c695668a3 portage-2.1.3.tar.bz2 356902
-RMD160 064ec10181e3b7f6727810b83dbd1c1d2c9b0462 portage-2.1.3.tar.bz2 356902
-SHA256 6f06dfebc7a626e88af6a7c99d4c1c380a6ae0ad4adede7cdf2510ba04c43883 portage-2.1.3.tar.bz2 356902
-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.5.ebuild b/sys-apps/portage/portage-2.1.2.12.ebuild
index 839009588344..98f54c76a80e 100644
--- a/sys-apps/portage/portage-2.1.3.5.ebuild
+++ b/sys-apps/portage/portage-2.1.2.12.ebuild
@@ -1,13 +1,13 @@
 # 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.5.ebuild,v 1.1 2007/08/12 16:22:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2.12.ebuild,v 1.1 2007/08/17 22:13:13 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"
+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).
@@ -15,19 +15,17 @@ 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
 		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/eclass-manpages app-portage/portage-manpages ) )
+	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
@@ -36,13 +34,13 @@ SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
 
 PV_PL="2.1.2"
 PATCHVER_PL=""
-TARBALL_PV="${PV%.*}"
+TARBALL_PV=${PV}
 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}"
+PATCHVER=""
 if [ -n "${PATCHVER}" ]; then
 	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
 	${SRC_ARCHIVES}/${PN}-${PATCHVER}.patch.bz2"
@@ -87,11 +85,10 @@ 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"
+	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
 
 	if use epydoc; then
@@ -131,8 +128,11 @@ src_install() {
 		newins make.conf make.conf.example
 	fi
 
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary
+	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
@@ -160,7 +160,6 @@ 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
@@ -218,18 +217,13 @@ pkg_postinst() {
 		[ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
 	done
 
-	elog
-	elog "FEATURES=\"userfetch\" is now enabled by default. Depending on your \${DISTDIR}"
-	elog "permissions, this may result in Permission Denied errors. If you would like"
-	elog "to fetch with superuser privileges, add FEATURES=\"-userfetch\" to make.conf."
-	elog
-	elog "The world file now supports slot atoms such as 'sys-devel/gcc:3.4'. In some"
-	elog "cases, emerge --depclean may remove slots that it would not have removed"
-	elog "in the past. The emerge --noreplace command can be used to add an atom to"
-	elog "the world file and prevent matching packages from being removed.  A slot"
-	elog "atom will be recorded in the world file for any atom that is precise enough"
-	elog "to identify a specific slot."
-
+	ewarn "In portage-2.1.2, installation actions do not necessarily pull in build time"
+	ewarn "dependencies that are not strictly required.  This behavior is adjustable"
+	ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
+	ewarn "For more information regarding this change, please refer to bug #148870."
+	echo
+	elog "See NEWS and RELEASE-NOTES for further changes."
+	echo
 	portage_docs
 }