2.1.2.12 bump.

(Portage version: 2.1.2.12)

4 files changed, 37 insertions, 37 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/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
 }