From e3d60a7cc362a4ac5ecb600c7fc491f8955c539a Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 Mar 2007 08:22:42 +0000
Subject: [PATCH] 2.1.2-r13 revbump. Package-Manager: portage-2.1.2-r13

---
 sys-apps/portage/ChangeLog                    |  10 +-
 sys-apps/portage/Manifest                     |  22 +-
 .../portage/files/digest-portage-2.1.2-r13    |   9 +
 sys-apps/portage/portage-2.1.2-r13.ebuild     | 229 ++++++++++++++++++
 4 files changed, 262 insertions(+), 8 deletions(-)
 create mode 100644 sys-apps/portage/files/digest-portage-2.1.2-r13
 create mode 100644 sys-apps/portage/portage-2.1.2-r13.ebuild

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 8205285265ce..bec000d7c5c4 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.359 2007/02/27 07:39:00 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.360 2007/03/02 08:22:42 zmedico Exp $
+
+*portage-2.1.2-r13 (02 Mar 2007)
+
+  02 Mar 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2-r13.ebuild:
+  2.1.2-r13 revbump.  This fixes bugs #168646 and #168823.  Bug #167107
+  tracks fixes since 2.1.2-r9.  For compatibility with rsync mirrors running
+  <rsync-2.6.4, --prune-empty-dirs has been removed from the default rsync
+  options.  See bug #168646 for details.
 
 *portage-2.1.2-r12 (26 Feb 2007)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5cd7ad5771e8..733e2c10861f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -17,6 +17,7 @@ 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-r12.patch.bz2 30194 RMD160 1633e13134369506ff2e024b52e758c90c493ea9 SHA1 5d072343a574c3cea2291047456dbbbe77ee71bd SHA256 102c462b59ea9b01faa50f6dc17a473069e11ed979743e222c742614efced7ff
+DIST portage-2.1.2-r13.patch.bz2 31882 RMD160 758af8d310a94028b3761301d92e48683e629d14 SHA1 50e75a5571130fdb9f9ea3862e52379d3942fd6f SHA256 d9d934b280680ab84c220844faff7995a341d88ebe8bb02c56bba0b40c01f4d6
 DIST portage-2.1.2-r9.patch.bz2 20357 RMD160 bae73f052e413a71328865083ce46923de46d9fd SHA1 d5a07fc92791c2d69c8614de5413659803aa9e5d SHA256 73080e708293a1df5419567c1d9cd143922ca7806070e54b3adce29fe14937e3
 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
@@ -34,14 +35,18 @@ EBUILD portage-2.1.2-r12.ebuild 7045 RMD160 6dff9ff0e7f498078394c29dcfddf3914c12
 MD5 0c06c49e44d989442655a135f3ef9fca portage-2.1.2-r12.ebuild 7045
 RMD160 6dff9ff0e7f498078394c29dcfddf3914c12d0c2 portage-2.1.2-r12.ebuild 7045
 SHA256 a41912c6bf7c3877e0a41dc52296725a409f59120661b919b3163be6dfd46fd0 portage-2.1.2-r12.ebuild 7045
+EBUILD portage-2.1.2-r13.ebuild 7045 RMD160 9e57daa681c8a793689e4d372ccfc06216085f77 SHA1 df0f2402a4fbf38e1c017d161f0f48515cdb7fc5 SHA256 b9f0fe32b69dc5616d5d63d97220e0a09b9d44e153db48a552bf12607d163eaa
+MD5 abf26fa6d8bf46e704134cbe1c1c7ebc portage-2.1.2-r13.ebuild 7045
+RMD160 9e57daa681c8a793689e4d372ccfc06216085f77 portage-2.1.2-r13.ebuild 7045
+SHA256 b9f0fe32b69dc5616d5d63d97220e0a09b9d44e153db48a552bf12607d163eaa portage-2.1.2-r13.ebuild 7045
 EBUILD portage-2.1.2-r9.ebuild 6926 RMD160 7e76724ca5b6c91df87001c46da9caa354f21a70 SHA1 8efc1afb2ba3b527551869ed4d59829e9bdcc4b4 SHA256 2aeb3be0f96a07f4e30f33f701f8dc77914c113215719de3498437dc6d3b0431
 MD5 5d2f5123b0e9b00f81cf6b0c226f76ef portage-2.1.2-r9.ebuild 6926
 RMD160 7e76724ca5b6c91df87001c46da9caa354f21a70 portage-2.1.2-r9.ebuild 6926
 SHA256 2aeb3be0f96a07f4e30f33f701f8dc77914c113215719de3498437dc6d3b0431 portage-2.1.2-r9.ebuild 6926
-MISC ChangeLog 18636 RMD160 5e65d44ff328144795e5496dcda6f4aa3cda3b2f SHA1 47e438088e3fe785e38df8b9113457adcbc31d7b SHA256 76d3b825c5873b40e1cd0bf6565cad70247ac9705694a268a04f6ec2c247bb8b
-MD5 49712a34c4f8b0a971f9ce4a193b6be5 ChangeLog 18636
-RMD160 5e65d44ff328144795e5496dcda6f4aa3cda3b2f ChangeLog 18636
-SHA256 76d3b825c5873b40e1cd0bf6565cad70247ac9705694a268a04f6ec2c247bb8b ChangeLog 18636
+MISC ChangeLog 19010 RMD160 b4e7197844e6fb76d7d964ec9af38963df1d55ed SHA1 b88cf1cecd723c9b4e7d2dcd2da1dd3b8ce69f78 SHA256 8ae78b52698be89833cd938619d563557b56eefed1d1d4f3441dc0ac351247c4
+MD5 3174eb6b2cd08e4be19f8470447e07be ChangeLog 19010
+RMD160 b4e7197844e6fb76d7d964ec9af38963df1d55ed ChangeLog 19010
+SHA256 8ae78b52698be89833cd938619d563557b56eefed1d1d4f3441dc0ac351247c4 ChangeLog 19010
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -55,13 +60,16 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di
 MD5 bb2e16d80220665e4dd162af970d953a files/digest-portage-2.1.2-r12 765
 RMD160 c07d8fcd758e9ef55a5271b5b2f9b16441543b4b files/digest-portage-2.1.2-r12 765
 SHA256 5d3174de4968254b72aeb3f9dc7e9bccd7e328e517d5d61ada5a7eddad394b9c files/digest-portage-2.1.2-r12 765
+MD5 714beaadffa1e189cab1868384320846 files/digest-portage-2.1.2-r13 765
+RMD160 6d37cbe990969bb6c5d1a5c68b6543ac35649f56 files/digest-portage-2.1.2-r13 765
+SHA256 bc70dba9b6e62893cde3e2d380438db6cbec9edd0ade6ec59b020bc8ed56ebaf files/digest-portage-2.1.2-r13 765
 MD5 c8470f45ecc797cf3d11955e8f289f27 files/digest-portage-2.1.2-r9 762
 RMD160 a8ddfbbe84d19146aeca5f44c6996c9d5b6fe476 files/digest-portage-2.1.2-r9 762
 SHA256 c5dca1f067e2d2e51ede6a1a1fea63510256018bc286401be1f55f9d2307bfa0 files/digest-portage-2.1.2-r9 762
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF4+AZ/ejvha5XGaMRArdmAJ0bLO3xH4W+KLE2DflJo+KpdtiFzgCdHBGm
-4fBxt5o1ES9Ti8Vrlj4eBvc=
-=sWcc
+iD8DBQFF597X/ejvha5XGaMRApNrAKDGpjWH6trimJrx+GsV0URgwrVaMwCgx4Vc
+O1MCNlEVc1Q8ou746uDGMKY=
+=bun+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2-r13 b/sys-apps/portage/files/digest-portage-2.1.2-r13
new file mode 100644
index 000000000000..0ba32b4df29d
--- /dev/null
+++ b/sys-apps/portage/files/digest-portage-2.1.2-r13
@@ -0,0 +1,9 @@
+MD5 aaff8c67df0aadb6e0cb7b1ad12e9f5d portage-2.1.2-r13.patch.bz2 31882
+RMD160 758af8d310a94028b3761301d92e48683e629d14 portage-2.1.2-r13.patch.bz2 31882
+SHA256 d9d934b280680ab84c220844faff7995a341d88ebe8bb02c56bba0b40c01f4d6 portage-2.1.2-r13.patch.bz2 31882
+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 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.2-r13.ebuild b/sys-apps/portage/portage-2.1.2-r13.ebuild
new file mode 100644
index 000000000000..8a0d48658b5e
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.2-r13.ebuild
@@ -0,0 +1,229 @@
+# 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.2-r13.ebuild,v 1.1 2007/03/02 08:22:42 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_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 )
+	userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) )
+	selinux? ( >=dev-python/python-selinux-2.16 )
+	doc? ( app-portage/portage-manpages )
+	>=dev-python/pycrypto-2.0.1-r5"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+PV_PL="2.1.2"
+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
+		einfo "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
+		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 ${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
+
+	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 ../${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
+
+	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 "${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
+	elog "See NEWS and RELEASE-NOTES for further changes."
+	echo
+	portage_docs
+}
-- 
2.26.2