21 Nov 2008; Zac Medico <zmedico@gentoo.org> ChangeLog,

  -portage-2.2_rc12.ebuild, -portage-2.2_rc13.ebuild:
  Remove old versions and prune old ChangeLog entries.

*portage-2.2_rc15 (21 Nov 2008)

  21 Nov 2008; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc15.ebuild:
  2.2_rc15 bump. This fixes bugs #173284 (make etc-update ignore hidden
  dirs), #216190 (don't install file names containing newlines), #236207
  (fix hardcoded colors), #236683 (handle permission denied for ebuild
  command), #236714 (handle PortagePackageException for ebuild command),
  #243022 (handle broken symlinks when merging directories), #244485
  (document EAPI 2 in ebuild man page), #245716 (ignore 'command not
  found' from configure scripts), #245779 (document new PKGDIR layout),
  #246451 (fix @security IndexError), #246667 (allow repoman vcs option
  customization), #246821 (fix TypeError when PORTAGE_BINHOST is unset),
  #246853 (send output to stderr consistently for installed masked
  packages), #247370 (don't lock build dir in --fetchonly mode), #247625
  (fix PORTAGE_IONICE_COMMAND docs), #247776 (warn if CONFIG_PROTECT is
  empty), #248053 (fix inappropriate interaction of blockers with || deps),
  #248059 (handle invalid deps with --depclean). Bug #210077 tracks all
  bugs fixed since 2.1.5.x.
(Portage version: 2.2_rc15/cvs/Linux 2.6.27-1111-x86-64 i686)

3 files changed, 28 insertions, 531 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index d37c45078a6f..ebe214540d11 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,29 @@
 # 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.550 2008/11/11 22:09:04 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.551 2008/11/22 05:43:45 zmedico Exp $
+
+  21 Nov 2008; Zac Medico <zmedico@gentoo.org> ChangeLog,
+  -portage-2.2_rc12.ebuild, -portage-2.2_rc13.ebuild:
+  Remove old versions and prune old ChangeLog entries.
+
+*portage-2.2_rc15 (21 Nov 2008)
+
+  21 Nov 2008; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc15.ebuild:
+  2.2_rc15 bump. This fixes bugs #173284 (make etc-update ignore hidden
+  dirs), #216190 (don't install file names containing newlines), #236207
+  (fix hardcoded colors), #236683 (handle permission denied for ebuild
+  command), #236714 (handle PortagePackageException for ebuild command),
+  #243022 (handle broken symlinks when merging directories), #244485
+  (document EAPI 2 in ebuild man page), #245716 (ignore 'command not
+  found' from configure scripts), #245779 (document new PKGDIR layout),
+  #246451 (fix @security IndexError), #246667 (allow repoman vcs option
+  customization), #246821 (fix TypeError when PORTAGE_BINHOST is unset),
+  #246853 (send output to stderr consistently for installed masked
+  packages), #247370 (don't lock build dir in --fetchonly mode), #247625
+  (fix PORTAGE_IONICE_COMMAND docs), #247776 (warn if CONFIG_PROTECT is
+  empty), #248053 (fix inappropriate interaction of blockers with || deps),
+  #248059 (handle invalid deps with --depclean). Bug #210077 tracks all
+  bugs fixed since 2.1.5.x.
 
 *portage-2.2_rc14 (11 Nov 2008)
 
@@ -192,231 +215,6 @@
   -portage-2.2_pre8.ebuild, +portage-2.2_rc1.ebuild:
   First release candidate of portage-2.2
 
-*portage-2.1.5.6 (17 Jun 2008)
-
-  17 Jun 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5.6.ebuild:
-  2.1.5.6 bump. This fixes bug #223417 (random KeyError during merge
-  phase with <python-2.5). Bug #216231 tracks all bugs fixed since
-  2.1.4.x.
-
-  16 Jun 2008; Zac Medico <zmedico@gentoo.org>
-  portage-2.1.5.5.ebuild, portage-2.2_pre7-r1.ebuild,
-  portage-2.2_pre8.ebuild:
-  Bug #223417 - Temporarily bump the python dep to >=python-2.5 for
-  float mtime support. This dep can revert to python-2.4 when bug
-  #223417 is fixed.
-
-*portage-2.1.5.5 (12 Jun 2008)
-
-  12 Jun 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5.5.ebuild:
-  2.1.5.5 bump. This release has support for package contents indexing,
-  to optimize owner lookups for things like `portageq owners`. You may
-  notice an abnormally large amount of disk activity when the package
-  contents are indexed for the first time (triggered after a few merges
-  or when a file collision occurs). There are two new repoman checks
-  called 'inherit.autotools' and 'IUSE.undefined' (bug #224271). A
-  KeyError triggered by ROOT definition in make.conf is fixed. Keyword
-  mask warnings for installed package are suppressed in some more cases
-  (bug #225767). Bug #216231 tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.2_pre8 (10 Jun 2008)
-
-  10 Jun 2008; Marius Mauch <genone@gentoo.org> +portage-2.2_pre8.ebuild:
-  Add another testrelease to fix bugs #223591 and #220671, and to sync
-  features with 2.1
-
-*portage-2.1.5.4 (05 Jun 2008)
-
-  05 Jun 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5.4.ebuild:
-  2.1.5.4 bump. This fixes bug #224713 (unhandled TypeError exception
-  when make.conf is missing). Mask warnings for installed packages (from
-  bug #223447) should be less annoying now since they are triggered less
-  frequently. A bash regular expression inside 'doman' is fixed for
-  compatibility with FreeBSD (regression from 2.1.5.3). Bug #216231
-  tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.2_pre7-r1 (02 Jun 2008)
-
-  02 Jun 2008; Marius Mauch <genone@gentoo.org> -portage-2.2_pre3.ebuild,
-  -portage-2.2_pre5.ebuild, -portage-2.2_pre6.ebuild,
-  -portage-2.2_pre7.ebuild, +portage-2.2_pre7-r1.ebuild:
-  Fix several critical bugs in the NEEDED conversion code, requiring all
-  NEEDED.ELF.2 files to be regenerated.
-
-*portage-2.1.5.3 (01 Jun 2008)
-
-  01 Jun 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5.3.ebuild:
-  2.1.5.3 bump. This fixes bugs #223417 (KeyError in merge phase),
-  #223447 (depclean removes newly installed packages), and #223685
-  (elog messages lost after build failure). Bug #216231 tracks all
-  bugs fixed since 2.1.4.x.
-
-  29 May 2008; Ali Polatel <hawking@gentoo.org> portage-2.2_pre3.ebuild,
-  portage-2.2_pre5.ebuild, portage-2.2_pre6.ebuild, portage-2.2_pre7.ebuild:
-  python_mod_{cleanup,optimize} are ROOT aware.
-
-  23 May 2008; Zac Medico <zmedico@gentoo.org> portage-2.2_pre7.ebuild:
-  Stop building and installing tbz2tool for Bug #220701.
-
-*portage-2.2_pre7 (22 May 2008)
-
-  22 May 2008; Marius Mauch <genone@gentoo.org> +portage-2.2_pre7.ebuild:
-  Adding new (last?) testrelease snapshot, removing bogus notifications
-  about preserved libs.
-
-*portage-2.1.5.2 (20 May 2008)
-
-  20 May 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5.2.ebuild:
-  2.1.5.2 bump. This fixes a regression which prevented sys-apps/portage
-  updates from being promoted to the front of the merge list. There are
-  a few other small fixes, including bug #222623. Bug #216231 tracks all
-  bugs fixed since 2.1.4.x.
-
-*portage-2.1.5 (14 May 2008)
-
-  14 May 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5.ebuild:
-  2.1.5 release. This fixes bugs #220533, #221537, and #221755.
-  Bug #216231 tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.1.5_rc10 (10 May 2008)
-
-  10 May 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc10.ebuild:
-  2.1.5_rc10 bump. This fixes the KeyError reported in bug #221107,
-  comment #4. Also, satisfied blockers are now shown in the merge list
-  in any case when blocking packages will be temporarily installed
-  simultaneously. For Bug #220701, the ebuild no longer installs tbz2tool.
-  Bug #216231 tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.1.5_rc9 (09 May 2008)
-
-  09 May 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc9.ebuild:
-  2.1.5_rc9 bump. This fixes bugs #221053 (enable --skipfirst as a means
-  to bypass digest failures), #221071 (merge list displayed twice), and
-  #221107 (KeyError triggered by blockers). Bug #216231 tracks all bugs
-  fixed since 2.1.4.x.
-
-*portage-2.1.5_rc8 (09 May 2008)
-
-  09 May 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc8.ebuild:
-  2.1.5_rc8 bump. This includes support for having packages that block
-  eachother temporarily installed at the same time, which requires
-  special handling of file collisions. Also fixed are bugs #220341
-  (unnecessary reinstall of multislot packages), #220689 (unnecessary
-  downgrades), #220775 (dodoc calls vecho unsuccessfully), and #220987
-  (UnboundLocalError during dep calculations for alternate ROOT).
-  Bug #216231 tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.1.5_rc7 (06 May 2008)
-
-  06 May 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc7.ebuild:
-  2.1.5_rc7 bump. The most notable bug fixed in this release is #172812.
-  Blockers are now resolved automatically in cases when it makes
-  sense to uninstall a conflicting package. Automatically uninstalled
-  packages are displayed in the merge list, marked "uninstall" and
-  highlighted in red. Other bugs fixed in this release include #172812,
-  #211833, #218854, #219286, #219294, #219369, #219837, #219918, #219957,
-  and #220171. Bug #216231 tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.2_pre6 (05 May 2008)
-
-  05 May 2008; Marius Mauch <genone@gentoo.org> +portage-2.2_pre6.ebuild:
-  New testrelease including rewritten support for FEATURES=preserve-libs and
-  several updates regarding package set handling
-
-*portage-2.1.5_rc6 (21 Apr 2008)
-
-  21 Apr 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc6.ebuild:
-  2.1.5_rc6 bump. The metadata-transfer feature is now disabled by default.
-  This disables the "Updating Portage cache" routine that used to run at
-  the tail end of each `emerge --sync` operation. If you use something like
-  the sqlite module and want to keep all metadata in that format alone
-  (useful for querying), enable FEATURES="metadata-transfer" in make.conf.
-  Also fixed in this release are bugs #218439 (emerge --help formatting)
-  and #218559 (sandbox violations in /var/cache/edb/dep by portage api
-  consumers). Bug #216231 tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.1.5_rc5 (19 Apr 2008)
-
-  19 Apr 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc5.ebuild:
-  2.1.5_rc5 bump. This fixes bug #217905 (broken evaluation of conditionals
-  in SRC_URI), bug #218202 (unwanted spinner output with --nodeps), and
-  also fixes spurious permission adjustments from bug #162542. Bug #216231
-  tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.1.5_rc4 (15 Apr 2008)
-
-  15 Apr 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc4.ebuild:
-  2.1.5_rc4 bump. The dependency resolver now has a feedback mechanism that
-  helps make atom selections more consistent with previous selections that
-  have been added to the graph. This solves some common cases of bug #1343
-  such as the issue with kaffe pulling in an unnecessary jdk slot in bug
-  #163801. Also fixed is bug #217664. Bug #216231 tracks all bugs fixed
-  since 2.1.4.x.
-
-*portage-2.1.5_rc3 (12 Apr 2008)
-
-  12 Apr 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc3.ebuild:
-  2.1.5_rc3 bump. Unlike earlier 2.1.5_rc releases, emerge is now fixed
-  to automatically downgrade masked packages when appropriate (solves a
-  side effect from the fix for bug #197810). Also fixed are bugs #162542,
-  #197905, #215016, #217122, and #217444. Bug #216231 tracks all bugs
-  fixed since 2.1.4.x.
-
-*portage-2.1.5_rc2 (05 Apr 2008)
-
-  05 Apr 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc2.ebuild:
-  2.1.5_rc2 bump for bug #216328 (fix broken --newuse).
-
-*portage-2.1.5_rc1 (04 Apr 2008)
-
-  04 Apr 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.5_rc1.ebuild:
-  2.1.5_rc1 release. In the event that a previously installed package has
-  since been masked, emerge will no longer perform an automatic downgrade
-  as part of a "world" update. You should either unmask such packages or
-  else explicitly re-merge them in order to have them dowgraded to an
-  unmasked version. Bug #216231 tracks all bugs fixed since 2.1.4.x.
-
-*portage-2.2_pre5 (19 Mar 2008)
-
-  19 Mar 2008; Marius Mauch <genone@gentoo.org> -portage-2.2_pre4.ebuild,
-  +portage-2.2_pre5.ebuild:
-  New test release, implementing solutions for bugs #213790, #213592, #212152,
-  #211949 and more.
-
-*portage-2.2_pre4 (09 Mar 2008)
-
-  09 Mar 2008; Marius Mauch <genone@gentoo.org> +portage-2.2_pre4.ebuild:
-  Another prerelease, most important changes are the removal of manifest1 support
-  and a potential data corruption issue with elog messages (bug #212055). 
-  Other minor fixes include bug #212152, bug #97776, bug #211949 and bug #212080.
-
-*portage-2.2_pre3 (28 Feb 2008)
-
-  28 Feb 2008; Marius Mauch <genone@gentoo.org> -portage-2.2_pre2.ebuild,
-  +portage-2.2_pre3.ebuild:
-  Bump 2.2 test release to bring it back in line with 2.1 releases 
-  regarding bugfixes/features. Change epydoc dependency to avoid
-  a traceback during API doc generation with >=epydoc-3.
-
-  15 Feb 2008; Brent Baude <ranger@gentoo.org> portage-2.1.4.4.ebuild:
-  stable ppc64, bug 210031
-
-  14 Feb 2008; nixnut <nixnut@gentoo.org> portage-2.1.4.4.ebuild:
-  Stable on ppc wrt bug 210031
-
-  14 Feb 2008; Santiago M. Mola <coldwind@gentoo.org>
-  portage-2.1.4.4.ebuild:
-  amd64 stable wrt bug #210031
-
-  14 Feb 2008; Jeroen Roovers <jer@gentoo.org> portage-2.1.4.4.ebuild:
-  Stable for HPPA (bug #210031).
-
-  14 Feb 2008; Raúl Porcel <armin76@gentoo.org> portage-2.1.4.4.ebuild:
-  alpha/ia64/sparc stable wrt #210031
-
-  13 Feb 2008; Dawid Węgliński <cla@gentoo.org> portage-2.1.4.4.ebuild:
-  Stable on x86 (bug #210031)
-
 *portage-2.1.4.4 (12 Feb 2008)
 
   12 Feb 2008; Zac Medico <zmedico@gentoo.org> +portage-2.1.4.4.ebuild:
diff --git a/sys-apps/portage/portage-2.2_rc13.ebuild b/sys-apps/portage/portage-2.2_rc13.ebuild
deleted file mode 100644
index a7f65ae2a6dd..000000000000
--- a/sys-apps/portage/portage-2.2_rc13.ebuild
+++ /dev/null
@@ -1,301 +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.2_rc13.ebuild,v 1.1 2008/11/02 00:50:14 zmedico Exp $
-
-inherit eutils multilib python
-
-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"
-
-python_dep=">=dev-lang/python-2.4"
-
-DEPEND="${python_dep}
-	!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="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-news-20071201 )
-	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.17
-	selinux? ( >=dev-python/python-selinux-2.16 )"
-PDEPEND="
-	!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"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV="2.2_rc1"
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_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
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-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/__init__.py || \
-		die "Failed to patch portage.VERSION"
-}
-
-src_compile() {
-
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		make xhtml xhtml-nochunks || die "failed to make docs"
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules epydoc_opts=""
-		# A name collision between the portage.dbapi class and the
-		# module with the same name triggers an epydoc crash unless
-		# portage.dbapi is excluded from introspection.
-		has_version '>=dev-python/epydoc-3_pre0' && \
-			epydoc_opts='--exclude-introspect portage\.dbapi'
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g' | sort)" || die "error listing modules"
-		PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \
-			-qqqqq --no-frames --show-imports $epydoc_opts \
-			--name "${PN}" --url "${HOMEPAGE}" \
-			${my_modules} || die "epydoc failed"
-	fi
-}
-
-src_test() {
-	./pym/portage/tests/runTests || \
-		die "test(s) failed"
-}
-
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/portage"
-	local portage_share_config=/usr/share/portage/config
-
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf
-
-	dodir "${portage_share_config}"
-	insinto "${portage_share_config}"
-	doins "${S}/cnf/"{sets.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
-
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	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 *
-	dosym newins ${portage_base}/bin/donewins
-
-	local symlinks
-	for mydir in $(find "${S}"/pym -type d | sed -e "s:^${S}/::") ; do
-		dodir ${portage_base}/${mydir}
-		insinto ${portage_base}/${mydir}
-		cd "${S}"/${mydir}
-		doins *.py
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		[ -n "${symlinks}" ] && cp -P ${symlinks} "${D}${portage_base}/${mydir}"
-	done
-
-	# Symlinks to directories cause up/downgrade issues and the use of these
-	# modules outside of portage is probably negligible.
-	for x in "${D}${portage_base}/pym/"{cache,elog_modules} ; do
-		[ ! -L "${x}" ] && continue
-		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-	done
-
-	exeinto ${portage_base}/pym/portage/tests
-	doexe  "${S}"/pym/portage/tests/runTests
-
-	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,NEWS,RELEASE-NOTES}
-	use doc && dohtml -r "${S}"/doc/*
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	dodir /usr/bin
-	for x in ebuild emerge portageq repoman 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
-}
-
-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
-			ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-			ewarn "with this system then please install dev-python/pycrypto or"
-			ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order"
-			ewarn "to enable RMD160 hash support."
-			ewarn "See bug #198398 for more information."
-		fi
-	fi
-	if [ -f "${ROOT}/etc/make.globals" ]; then
-		rm "${ROOT}/etc/make.globals"
-	fi
-
-	has_version ">=${CATEGORY}/${PN}-2.2_alpha"
-	MINOR_UPGRADE=$?
-
-	has_version "<=${CATEGORY}/${PN}-2.2_pre5"
-	WORLD_MIGRATION_UPGRADE=$?
-
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7"
-	NEEDED_REBUILD_UPGRADE=$?
-
-	has_version "<${CATEGORY}/${PN}-2.2_alpha"
-	ADD_SYSTEM_TO_WORLD=$?
-
-	if [ $ADD_SYSTEM_TO_WORLD != 0 -a "$ROOT" != / ] && \
-		! has_version "${CATEGORY}/${PN}" ; then
-		# building stage 1
-		ADD_SYSTEM_TO_WORLD=0
-	fi
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
-
-	if [ $ADD_SYSTEM_TO_WORLD = 0 ] && \
-		[ ! -e "$ROOT"var/lib/portage/world_sets ] ; then
-		einfo "adding @system to world_sets for backward compatibility"
-		echo @system > "$ROOT"var/lib/portage/world_sets
-	fi
-
-	if [ $WORLD_MIGRATION_UPGRADE = 0 ] ; then
-		einfo "moving set references from the worldfile into world_sets"
-		cd "${ROOT}/var/lib/portage/"
-		grep "^@" world >> world_sets
-		sed -i -e '/^@/d' world
-	fi
-
-	if [ $NEEDED_REBUILD_UPGRADE = 0 ] ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		for cpv in "${ROOT}/var/db/pkg"/*/*; do
-			if [ -f "${cpv}/NEEDED" ]; then
-				rm -f "${cpv}/NEEDED.ELF.2"
-				while read line; do
-					filename=${line% *}
-					needed=${line#* }
-					needed=${needed//+/++}
-					needed=${needed//#/##}
-					needed=${needed//%/%%}
-					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
-					newline=${newline//  -  }
-					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-				done < "${cpv}/NEEDED"
-			fi
-		done
-	fi
-
-	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
-
-	if [ $MINOR_UPGRADE = 0 ] ; then
-		elog "If you're upgrading from a pre-2.2 version of portage you might"
-		elog "want to remerge world (emerge -e world) to take full advantage"
-		elog "of some of the new features in 2.2."
-		elog "This is not required however for portage to function properly."
-		elog
-	fi
-
-	if [ -z "${PV/*_pre*}" ]; then
-		elog "If you always want to use the latest development version of portage"
-		elog "please read http://www.gentoo.org/proj/en/portage/doc/testing.xml"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2_rc12.ebuild b/sys-apps/portage/portage-2.2_rc15.ebuild
index 2a58a742609a..02483ba84ecb 100644
--- a/sys-apps/portage/portage-2.2_rc12.ebuild
+++ b/sys-apps/portage/portage-2.2_rc15.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.2_rc12.ebuild,v 1.1 2008/10/09 21:34:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc15.ebuild,v 1.1 2008/11/22 05:43:45 zmedico Exp $
 
 inherit eutils multilib python
 
@@ -49,13 +49,13 @@ prefix_src_archives() {
 
 PV_PL="2.1.2"
 PATCHVER_PL=""
-TARBALL_PV="2.2_rc1"
+TARBALL_PV="2.2_rc15"
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
 	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
 	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
 		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
 
-PATCHVER=${PV}
+PATCHVER=
 if [ -n "${PATCHVER}" ]; then
 	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
 	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
@@ -91,7 +91,7 @@ src_compile() {
 		# A name collision between the portage.dbapi class and the
 		# module with the same name triggers an epydoc crash unless
 		# portage.dbapi is excluded from introspection.
-		has_version '>=dev-python/epydoc-3_pre0' && \
+		ROOT=/ has_version '>=dev-python/epydoc-3_pre0' && \
 			epydoc_opts='--exclude-introspect portage\.dbapi'
 		my_modules="$(find "${S}/pym" -name "*.py" \
 			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \