2.1.4.1 bump. This fixes bugs #138159, #205718, #205966, #206772, and

an overlay then you should remove **/files/digest-* files (Manifest1)
because they are no longer supported. If earlier versions of portage
will be used to generate manifests for your overlay then you should add
a file named manifest1_obsolete to the root of the repository in order
to disable generation of the Manifest1 digest files.
Package-Manager: portage-2.1.4.1

3 files changed, 291 insertions, 2 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 03c2d14c0762..1d7aa81d7778 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.490 2008/01/24 09:49:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.491 2008/02/01 05:29:59 zmedico Exp $
+
+*portage-2.1.4.1 (01 Feb 2008)
+
+  01 Feb 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.4.1.ebuild:
+  2.1.4.1 bump. This fixes bugs #138159, #205718, #205966, #206772, and
+  #207104. Bug #200044 tracks all bugs fixed since 2.1.3.x. If you have
+  an overlay then you should remove **/files/digest-* files (Manifest1)
+  because they are no longer supported. If earlier versions of portage
+  will be used to generate manifests for your overlay then you should add
+  a file named manifest1_obsolete to the root of the repository in order
+  to disable generation of the Manifest1 digest files.
 
   24 Jan 2008; Zac Medico <zmedico@gentoo.org> portage-2.1.4.ebuild:
   Bug #206800 - Fix epydoc command to work with epydoc-3.0.
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 9c2728c9fa4f..af126fb90b5b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d SHA1 2af2c9a7ce535c36749dfe81b6555426225620e2 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225
 AUX 2.0.51.22-fixes.patch 10579 RMD160 aecbf663449b7b6c5fc8f4f343c30c1de7515fb3 SHA1 6305707411c213cd78f028952f7aabcb8b56e0ce SHA256 a6ae22f6513e9c5160204d9ba2ca8bab00091a88089139ff64bee68aaf63a95c
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
@@ -8,6 +11,7 @@ DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f25
 DIST portage-2.1.2.12.tar.bz2 336043 RMD160 7994d95bad6672f6602b3556a2237c7547ee6a22 SHA1 c0d98d5f1eb0f6f828bc2cf4d748a3f88abe63d2 SHA256 4d75b229009c18f21d5ffab30fda1d1698d4faa0814c7a2ae47703453b4e053a
 DIST portage-2.1.3.16.tar.bz2 375210 RMD160 06d0e9bc25431cb5e63004fd651020a11acfb47d SHA1 b3257fb75c4e1db1192814551e30b0a2c986fdd1 SHA256 6657857fa5a0c18c4a9ae3a22665896aae7004a6b69bef50c0046514dd4fdb8f
 DIST portage-2.1.3.19.patch.bz2 20196 RMD160 3d33ecc8ae5176426666ba1aa03155a10ed97c01 SHA1 89a525959e493b0b1834e3b59d182a9b35a6508c SHA256 a69c095a32b2d731cb7b74731269ae7c42357a3c34d7f183e2fc779d79652296
+DIST portage-2.1.4.1.patch.bz2 8284 RMD160 f76fc99eb1dedcba1ffa9f555d0bd6a2714a1dbb SHA1 99f191f1264db5a0d3a05bac3bd0fd8a9fefb745 SHA256 f0f7df59058289a485de2abb531ab5b1c2ea04d56d7c11c16ad6079f0f3b0ab9
 DIST portage-2.1.4.tar.bz2 360454 RMD160 d320cbe7de572989b319326e442f4b5f28579179 SHA1 eedc99e9de390fddadcc2df77e8f9ed67e607e2b SHA256 a10b4b9f9855bc2b340b6d9080d8d423cd3249bfad34aaf0c52b4b70f798ae11
 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
@@ -16,6 +20,14 @@ EBUILD portage-2.0.51.22-r3.ebuild 5693 RMD160 85e119fa96f372b25ae327c8e49fb3f7d
 EBUILD portage-2.1.1-r2.ebuild 7170 RMD160 9a9ea70cce0cc5c21ccf67faee9c9d75065d6f57 SHA1 33ca63714b9e013a4d6a2cf1e52fb9b62f1cc6bf SHA256 3c3c6eb2c2fabeb84f58ebd71b39148899d529b4fc0a95ba5cb31d9dbf239f44
 EBUILD portage-2.1.2.12.ebuild 7162 RMD160 0ebd1478ae7a714a0b335a4332a8e8e9b9cd59db SHA1 8319c254bfd74a692c0a63f003d2dadff90d8e00 SHA256 40d1cd368f5d3c88c3cfae61494a1b8e114ff00a8b24fc6e92747bd94bc07b14
 EBUILD portage-2.1.3.19.ebuild 8091 RMD160 07a87968b6d25a92651c76e12c25f45548b6ee43 SHA1 798289cbf8e6ef7629cb25b66308d7e03df70f41 SHA256 e4748e7ac1ec9390d222eba037ef49bddc1765b8c29feb634401508342eb485e
+EBUILD portage-2.1.4.1.ebuild 8129 RMD160 938ea7274e635f045486801fe17fedb10f060568 SHA1 cf0d630783bcdb1131856abf1e7c14e0badf246f SHA256 40d4f745afd6cf6cecf9eae3e11dfff2b3c641ef71974da9abb4449e51302f6f
 EBUILD portage-2.1.4.ebuild 7692 RMD160 512e2a59b1e5baf21b38c196c8ec6e46c5b89df1 SHA1 3c1071f412999f7e5a6fad2d31d3eae9a5c1517b SHA256 074f4ba430698c00e210965a4390e4074fbb4ec2b46bb486f574b3b2a93911c2
-MISC ChangeLog 16535 RMD160 4719c7ab5c87a3fba2ec167708be348082506495 SHA1 d645e1029e0f6d5d32e3c0ee1547e4227b2aec54 SHA256 1096f2431d479e51becb1c28b68207e5224e6f8d7f02955f8fca5822bc60f5a2
+MISC ChangeLog 17129 RMD160 fee400993d8d4c25ab1d7dc0ff5f683415ca73b2 SHA1 06f4aeaaa9f24956d5fc180a20d156f7036a731f SHA256 b2d54472d2e1bf1bb65caf74ffafc8d6ae5988f882f4681ae2dd0797ef4f43cc
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHoq5+/ejvha5XGaMRAkh4AJ9QGo+nNHTADZ9dn2SvmXphQbY/kwCfSqu5
+C9+VOUl/CC6UWK53IK34c6Q=
+=SWx5
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.4.1.ebuild b/sys-apps/portage/portage-2.1.4.1.ebuild
new file mode 100644
index 000000000000..72d497cee2ba
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.4.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.4.1.ebuild,v 1.1 2008/02/01 05:29:59 zmedico Exp $
+
+inherit toolchain-funcs eutils flag-o-matic multilib
+
+DESCRIPTION="Portage is the 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"
+IUSE="build doc epydoc selinux linguas_pl"
+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
+		>=app-shells/bash-3.2_p17 )
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
+	elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 !mips? ( >=sys-apps/sandbox-1.2.18.1-r2 ) )
+	>=app-misc/pax-utils-0.1.13
+	selinux? ( >=dev-python/python-selinux-2.16 )"
+PDEPEND="
+	doc? (
+		|| ( app-portage/eclass-manpages app-portage/portage-manpages )
+	)
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+		|| ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# rsync-2.6.4 rdep is for the --filter option #167668
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV="2.1.4"
+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="${PV}"
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	${SRC_ARCHIVES}/${PN}-${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}-${TARBALL_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}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
+		die "Failed to patch portage.VERSION"
+	eend 0
+	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 doc; then
+		cd "${S}"/doc
+		touch fragment/date
+		sed -i "s/svn-trunk/${PVR}/" fragment/version
+		make xhtml 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/::" \
+			 -e 's:/:.:g')" || die "error listing modules"
+		PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \
+			-qqqqq --no-frames --show-imports \
+			--name "${PN}" --url "${HOMEPAGE}" \
+			${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
+
+	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
+	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
+
+	local mydir
+	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 doc && dohtml "${S}"/doc/*.html
+	use epydoc && dohtml -r "${WORKDIR}"/api
+
+	dodir /usr/bin
+	local x
+	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
+	dosym env-update /usr/sbin/update-env
+	dosym etc-update /usr/sbin/update-etc
+
+	dodir /etc/portage
+	keepdir /etc/portage
+
+	echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd
+	doenvd "${WORKDIR}"/05portage.envd
+}
+
+pkg_preinst() {
+	if ! use build && ! has_version dev-python/pycrypto && \
+		has_version '>=dev-lang/python-2.5' ; then
+		if ! built_with_use '>=dev-lang/python-2.5' ssl ; then
+			echo "If you are a Gentoo developer and you plan to" \
+			"commit ebuilds with this system then please install" \
+			"pycrypto or enable python's ssl USE flag in order" \
+			"to enable RMD160 hash support. See bug #198398 for" \
+			"more information." | \
+			fmt -w 70 | while read line ; do ewarn "${line}" ; done
+		fi
+	fi
+	local portage_base="/usr/$(get_libdir)/portage"
+	if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
+		rm -rf "${D}"/${portage_base}/pym/*
+		mv "${D}"/${portage_base}/bin/tbz2tool "${T}"
+		rm -rf "${D}"/${portage_base}/bin/*
+		mv "${T}"/tbz2tool "${D}"/${portage_base}/bin/
+	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
+
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	compile_all_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym"
+
+	echo "If you have an overlay then you should remove **/files/digest-*" \
+	"files (Manifest1) because they are no longer supported. If earlier" \
+	"versions of portage will be used to generate manifests for your overlay" \
+	"then you should add a file named manifest1_obsolete to the root of the" \
+	"repository in order to disable generation of the" \
+	"Manifest1 digest files." | fmt -w 75 | while read x ; do elog "$x" ; done
+
+	portage_docs
+}
+
+pkg_postrm() {
+	remove_orphan_python_bytecodes "${ROOT}usr/$(get_libdir)/portage/pym"
+}
+
+compile_all_python_bytecodes() {
+	python -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)"
+	python -O -c "from compileall import compile_dir; compile_dir('${1}', quiet=True)"
+}
+
+remove_orphan_python_bytecodes() {
+	[[ -d ${1} ]] || return
+	find "${1}" -name '*.py[co]' -print0 | \
+	while read -d $'\0' f ; do
+		src_py=${f%[co]}
+		[[ -f ${src_py} ]] && continue
+		rm -f "${src_py}"[co]
+	done
+}