2.1.4.4 bump. This fixes bug #209768 (missing digest triggers emerge

--search traceback). Bug #200044 tracks all bugs fixed since 2.1.3.x.

Remove old 2.1.4.x ebuilds.
Package-Manager: portage-2.1.4.4

5 files changed, 14 insertions, 544 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 3e69013ad420..e51a4c9e0d9d 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # 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.494 2008/02/11 00:29:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.495 2008/02/12 06:18:34 zmedico Exp $
+
+*portage-2.1.4.4 (12 Feb 2008)
+
+  12 Feb 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.4.4.ebuild:
+  2.1.4.4 bump. This fixes bug #209768 (missing digest triggers emerge
+  --search traceback). Bug #200044 tracks all bugs fixed since 2.1.3.x.
 
 *portage-2.1.4.3 (11 Feb 2008)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ffd30eb0e315..a036e998ac19 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -11,9 +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.2.patch.bz2 14599 RMD160 5b447579083ebd0f27c23fe32a8d7a34eb09da2a SHA1 12e7aad84ef0321536bb2d8e253a1df5a3384783 SHA256 89ff7750f81ad76a74a8d2bcf4b12707c35f8bed039217a345b3c84fad00fda9
-DIST portage-2.1.4.3.patch.bz2 14994 RMD160 ae6aed49ed4eba294b67c985d35b859f6cb2086d SHA1 f5dd50ae7055cbc45d127de2372161e4dddf2ce2 SHA256 b83bfeae64c7f8c480da75ea7bada5f3ba31a2321303aff919ef8185ea4c0204
+DIST portage-2.1.4.4.patch.bz2 15469 RMD160 c5fb833e97f4fced0d9c4b72056693f4b092fa51 SHA1 ebed38fd327e06c36d4b68a82ae205b65a7f1ebc SHA256 f832e388fe308f398597a0d0c5a0918898b7f06c9f146e7b105de40cff235803
 DIST portage-2.1.4.tar.bz2 360454 RMD160 d320cbe7de572989b319326e442f4b5f28579179 SHA1 eedc99e9de390fddadcc2df77e8f9ed67e607e2b SHA256 a10b4b9f9855bc2b340b6d9080d8d423cd3249bfad34aaf0c52b4b70f798ae11
 DIST portage-2.2_pre2.tar.bz2 520848 RMD160 cf3c4e8b3a6bae7dc28a2fb230f5af0a26ba853b SHA1 3986e241b0d4879fae67c1cc71f935a936159c09 SHA256 25dd1f5b5647d8cb84678d842cb12ea6cf894601b852059322ec375f990be31a
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
@@ -23,16 +21,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.2.ebuild 8129 RMD160 20d36424f71039fabbd74323e2a165e8e0a2b7a0 SHA1 024a43ddbd32e3f1230f2d03d27f319da548b3fc SHA256 131f71fddf14705c0db5a4e1dcb5a9ab346e985e561045a01f947a2e39cc249c
-EBUILD portage-2.1.4.3.ebuild 8129 RMD160 abe7d99bfc167549c3da4a3589053af98fa28582 SHA1 4c154e2fc6a47f8b4c6a24002142a450481651d3 SHA256 2c5e43437b26fabeb80f2052ba047eb23c9ce2556cda7d132b3dcbc1c4735c8a
+EBUILD portage-2.1.4.4.ebuild 8129 RMD160 6285f6ca7fc09e7a1a9e38887a5e5fdee76a1de5 SHA1 d339c24fcdaf1d781c4f754d30c30c00aa27aaba SHA256 ec5d261e5a22905ac17d6f4c78b3f2b1340088a94c4efa8268fec57d9a2d8c8e
 EBUILD portage-2.2_pre2.ebuild 7508 RMD160 57f8bda92f9370222436156bc5db7021542d2de8 SHA1 90da67ba5076da9454c5a0ad39e54c624e7f564b SHA256 22174a696b6b2b0c79f1670462fe89c460a9890b1a0b521577ef21d4b1e41842
-MISC ChangeLog 17924 RMD160 18380f2a9c05a41d3a3c1cd359aa7d54ccbeb5b6 SHA1 19c057180388a4751b42b18d50a991fe1702db89 SHA256 ae1c3edff32efa79c6a64cef09804d64f5f8f6ab42e911526fad252e727ab902
+MISC ChangeLog 18172 RMD160 27f809a491e9ddae436b75709f6b7f5a9ada8bff SHA1 985b1025e30ceb850be1a125b0b32e588e217a04 SHA256 17987ec73dfc12e7156daddc422f3e678a48d0cb41325ea88d852444db95b7bb
 MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHr5cX/ejvha5XGaMRAkWyAJ9h0L33swCm31DfDX9S47y0gL+HWgCePzsc
-grXVrH9Cu/1r62TZj5zuaUg=
-=YHBo
+iD8DBQFHsTpi/ejvha5XGaMRAnZBAJ0cfejG43rQKCMn3uIMn9lNIlsqvQCg7kXq
+QfDkd+hDT8g8uVkik5FF8+8=
+=vA1p
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.4.2.ebuild b/sys-apps/portage/portage-2.1.4.2.ebuild
deleted file mode 100644
index f50c377714b4..000000000000
--- a/sys-apps/portage/portage-2.1.4.2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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.2.ebuild,v 1.1 2008/02/10 07:43:56 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
-}
diff --git a/sys-apps/portage/portage-2.1.4.3.ebuild b/sys-apps/portage/portage-2.1.4.3.ebuild
deleted file mode 100644
index 6e8ffdbf914d..000000000000
--- a/sys-apps/portage/portage-2.1.4.3.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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.3.ebuild,v 1.1 2008/02/11 00:29:43 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
-}
diff --git a/sys-apps/portage/portage-2.1.4.1.ebuild b/sys-apps/portage/portage-2.1.4.4.ebuild
index 72d497cee2ba..a23f002c0fdc 100644
--- a/sys-apps/portage/portage-2.1.4.1.ebuild
+++ b/sys-apps/portage/portage-2.1.4.4.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.4.4.ebuild,v 1.1 2008/02/12 06:18:34 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic multilib