summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-31 04:27:08 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-31 04:27:08 +0000
commitbc9a03cf2c38e7b1254270bb01389b9e849c029d (patch)
tree5630a2a043ecb95c5ec34231651843bfedb40d27 /sys-apps
parentBug #289967 - Block >=debugedit-4.4.6-r2 for portage versions that aren't com... (diff)
downloadhistorical-bc9a03cf2c38e7b1254270bb01389b9e849c029d.tar.gz
historical-bc9a03cf2c38e7b1254270bb01389b9e849c029d.tar.bz2
historical-bc9a03cf2c38e7b1254270bb01389b9e849c029d.zip
*portage-2.2_rc47 (31 Oct 2009)
31 Oct 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc47.ebuild: 2.2_rc47 bump. This includes all fixes in 2.1.7.2 and also fixes bug #266454 (make @world all-inclusive, and add @selected set for user-selected world atoms). *portage-2.1.7.2 (31 Oct 2009) 31 Oct 2009; Zac Medico <zmedico@gentoo.org> +portage-2.1.7.2.ebuild: 2.1.7.2 bump. This fixes bug #134466 (new --ask-enter-invalid option), bug #227225 (repoman check for ~ operator with explicit revision), bug #259697 (fix repoman docs for GLEP 56), bug #287869 (--select[=n] option that is inverse of --oneshot), bug #288863 (sandbox violations with /dev/std*), bug #288906 (show file collisions in build log), bug #289068 (KeyError related to ACCEPT_LICENSE), bug #289967 (installsources fix for >=debugedit-4.4.6-r2), bug #290428 (update /var/db/pkg mtime for each modification), and bug #290625 (UnicodeEncodeError displaying unicode with python3). Bug #288499 tracks all bugs fixed since 2.1.6.x. Package-Manager: portage-2.2_rc47/cvs/Linux i686
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/ChangeLog23
-rw-r--r--sys-apps/portage/Manifest12
-rw-r--r--sys-apps/portage/portage-2.1.7.2.ebuild270
-rw-r--r--sys-apps/portage/portage-2.2_rc47.ebuild323
4 files changed, 623 insertions, 5 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 9913be0178d0..0fe808949e46 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,27 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.643 2009/10/23 03:21:04 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.644 2009/10/31 04:27:07 zmedico Exp $
+
+*portage-2.2_rc47 (31 Oct 2009)
+
+ 31 Oct 2009; Zac Medico <zmedico@gentoo.org> +portage-2.2_rc47.ebuild:
+ 2.2_rc47 bump. This includes all fixes in 2.1.7.2 and also fixes
+ bug #266454 (make @world all-inclusive, and add @selected set for
+ user-selected world atoms).
+
+*portage-2.1.7.2 (31 Oct 2009)
+
+ 31 Oct 2009; Zac Medico <zmedico@gentoo.org> +portage-2.1.7.2.ebuild:
+ 2.1.7.2 bump. This fixes bug #134466 (new --ask-enter-invalid option),
+ bug #227225 (repoman check for ~ operator with explicit revision),
+ bug #259697 (fix repoman docs for GLEP 56), bug #287869 (--select[=n]
+ option that is inverse of --oneshot), bug #288863 (sandbox violations
+ with /dev/std*), bug #288906 (show file collisions in build log),
+ bug #289068 (KeyError related to ACCEPT_LICENSE), bug #289967
+ (installsources fix for >=debugedit-4.4.6-r2), bug #290428 (update
+ /var/db/pkg mtime for each modification), and bug #290625
+ (UnicodeEncodeError displaying unicode with python3). Bug #288499 tracks
+ all bugs fixed since 2.1.6.x.
23 Oct 2009; Zac Medico <zmedico@gentoo.org> -portage-2.1.4.5.ebuild,
-portage-2.1.7.ebuild, -portage-2.2_rc41.ebuild, -portage-2.2_rc42.ebuild,
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8a8f86bf9fa8..f92bde98f84c 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,23 +6,27 @@ DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb
DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
DIST portage-2.1.7.1.patch.bz2 7681 RMD160 c60890c0938aa24a82986fa02332dc88df2a7af3 SHA1 d6dee9eb822dc16d1ab2b6e4904b07b8216dad70 SHA256 c41a6dcdc257015b9e4c38f630e7fe9062a2b95affb131ec50c117ef53e512a0
+DIST portage-2.1.7.2.patch.bz2 39220 RMD160 e36cac339998832775d79953c62d4bee1991a8be SHA1 53a44629829c1b1186ce59d57e40855cbd5eab34 SHA256 0644a0a75ee2440645e8a18fb9159fa75e61ce5f337ad27c74928b4111b5f38a
DIST portage-2.1.7.tar.bz2 503459 RMD160 245d2b3d778b235e3814ea551a6115e8075d1da5 SHA1 db5b96dfd147954909331f58e24620c41df117e3 SHA256 62f7af85db0090afd424cb398d4b6b434ff1751c77e524dc8a1480e796f28599
DIST portage-2.2_rc15.tar.bz2 685597 RMD160 ad814885c5c6b31899fd4cd7d5866d19132bbd9b SHA1 3b562f0a4157f2cc1cf492f46560e2600ec0681f SHA256 fc381120f77338d33d2e53eb2892eebae0b772233d05cf8a2443700d3d6754f6
DIST portage-2.2_rc33.patch.bz2 200577 RMD160 48d46b6d103009087f0d296d9a428eb3e8059d7b SHA1 9a47ec278362741f2d12c030dc395f4323a974ad SHA256 b8e69329c6cc7b4516f5ed74efa648d1fb8392b644239f5bb4f7cec7a0cdd76e
DIST portage-2.2_rc43.tar.bz2 527984 RMD160 3a0c69d0e008bbc50a0f66191820291477507013 SHA1 473e7941d6a29a0a6621267c1e8f55ecf4038b55 SHA256 85ecd07050baa4c86da8215c287d5ff6313a1d49dc6bc2d0d75acb2718cbcd22
DIST portage-2.2_rc46.patch.bz2 27311 RMD160 ea3eb1af5c1be558011ba1ef8d39b6b9610a5aca SHA1 c773e1dc3ba9444eaddea9bf87e3fb3743faa392 SHA256 3bf6222c2d3bcacb689290ccfd1982070337a5b0f1837d9b1fba0e20242afbf9
+DIST portage-2.2_rc47.patch.bz2 58298 RMD160 6b95443157fda233da3420f7568f219ff5bf7d9b SHA1 a282b8abd927d44b89eed693d7984e41c52af08e SHA256 0b22c1d32925fad66c1f014e67de11e3b80e46846d351e1c867e72e5cf576425
DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
EBUILD portage-2.1.6.13.ebuild 10249 RMD160 5b09a3d3eda1bebec6634d8735697bda8289d989 SHA1 131ca76d9630d3a832f003134093a9623028e795 SHA256 e51275ed74c2fd58dd987aba0ddb06b609e733eada680c7ed94440d45cf233af
EBUILD portage-2.1.6.7.ebuild 8901 RMD160 5c40ca328a0e24bcc3b04a3c611c09f2f8248c23 SHA1 118de80c813cbd187ba33266b4bac32e43d7e46d SHA256 7478716e9c0d8e2c8deec1f5c6f47ba684b1a7efe3e5f3b9c544f28122fea300
EBUILD portage-2.1.7.1.ebuild 8563 RMD160 a4bcda24109ce8a636883549858b480f58aee16d SHA1 018bd7d65e2588f7fd7702d72be8d10373c6930b SHA256 95415c4a086320b149a5814042efe4cc27b71a47f59316e3899b687f03eadc68
+EBUILD portage-2.1.7.2.ebuild 8489 RMD160 f217e55e70f076e2c218225d4d7c9f0f8f8ac174 SHA1 baa3ad54f00e530bd2697a2c7dcb6fa04a1892f5 SHA256 3bfd266b7450ebcc5f30a4fec947f37566cc9d7f37aaaa40f2b8a21a008af7db
EBUILD portage-2.2_rc33.ebuild 10657 RMD160 cbec6b53aee00d355c8965cb967d557467705dda SHA1 91b4acc0c25014324eb0cb4c8117a8e3a47b1103 SHA256 7ac2424fea034a979caa48bc5c2596cf0a6511271b4f81b8e9c26f2aee80e4b7
EBUILD portage-2.2_rc46.ebuild 10685 RMD160 15364ab8ceb2e9e72a1c519b5ab4744edbe7e1d7 SHA1 1d2b396d63310fa87444669ecd848c7da6204261 SHA256 d80d397eb05d338f653a7aa9bfd768a6f99a2747dc5c1d4f66761b44a5f0693c
-MISC ChangeLog 45144 RMD160 ffe96becf7b36ec64347937848d08f4e35f4c444 SHA1 0c738ee86e9ff81a5155cabd4efec86bc728df9b SHA256 09a6e7db73c4f3b91603e1650392c69fa8b238b2d839b7aa5fa84379e679059c
+EBUILD portage-2.2_rc47.ebuild 10221 RMD160 2474aad9ef3593935cae2fb59fa7ab7657594885 SHA1 4591abfb149918582d120b566c61d3b00a1adf36 SHA256 1445548e9f78a250f23a06d7b1af093696e9e5903b2d602bdc6d1b781cb020b4
+MISC ChangeLog 46175 RMD160 76c6398a527f0b2f6c3c34fc78910a0b5a978bd1 SHA1 a809b2c32d1295f1dd9b77333094ab9d996eaee5 SHA256 9cff656905305a67406719510b55ab51b329dab74402feb809f0ae285c847a37
MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkrrs5YACgkQ/ejvha5XGaNKyACfU+C28gFtLY1hh8EpNNhsm4cw
-bSwAn2QA5Szohx+LMkvHkVDQXb1wTXB4
-=VVs2
+iEYEARECAAYFAkrrvN4ACgkQ/ejvha5XGaOW8gCeNMKnAVxQR6l9dpa4tOgPwcH/
+FLcAoIiwacmiaGiV2b+qGCDLga8kIFNZ
+=vIVy
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.7.2.ebuild b/sys-apps/portage/portage-2.1.7.2.ebuild
new file mode 100644
index 000000000000..10b66d1757ce
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.7.2.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.2.ebuild,v 1.1 2009/10/31 04:27:08 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+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 linguas_pl python3 selinux"
+
+python_dep="python3? ( =dev-lang/python-3* )
+ !python3? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=dev-lang/python-3 ) )"
+
+# The pysqlite blocker is for bug #282760.
+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 !<=dev-python/pysqlite-2.4.1 )"
+RDEPEND="${python_dep}
+ !build? ( >=sys-apps/sed-4.0.5
+ >=app-shells/bash-3.2_p17
+ >=app-admin/eselect-1.2 )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-1.6 )
+ elibc_uclibc? ( >=sys-apps/sandbox-1.6 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( sys-libs/libselinux )"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# 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.1.7
+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}
+
+pkg_setup() {
+ if [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') != good ]] ; then
+ die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+ fi
+}
+
+src_prepare() {
+ if [ -n "${PATCHVER}" ] ; then
+ if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+ rm "$S/bin/ebuild-helpers/portageq" \
+ || die "failed to remove portageq helper symlink"
+ fi
+ 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"
+
+ if use python3; then
+ sed -e '1s/\(^#!.*\)python\(.*$\)/\1python3\2/' -i $(find -perm /111 -type f) || die "Conversion of shebangs failed"
+ fi
+}
+
+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.
+ 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/::" \
+ -e 's:/:.:g' | sort)" || die "error listing modules"
+ PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+ epydoc -o "${WORKDIR}"/api \
+ -qqqqq --no-frames --show-imports $epydoc_opts \
+ --name "${PN}" --url "${HOMEPAGE}" \
+ ${my_modules} || die "epydoc failed"
+ fi
+}
+
+src_test() {
+ PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+ ./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 || die
+
+ dodir "${portage_share_config}"
+ insinto "${portage_share_config}"
+ doins "${S}/cnf/make.globals" || die
+ 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 || die
+ 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 || die
+ fi
+
+ dosym ..${portage_share_config}/make.globals /etc/make.globals
+
+ insinto /etc/logrotate.d
+ doins "${S}"/cnf/logrotate.d/elog-save-summary || die
+
+ # BSD and OSX need a sed wrapper so that find/xargs work properly
+ if use userland_GNU; then
+ rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+ fi
+
+ local x symlinks
+ for x in $(find "$S"/bin -type d) ; do
+ x=${x#$S/}
+ exeinto $portage_base/$x || die "exeinto failed"
+ cd "$S"/$x || die "cd failed"
+ doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \
+ die "doexe failed"
+ symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+ if [ -n "$symlinks" ] ; then
+ cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+ fi
+ done
+
+ for x in $(find "$S"/pym -type d) ; do
+ x=${x#$S/}
+ insinto $portage_base/$x || die "insinto failed"
+ cd "$S"/$x || die "cd failed"
+ doins *.py || die "doins failed"
+ symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+ if [ -n "$symlinks" ] ; then
+ cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+ fi
+ 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 egencache emerge portageq repoman ; 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.6[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.6 in order"
+ ewarn "to enable RMD160 hash support."
+ ewarn "See bug #198398 for more information."
+ fi
+ if [ -f "${ROOT}/etc/make.globals" ]; then
+ rm "${ROOT}/etc/make.globals"
+ fi
+
+ [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
+ REPO_LAYOUT_CONF_WARN=$?
+}
+
+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 [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+ ewarn
+ echo "If you want overlay eclasses to override eclasses from" \
+ "other repos then see the portage(5) man page" \
+ "for information about the new layout.conf and repos.conf" \
+ "configuration files." \
+ | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+ ewarn
+ fi
+
+ einfo
+ einfo "For help with using portage please consult the Gentoo Handbook"
+ einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+ einfo
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}
diff --git a/sys-apps/portage/portage-2.2_rc47.ebuild b/sys-apps/portage/portage-2.2_rc47.ebuild
new file mode 100644
index 000000000000..98e7990c9170
--- /dev/null
+++ b/sys-apps/portage/portage-2.2_rc47.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc47.ebuild,v 1.1 2009/10/31 04:27:08 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+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 linguas_pl python3 selinux"
+
+python_dep="python3? ( =dev-lang/python-3* )
+ !python3? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=dev-lang/python-3 ) )"
+
+# The pysqlite blocker is for bug #282760.
+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 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+RDEPEND="${python_dep}
+ !build? ( >=sys-apps/sed-4.0.5
+ >=app-shells/bash-3.2_p17
+ >=app-admin/eselect-1.2 )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( sys-libs/libselinux )"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# 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_rc43
+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}
+
+pkg_setup() {
+ if [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') != good ]] ; then
+ die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+ fi
+}
+
+src_prepare() {
+ if [ -n "${PATCHVER}" ] ; then
+ if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+ rm "$S/bin/ebuild-helpers/portageq" \
+ || die "failed to remove portageq helper symlink"
+ fi
+ 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"
+
+ if use python3; then
+ sed -e '1s/\(^#!.*\)python\(.*$\)/\1python3\2/' -i $(find -perm /111 -type f) || die "Conversion of shebangs failed"
+ fi
+}
+
+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.
+ 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/::" \
+ -e 's:/:.:g' | sort)" || die "error listing modules"
+ PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+ epydoc -o "${WORKDIR}"/api \
+ -qqqqq --no-frames --show-imports $epydoc_opts \
+ --name "${PN}" --url "${HOMEPAGE}" \
+ ${my_modules} || die "epydoc failed"
+ fi
+}
+
+src_test() {
+ PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
+ ./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 || die
+
+ insinto "${portage_share_config}"
+ doins "${S}/cnf/"{sets.conf,make.globals} || die
+ 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 || die
+ 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 || die
+ fi
+
+ dosym ..${portage_share_config}/make.globals /etc/make.globals
+
+ insinto /etc/logrotate.d
+ doins "${S}"/cnf/logrotate.d/elog-save-summary || die
+
+ # BSD and OSX need a sed wrapper so that find/xargs work properly
+ if use userland_GNU; then
+ rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
+ fi
+
+ local x symlinks
+ for x in $(find "$S"/bin -type d) ; do
+ x=${x#$S/}
+ exeinto $portage_base/$x || die "exeinto failed"
+ cd "$S"/$x || die "cd failed"
+ doexe $(find . -mindepth 1 -maxdepth 1 -type f ! -type l) || \
+ die "doexe failed"
+ symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+ if [ -n "$symlinks" ] ; then
+ cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+ fi
+ done
+
+ for x in $(find "$S"/pym -type d) ; do
+ x=${x#$S/}
+ insinto $portage_base/$x || die "insinto failed"
+ cd "$S"/$x || die "cd failed"
+ doins *.py || die "doins failed"
+ symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
+ if [ -n "$symlinks" ] ; then
+ cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
+ fi
+ 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 egencache emerge portageq repoman ; 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.6[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.6 in order"
+ ewarn "to enable RMD160 hash support."
+ ewarn "See bug #198398 for more information."
+ 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=$?
+
+ # If portage-2.1.6 is installed and the preserved_libs_registry exists,
+ # assume that the NEEDED.ELF.2 files have already been generated.
+ has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
+ ! ( [ -e "$ROOT"var/lib/portage/preserved_libs_registry ] && \
+ has_version ">=${CATEGORY}/${PN}-2.1.6_rc" )
+ NEEDED_REBUILD_UPGRADE=$?
+
+ [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
+ REPO_LAYOUT_CONF_WARN=$?
+}
+
+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 [ $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
+
+ if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
+ ewarn
+ echo "If you want overlay eclasses to override eclasses from" \
+ "other repos then see the portage(5) man page" \
+ "for information about the new layout.conf and repos.conf" \
+ "configuration files." \
+ | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+ ewarn
+ fi
+
+ einfo
+ einfo "For help with using portage please consult the Gentoo Handbook"
+ einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+ einfo
+
+ 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/*_rc*}" ]; 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
+}