2.1.2_rc2 release. This fixes bugs #141118, #153591, #155477, and #155484.

Package-Manager: portage-2.1.2_rc2

4 files changed, 263 insertions, 8 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 4c62163a88b3..116b9809e97f 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,15 @@
 # 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.299 2006/11/15 15:03:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.300 2006/11/18 02:46:24 zmedico Exp $
+
+*portage-2.1.2_rc2 (18 Nov 2006)
+
+  18 Nov 2006; Zac Medico <zmedico@gentoo.org> +portage-2.1.2_rc2.ebuild:
+  2.1.2_rc2 release.  This fixes bugs #141118, #153591, #155477, and #155484.
+  Implicit RDEPEND behavior has been reverted back to the way it was in
+  <portage-2.0.52.  portage-2.1.1-r2 has the same behavior change and has been
+  unmasked in coordination with this release.  Please refer to bug #153591 and
+  the postinst ewarn message for more information.
 
   15 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   portage-2.1.1-r2.ebuild:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f0a60d578f04..28ab0860aecc 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -21,6 +21,7 @@ DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f25
 DIST portage-2.1.2_rc1-r6.patch.bz2 18716 RMD160 cb4c19dffddffeddaf526977e32c1ca3eb2075b6 SHA1 ff71da046f18a977ee8e99412444f8a2b8a50f53 SHA256 ea76596e268d0801104256f71dddc0bf7ef902bcdd67ca7f6739ecece3ed5a39
 DIST portage-2.1.2_rc1-r7.patch.bz2 25597 RMD160 c2c16e29aa9329b46b94e90b209d9246b9cac99c SHA1 56ac37e05a0c4b410677c534295706c499abad5b SHA256 46f2910c04688f4b574a5233560e80f619ff6988595e759d4c980fae3ffda231
 DIST portage-2.1.2_rc1.tar.bz2 313134 RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 SHA1 17f6dfb1f01eb53a3d2046dc518373d2a1472bed SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33
+DIST portage-2.1.2_rc2.tar.bz2 322321 RMD160 bb7db9529c3a86dd03b708f8fb498c11a55ded03 SHA1 d521fe93e7e39fa119fc3074ec926cc01ae79e7b SHA256 64345d0f836225be932e23bfcb9d3a253853067e9f0c842807a7ba2d9c31f0f1
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2_rc1.tar.bz2 53030 RMD160 9ed9037256f3eba59600028f2d8f78792a33383a SHA1 a511121897609bd5a261981fcc7f6789eb1deaaf SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
@@ -52,10 +53,14 @@ EBUILD portage-2.1.2_rc1-r7.ebuild 6643 RMD160 dfb5dbdbd8cdbf9962a112fb2f80d26e9
 MD5 acb24c2d79ad62ff1bb0b12ebeb833b1 portage-2.1.2_rc1-r7.ebuild 6643
 RMD160 dfb5dbdbd8cdbf9962a112fb2f80d26e95841b1d portage-2.1.2_rc1-r7.ebuild 6643
 SHA256 2807f63d60c6d703af0a9b1b6c4e160e233ce4bc80144033a644fe4743f96626 portage-2.1.2_rc1-r7.ebuild 6643
-MISC ChangeLog 18933 RMD160 c25690701e8d561a234cba5610373d8e08b83736 SHA1 1e6ceb0d85b41112b9172ed87a59478e34d3564d SHA256 661fcbb5b804a11889a3219578b5eaeb18b6c285f268b6a86a945bc55e78f116
-MD5 0bf162f8a0ffae65d800b8a8394392d6 ChangeLog 18933
-RMD160 c25690701e8d561a234cba5610373d8e08b83736 ChangeLog 18933
-SHA256 661fcbb5b804a11889a3219578b5eaeb18b6c285f268b6a86a945bc55e78f116 ChangeLog 18933
+EBUILD portage-2.1.2_rc2.ebuild 7696 RMD160 7e9e15263e1aa4b98b28a436cce8e532fa21e921 SHA1 3dbe35322adc7b0075651656eedeea7b8b7727b3 SHA256 b67737d8c7af0945cb0ffa7c795b6c55de8392143c558e1b08ad18f9fdf9d6a7
+MD5 b0850048c5dc86631909900f0c0ba984 portage-2.1.2_rc2.ebuild 7696
+RMD160 7e9e15263e1aa4b98b28a436cce8e532fa21e921 portage-2.1.2_rc2.ebuild 7696
+SHA256 b67737d8c7af0945cb0ffa7c795b6c55de8392143c558e1b08ad18f9fdf9d6a7 portage-2.1.2_rc2.ebuild 7696
+MISC ChangeLog 19400 RMD160 e24dbcaf3bea1334c1c565022c0c069bf81277aa SHA1 f9f805ae945fb7af7c7c730bf90512b69b334543 SHA256 5514130098e20d2cf6b127e5e46abae4746c6221ac9b83ebd0fe1e623f9d3bdf
+MD5 affdc48857a15a92fbf4c6b7b4dc2a07 ChangeLog 19400
+RMD160 e24dbcaf3bea1334c1c565022c0c069bf81277aa ChangeLog 19400
+SHA256 5514130098e20d2cf6b127e5e46abae4746c6221ac9b83ebd0fe1e623f9d3bdf ChangeLog 19400
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -81,10 +86,13 @@ SHA256 c85250868ddc8279506341c2f0dd3b69f02c8b719a2dd7ca48d56e4ca50d5734 files/di
 MD5 660893b033d177eb4ff1191904b68d84 files/digest-portage-2.1.2_rc1-r7 798
 RMD160 ad29ad42389d467b27d7fa7611b967f1034219ef files/digest-portage-2.1.2_rc1-r7 798
 SHA256 56a1558c4b904c96409af835fe52c8c30ddfbbf59a0165f35083ea84c85f78fe files/digest-portage-2.1.2_rc1-r7 798
+MD5 d519de49473722cf0e0d247df111c824 files/digest-portage-2.1.2_rc2 530
+RMD160 33cdb9874578a770ddec6c82328ed51287e2f968 files/digest-portage-2.1.2_rc2 530
+SHA256 d1b58c413f8901630d19365c5d02ef2fda1690c6abe6a66acfaaa55009f3dbf0 files/digest-portage-2.1.2_rc2 530
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFWy0ukT4lNIS36YERAooLAJ9VsVmSclciiUVoYeqh/cdqt8zmPwCdGBt1
-1+IpN2jObA2D7OQ0p7pSQoQ=
-=jRBm
+iD8DBQFFXnP9/ejvha5XGaMRAq5fAJ9gR0BiR6ZlLf/MCkm/q5lys2FIdgCfRTx8
+gVonqYrbCAdaz7U8QK5ayto=
+=tEIK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc2 b/sys-apps/portage/files/digest-portage-2.1.2_rc2
new file mode 100644
index 000000000000..4a52bfda11e7
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.2_rc2
@@ -0,0 +1,6 @@
+MD5 333a807684b5f83524ff584148cbca27 portage-2.1.2_rc2.tar.bz2 322321
+RMD160 bb7db9529c3a86dd03b708f8fb498c11a55ded03 portage-2.1.2_rc2.tar.bz2 322321
+SHA256 64345d0f836225be932e23bfcb9d3a253853067e9f0c842807a7ba2d9c31f0f1 portage-2.1.2_rc2.tar.bz2 322321
+MD5 624d18249325e364c13dc7ef7647f986 portage-man-pl-2.1.2_rc1.tar.bz2 53030
+RMD160 9ed9037256f3eba59600028f2d8f78792a33383a portage-man-pl-2.1.2_rc1.tar.bz2 53030
+SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a portage-man-pl-2.1.2_rc1.tar.bz2 53030
diff --git a/sys-apps/portage/portage-2.1.2_rc2.ebuild b/sys-apps/portage/portage-2.1.2_rc2.ebuild
new file mode 100644
index 000000000000..b7264a6fefe5
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.2_rc2.ebuild
@@ -0,0 +1,232 @@
+# 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.2_rc2.ebuild,v 1.1 2006/11/18 02:46:24 zmedico Exp $
+
+inherit toolchain-funcs eutils flag-o-matic
+
+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 ~ppc-macos ~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_USERLAND="userland_Darwin userland_GNU"
+IUSE="build doc epydoc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
+DEPEND=">=dev-lang/python-2.3
+	!build? ( >=sys-apps/sed-4.0.5 )
+	epydoc? ( >=dev-python/epydoc-2.0 )"
+RDEPEND=">=dev-lang/python-2.3
+	!build? ( >=sys-apps/sed-4.0.5
+		dev-python/python-fchksum
+		!userland_Darwin? ( >=app-shells/bash-3.0 ) )
+	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
+	!userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
+	selinux? ( >=dev-python/python-selinux-2.16 )
+	doc? ( app-portage/portage-manpages )
+	>=dev-python/pycrypto-2.0.1-r5"
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+PV_PL="2.1.2_rc1"
+PATCHVER_PL=""
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
+	${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+	${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
+
+PATCHVER=""
+[ "${PR}" != "r0" ] && PATCHVER="-${PR}"
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
+	${SRC_ARCHIVES}/${PN}-${PV}${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}-${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}-${PV}${PATCHVER}.patch"
+	fi
+	if [ "${PR}" != "r0" ]; then
+		elog "Setting portage.VERSION to ${PVR} ..."
+		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
+			die "Failed to patch portage.VERSION"
+		eend 0
+	fi
+	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 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
+		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 ${my_modules} || die "epydoc failed"
+	fi
+}
+
+src_install() {
+	local portage_base="/usr/lib/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
+
+	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
+	# 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 epydoc && dohtml -r "${WORKDIR}"/api
+
+	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"
+	local x
+	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() {
+	local portage_base="/usr/lib/portage"
+	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+		rm -rf "${IMAGE}"/${portage_base}/pym/*
+		mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
+		rm -rf "${IMAGE}"/${portage_base}/bin/*
+		mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
+	else
+		for mydir in bin pym pym/cache pym/elog_modules; do
+			rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
+			rm "${ROOT}"/${portage_base}/${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 "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
+	ewarn "In portage-2.1.2_rc2, the implicit RDEPEND behavior has been reverted back to"
+	ewarn "the way it was in <portage-2.0.52. This change restricts implicit RDEPEND to"
+	ewarn "the ebuild level, making it independent of whatever RDEPEND may or may not be"
+	ewarn "defined in the inherited eclasses.  As a result, some ebuilds will get"
+	ewarn "implicit RDEPEND that they did not get previously.  Also, some ebuilds will"
+	ewarn "loose some implicit RDEPEND that they previously got from eclasses.  Users"
+	ewarn "that sync with the rsync mirrors will have their metadata cache automatically"
+	ewarn "updated on the next sync (or the next time that they run"
+	ewarn "\`emerge --metadata\`).  Users of the gentoo-x86 CVS repository, in order to"
+	ewarn "make the change immediately effective, will have to manually remove the"
+	ewarn "entire contents of /var/cache/edb/dep/ and then run \`emerge --regen\`."
+	ewarn "If necessary, please refer to bug #153591 for more information."
+	echo
+	elog "See NEWS and RELEASE-NOTES for further changes."
+	echo
+	portage_docs
+}