Remove old versions.
authorZac Medico <zmedico@gentoo.org>
Sun, 23 Oct 2011 23:00:12 +0000 (23:00 +0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 23 Oct 2011 23:00:12 +0000 (23:00 +0000)
Package-Manager: portage-2.2.0_alpha71/cvs/Linux i686

sys-apps/portage/ChangeLog
sys-apps/portage/Manifest
sys-apps/portage/portage-2.1.10.27.ebuild [deleted file]
sys-apps/portage/portage-2.1.10.29.ebuild [deleted file]
sys-apps/portage/portage-2.1.10.30.ebuild [deleted file]
sys-apps/portage/portage-2.2.0_alpha67.ebuild [deleted file]
sys-apps/portage/portage-2.2.0_alpha69.ebuild [deleted file]
sys-apps/portage/portage-2.2.0_alpha70.ebuild [deleted file]

index 6bbcdd0c290e562e71adfff8cea1feb9393d2994..71826666736eaec19e633a3ca5a387ed16950fe5 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.894 2011/10/23 22:57:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.895 2011/10/23 23:00:12 zmedico Exp $
+
+  23 Oct 2011; Zac Medico <zmedico@gentoo.org> -portage-2.2.0_alpha67.ebuild,
+  -portage-2.1.10.27.ebuild, -portage-2.1.10.29.ebuild,
+  -portage-2.2.0_alpha69.ebuild, -portage-2.2.0_alpha70.ebuild,
+  -portage-2.1.10.30.ebuild:
+  Remove old versions.
 
 *portage-2.2.0_alpha71 (23 Oct 2011)
 
index 552955967d2b401598e8fbad1712e46bd773712f..c472971784d0488c8ceb289a98245ab2ecef1bde 100644 (file)
@@ -3,40 +3,29 @@ Hash: SHA1
 
 AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8fcf81921e265f40b47644916331e0b8f18b9 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4
 DIST portage-2.1.10.11.tar.bz2 849505 RMD160 ae1fae8df7e42978a988ae7f66c3bb335bfd31b4 SHA1 a0c35facd342cc32a4e713925809e72530b98ec9 SHA256 c9d47d2211fa5feec398bc155cf64ec911fb30eb11a32a9ae7ca38dbeb9b37de
-DIST portage-2.1.10.27.tar.bz2 892513 RMD160 306a240591c070ec7da222a62a4b15d8c84a94db SHA1 c2b7dac65e31a62a95d18e5644b0a67f3e26ffb6 SHA256 991f04f556d6feface3d1142345ef58aeb29ebb4fbc16eba09add10822ada7d3
-DIST portage-2.1.10.29.tar.bz2 899328 RMD160 b3be8efca0bf790bf4046cbfb6e3093404ce2e24 SHA1 4bd99d6b09eecbecd1d57fb415424400dd901e2e SHA256 7c8028a21f1206512646eb5f0de0238a0b11a93c71ec49a16c6d560dbb1c4595
-DIST portage-2.1.10.30.tar.bz2 901202 RMD160 b6af0c9612e18b7cb081989d21f496a1caf0a6a4 SHA1 ae54feeddf3de098ddc2da7af089e8c7100aa22b SHA256 0526acda67c809723fafbc8757c37c9301fa224aac08594ae921267c0634398d
 DIST portage-2.1.10.31.tar.bz2 901742 RMD160 0b18560b2f8e03ff25fc4e18fc21a9305949a5b5 SHA1 3a1c8a2ab562dda02eb235be728d335154e515a7 SHA256 043e5a027d3041dcaca672943b0f96b60e5c25b856525e5ecdb4ec609745ead4
 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
 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.9.42.tar.bz2 764537 RMD160 7bfef7fb167c986e36532416a0ed4b914f0a9809 SHA1 d5593b09781dae537198197adc3c1d7f7fb466f7 SHA256 1bd238065eca36aaae11607482ae43b20c64f338db7401a46c11ab56d6ff72ba
 DIST portage-2.2.0_alpha51.tar.bz2 848918 RMD160 84c771624d4f89d7017fd90d522a008e47b68345 SHA1 b8f09497e49af0e669014332511179c305fb4782 SHA256 3b695242c4a7f69d1b0863a82220ccd17512e018e404f279e2ddba7b7d29deb5
-DIST portage-2.2.0_alpha67.tar.bz2 892371 RMD160 9ebc7de9b595b116f590d14a596d5ad111c2424f SHA1 a79202de7e2d98fa74e859b01281f6b13d170421 SHA256 d276aeefc53c5d29debc2155f394b9ef75f958bdb416973fd03f09bd9c920f53
-DIST portage-2.2.0_alpha69.patch.bz2 38283 RMD160 05f8ee8064defca942edd4c5e9f69ff6be0913c4 SHA1 3e2950bddf3e42ea57bfdfd65d862511e766c49e SHA256 99d5663e42ea05e92b1ed2df3d39b1825dffe9d61c835f7f167ac9642c4bcef5
 DIST portage-2.2.0_alpha70.tar.bz2 901411 RMD160 3142f7cea259262b0af273b003b4219f80c96c0c SHA1 279b127420a390296f7c429e447ec0e0e01f58c1 SHA256 ffccddf079e69159e92993537738cccb7f20fb5711f15de6f4f23c40eb2308c0
 DIST portage-2.2.0_alpha71.patch.bz2 2031 RMD160 d8257b1c1f54d2c18e254384bff5fd3e30c644d3 SHA1 a07713ee5d4fde12dc5023166f8c8c37621e461b SHA256 f27272a6ba1991cbc2fced114051c0e3176ee4d9c523ab6ab52f4f52148bd90c
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.10.11.ebuild 11660 RMD160 4d52b4ce74bc553ec0f3502bdc03ebfa0d953825 SHA1 7767202cb8ecca952a31c2d5db89734a94561d61 SHA256 14b7bc6fd709f7a1f00de22bc8dfb3288e3cdfde561ff412d56621fc7a8126b5
-EBUILD portage-2.1.10.27.ebuild 11641 RMD160 702f2e04d2b35062315df1454bb6dd2cca80fffe SHA1 87106f71ba0951efc9f8374176273742f04bfe6b SHA256 2ff9011269e163fd74598f9ec01bf1d0e50acb97b11de6e060b871d9fcbcc252
-EBUILD portage-2.1.10.29.ebuild 11641 RMD160 e4e9a6f7f5cda9b514e7e3fae6a444898b487f60 SHA1 7b6b93068cd05fb6e51c3fae1e5dc998bdd40d69 SHA256 6b8858b0c4bd455a57f76ad6df684146c93092c97bf1b4640e66aee445b1e5ae
-EBUILD portage-2.1.10.30.ebuild 11641 RMD160 f70c8fa44fd06661df7348e4b8924a6e4d6058fe SHA1 f4fde178cd82fbeb31c64404534970c149912cbe SHA256 823d9b36cfa57b7d2cae7dd4d8f1de3d9c9af96e782ee8449bf5d11fe1f6bcad
 EBUILD portage-2.1.10.31.ebuild 11641 RMD160 459c486a0f2408517388c62173f09783a3ee6d8a SHA1 778924bd4e8c3646ca14c461861aedb857c962e0 SHA256 81b8c83f238584a9cf78d03c6df8ac44e44162a50f3853a639af7bc8532b23e4
 EBUILD portage-2.1.6.13.ebuild 10038 RMD160 a40e576c31f07f89387bda834607e62708b47e79 SHA1 ecbd0bae4ca5f340627f1dca792d137870be4d5e SHA256 c507d206aa08c39b387f464f1fe973d15b1b39baadd2a8feafc4867f8856e1a9
 EBUILD portage-2.1.6.7.ebuild 8689 RMD160 a04a6f87a6ded5b3c20413c79cc5d854f4083574 SHA1 1782ad24f77a56d2c8cbd88828d50451a1254f7e SHA256 a3f0e6639db74003108c933fcd4557bd4dccbfd913fc6fde7546dbec3987797a
 EBUILD portage-2.1.9.42.ebuild 10283 RMD160 60ac7fd535e83626095d2ef11466da8e8aa9b209 SHA1 b204bf62ad13b3c3d116fff53bc7a482eb89b7d8 SHA256 1b7968c34b0fc83aa1b388540a155340fdeb93df19de4515826af205fbcb9a3e
 EBUILD portage-2.2.0_alpha51.ebuild 12928 RMD160 72acaaa06c2d1c170b17ae9449ed9f9bceeb0735 SHA1 195fc5ef71c91f86ec3329833e56543d482c7b7d SHA256 486a6a78bae63337695a134af3f6ff6462a01613b1f1848663cd2ca79cd59292
-EBUILD portage-2.2.0_alpha67.ebuild 12906 RMD160 e3f26d94b1e36d00ec684cef550014edd7a67a70 SHA1 7f462966a539edc4e7e91a61006eea46e313dfd5 SHA256 9cdbb0bd39ea9fc039bc6d3dba75e1a4a36bce6da848bcbb76b7fb69b293545c
-EBUILD portage-2.2.0_alpha69.ebuild 12906 RMD160 75a15c7a9428148e2a58751ea215fa2de6878f07 SHA1 fcdc05cdbaa9473aaa6cdf686fe1fc33cb2faef4 SHA256 efe2d4c593c069b6ae8ce80c1cd7143596f664a9433be83adf273665ca68a9dc
-EBUILD portage-2.2.0_alpha70.ebuild 12906 RMD160 631bbf230f84a75d4ee137891624acf383a27b82 SHA1 1f4e4f9495d8ce4d8699d6a64f1f2de71b4aeb17 SHA256 6f60675f0d2a93f7b061476574de98efb39a74d54bf1b484587c1e5ce2b0552c
 EBUILD portage-2.2.0_alpha71.ebuild 12906 RMD160 62ce33175427d4e893be66fdd2705fe7a9488217 SHA1 9b8b09b2e7b7e1bd86443db63fe1d7d6f78f1538 SHA256 8895395a674ffd06a40dadab91b2bf99b4b850eef98f5e26b36a7be19e26464c
 EBUILD portage-9999.ebuild 12214 RMD160 497e432fe756c9fda839cd2268a206e80e0ce1ca SHA1 9e9ef38845fa47767919d117c6f9e3c3b7924537 SHA256 ad0d82b6f9b62379595404695abebd73d0158fe257b2eedf117d9e49725ec8e7
-MISC ChangeLog 60563 RMD160 18da8779457593cf03eaf74093d73cbf5e6752bd SHA1 3bb55edb97a21a98f54ca292554dd7f1d9ebee84 SHA256 b6b93950bfcc4a61f2b4206f1f00b48e4aa11b05bfd3de22a7156bcfaef6b22a
+MISC ChangeLog 60814 RMD160 94974754569dbc87be6a9e45e3846215627e9faf SHA1 a17077f671f5b5133c5e623a29131cffba97997c SHA256 fae17a4e3b28879398e695e4efb213e87934fe5c81c9c8e456059bda4c3d5117
 MISC metadata.xml 784 RMD160 ed548c07d0a96be62f1854b92abb4ebc0ae2f281 SHA1 338c4eb3cbb626b8830eddb2f0ef23a48b1c9e12 SHA256 3ec8e42f1532859a3697a5870febeb90c635740da85cdf8f913c7529dfc767f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6km8cACgkQ/ejvha5XGaMCOQCfQniFZdxMIOx9NTU8mfG/25R0
-YrQAoJOW+OfQek3Po1cUoiIuQhXTsl0X
-=8wi4
+iEYEARECAAYFAk6knGMACgkQ/ejvha5XGaMLmQCfV9Qyzun7tAYg/32YlPpvUKcE
+MDsAnAxuGYsVPxssKUBCRVqNsbZ1HZpJ
+=LJSA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.10.27.ebuild b/sys-apps/portage/portage-2.1.10.27.ebuild
deleted file mode 100644 (file)
index 4204d20..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.27.ebuild,v 1.1 2011/10/12 02:20:24 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 ~x86 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-       !python2? ( !python3? (
-               build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-               !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-       ) )
-       python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# 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-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-       !<app-shells/bash-3.2_p17
-       !<app-admin/logrotate-3.8.0"
-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
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-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=$PV
-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=
-[[ $TARBALL_PV = $PV ]] || 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}
-
-compatible_python_is_selected() {
-       [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-       # Bug #359731 - Die early if get_libdir fails.
-       [[ -z $(get_libdir) ]] && \
-               die "get_libdir returned an empty string"
-
-       if use python2 && use python3 ; then
-               ewarn "Both python2 and python3 USE flags are enabled, but only one"
-               ewarn "can be in the shebangs. Using python3."
-       fi
-       if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-               ewarn "Attempting to select a compatible default python interpreter"
-               local x success=0
-               for x in /usr/bin/python2.* ; do
-                       x=${x#/usr/bin/python2.}
-                       if [[ $x -ge 6 ]] 2>/dev/null ; then
-                               eselect python set python2.$x
-                               if compatible_python_is_selected ; then
-                                       elog "Default python interpreter is now set to python-2.$x"
-                                       success=1
-                                       break
-                               fi
-                       fi
-               done
-               if [ $success != 1 ] ; then
-                       eerror "Unable to select a compatible default python interpreter!"
-                       die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-               fi
-       fi
-
-       if use python3; then
-               python_set_active_version 3
-       elif use python2; then
-               python_set_active_version 2
-       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 -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-               die "Failed to patch portage.VERSION"
-       sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-               die "Failed to patch VERSION in doc/fragment/version"
-       sed -e "1s/VERSION/${PVR}/" -i man/* || \
-               die "Failed to patch VERSION in man page headers"
-
-       if ! use ipc ; then
-               einfo "Disabling ipc..."
-               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-                       -i pym/_emerge/AbstractEbuildProcess.py || \
-                       die "failed to patch AbstractEbuildProcess.py"
-       fi
-
-       if use python3; then
-               einfo "Converting shebangs for python3..."
-               python_convert_shebangs -r 3 .
-       elif use python2; then
-               einfo "Converting shebangs for python2..."
-               python_convert_shebangs -r 2 .
-       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=""
-               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"
-               # workaround for bug 282760
-               > "$S/pym/pysqlite2.py"
-               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"
-               rm "$S/pym/pysqlite2.py"
-       fi
-}
-
-src_test() {
-       # make files executable, in case they were created by patch
-       find bin -type f | xargs chmod +x
-       ./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/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 files
-
-       cd "$S" || die "cd failed"
-       for x in $(find bin -type d) ; do
-               exeinto $portage_base/$x || die "exeinto failed"
-               cd "$S"/$x || die "cd failed"
-               files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-               if [ -n "$files" ] ; then
-                       doexe $files || die "doexe failed"
-               fi
-               symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-               if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-               fi
-       done
-
-       cd "$S" || die "cd failed"
-       for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-               insinto $portage_base/$x || die "insinto failed"
-               cd "$S"/$x || die "cd failed"
-               # __pycache__ directories contain no py files
-               [[ "*.py" != $(echo *.py) ]] || continue
-               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
-
-       # We install some minimal tests for use as a preinst sanity check.
-       # These tests must be able to run without a full source tree and
-       # without relying on a previous portage instance being installed.
-       cd "$S" || die "cd failed"
-       exeinto $portage_base/pym/portage/tests || die
-       doexe pym/portage/tests/runTests || die
-       insinto $portage_base/pym/portage/tests || die
-       doins pym/portage/tests/*.py || die
-       insinto $portage_base/pym/portage/tests/lint || die
-       doins pym/portage/tests/lint/*.py || die
-       doins pym/portage/tests/lint/__test__ || die
-
-       # 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
-
-       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 quickpkg 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
-               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 [[ $ROOT == / ]] ; then
-               # Run some minimal tests as a sanity check.
-               local test_runner=$(find "$D" -name runTests)
-               if [[ -n $test_runner && -x $test_runner ]] ; then
-                       einfo "Running preinst sanity tests..."
-                       "$test_runner" || die "preinst sanity tests failed"
-               fi
-       fi
-
-       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
-
-       if [[ -d ${ROOT}var/log/portage && \
-               $(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
-               has_version '<sys-apps/portage-2.1.10.11' ; then
-               # Initialize permissions for bug #378451 and bug #377177, since older
-               # portage does not create /var/log/portage with the desired default
-               # permissions.
-               einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
-               chown portage:portage "${ROOT}var/log/portage"
-               chmod g+ws "${ROOT}var/log/portage"
-       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.1.10.29.ebuild b/sys-apps/portage/portage-2.1.10.29.ebuild
deleted file mode 100644 (file)
index 7ee65da..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.29.ebuild,v 1.1 2011/10/18 08:06:19 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 ~x86 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-       !python2? ( !python3? (
-               build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-               !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-       ) )
-       python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# 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-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-       !<app-shells/bash-3.2_p17
-       !<app-admin/logrotate-3.8.0"
-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
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-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=$PV
-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=
-[[ $TARBALL_PV = $PV ]] || 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}
-
-compatible_python_is_selected() {
-       [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-       # Bug #359731 - Die early if get_libdir fails.
-       [[ -z $(get_libdir) ]] && \
-               die "get_libdir returned an empty string"
-
-       if use python2 && use python3 ; then
-               ewarn "Both python2 and python3 USE flags are enabled, but only one"
-               ewarn "can be in the shebangs. Using python3."
-       fi
-       if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-               ewarn "Attempting to select a compatible default python interpreter"
-               local x success=0
-               for x in /usr/bin/python2.* ; do
-                       x=${x#/usr/bin/python2.}
-                       if [[ $x -ge 6 ]] 2>/dev/null ; then
-                               eselect python set python2.$x
-                               if compatible_python_is_selected ; then
-                                       elog "Default python interpreter is now set to python-2.$x"
-                                       success=1
-                                       break
-                               fi
-                       fi
-               done
-               if [ $success != 1 ] ; then
-                       eerror "Unable to select a compatible default python interpreter!"
-                       die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-               fi
-       fi
-
-       if use python3; then
-               python_set_active_version 3
-       elif use python2; then
-               python_set_active_version 2
-       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 -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-               die "Failed to patch portage.VERSION"
-       sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-               die "Failed to patch VERSION in doc/fragment/version"
-       sed -e "1s/VERSION/${PVR}/" -i man/* || \
-               die "Failed to patch VERSION in man page headers"
-
-       if ! use ipc ; then
-               einfo "Disabling ipc..."
-               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-                       -i pym/_emerge/AbstractEbuildProcess.py || \
-                       die "failed to patch AbstractEbuildProcess.py"
-       fi
-
-       if use python3; then
-               einfo "Converting shebangs for python3..."
-               python_convert_shebangs -r 3 .
-       elif use python2; then
-               einfo "Converting shebangs for python2..."
-               python_convert_shebangs -r 2 .
-       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=""
-               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"
-               # workaround for bug 282760
-               > "$S/pym/pysqlite2.py"
-               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"
-               rm "$S/pym/pysqlite2.py"
-       fi
-}
-
-src_test() {
-       # make files executable, in case they were created by patch
-       find bin -type f | xargs chmod +x
-       ./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/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 files
-
-       cd "$S" || die "cd failed"
-       for x in $(find bin -type d) ; do
-               exeinto $portage_base/$x || die "exeinto failed"
-               cd "$S"/$x || die "cd failed"
-               files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-               if [ -n "$files" ] ; then
-                       doexe $files || die "doexe failed"
-               fi
-               symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-               if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-               fi
-       done
-
-       cd "$S" || die "cd failed"
-       for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-               insinto $portage_base/$x || die "insinto failed"
-               cd "$S"/$x || die "cd failed"
-               # __pycache__ directories contain no py files
-               [[ "*.py" != $(echo *.py) ]] || continue
-               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
-
-       # We install some minimal tests for use as a preinst sanity check.
-       # These tests must be able to run without a full source tree and
-       # without relying on a previous portage instance being installed.
-       cd "$S" || die "cd failed"
-       exeinto $portage_base/pym/portage/tests || die
-       doexe pym/portage/tests/runTests || die
-       insinto $portage_base/pym/portage/tests || die
-       doins pym/portage/tests/*.py || die
-       insinto $portage_base/pym/portage/tests/lint || die
-       doins pym/portage/tests/lint/*.py || die
-       doins pym/portage/tests/lint/__test__ || die
-
-       # 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
-
-       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 quickpkg 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
-               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 [[ $ROOT == / ]] ; then
-               # Run some minimal tests as a sanity check.
-               local test_runner=$(find "$D" -name runTests)
-               if [[ -n $test_runner && -x $test_runner ]] ; then
-                       einfo "Running preinst sanity tests..."
-                       "$test_runner" || die "preinst sanity tests failed"
-               fi
-       fi
-
-       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
-
-       if [[ -d ${ROOT}var/log/portage && \
-               $(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
-               has_version '<sys-apps/portage-2.1.10.11' ; then
-               # Initialize permissions for bug #378451 and bug #377177, since older
-               # portage does not create /var/log/portage with the desired default
-               # permissions.
-               einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
-               chown portage:portage "${ROOT}var/log/portage"
-               chmod g+ws "${ROOT}var/log/portage"
-       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.1.10.30.ebuild b/sys-apps/portage/portage-2.1.10.30.ebuild
deleted file mode 100644 (file)
index 84dbf9a..0000000
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.30.ebuild,v 1.1 2011/10/21 09:14:27 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 ~x86 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-       !python2? ( !python3? (
-               build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-               !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-       ) )
-       python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# 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-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-       !<app-shells/bash-3.2_p17
-       !<app-admin/logrotate-3.8.0"
-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
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-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=$PV
-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=
-[[ $TARBALL_PV = $PV ]] || 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}
-
-compatible_python_is_selected() {
-       [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-       # Bug #359731 - Die early if get_libdir fails.
-       [[ -z $(get_libdir) ]] && \
-               die "get_libdir returned an empty string"
-
-       if use python2 && use python3 ; then
-               ewarn "Both python2 and python3 USE flags are enabled, but only one"
-               ewarn "can be in the shebangs. Using python3."
-       fi
-       if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-               ewarn "Attempting to select a compatible default python interpreter"
-               local x success=0
-               for x in /usr/bin/python2.* ; do
-                       x=${x#/usr/bin/python2.}
-                       if [[ $x -ge 6 ]] 2>/dev/null ; then
-                               eselect python set python2.$x
-                               if compatible_python_is_selected ; then
-                                       elog "Default python interpreter is now set to python-2.$x"
-                                       success=1
-                                       break
-                               fi
-                       fi
-               done
-               if [ $success != 1 ] ; then
-                       eerror "Unable to select a compatible default python interpreter!"
-                       die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-               fi
-       fi
-
-       if use python3; then
-               python_set_active_version 3
-       elif use python2; then
-               python_set_active_version 2
-       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 -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-               die "Failed to patch portage.VERSION"
-       sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-               die "Failed to patch VERSION in doc/fragment/version"
-       sed -e "1s/VERSION/${PVR}/" -i man/* || \
-               die "Failed to patch VERSION in man page headers"
-
-       if ! use ipc ; then
-               einfo "Disabling ipc..."
-               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-                       -i pym/_emerge/AbstractEbuildProcess.py || \
-                       die "failed to patch AbstractEbuildProcess.py"
-       fi
-
-       if use python3; then
-               einfo "Converting shebangs for python3..."
-               python_convert_shebangs -r 3 .
-       elif use python2; then
-               einfo "Converting shebangs for python2..."
-               python_convert_shebangs -r 2 .
-       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=""
-               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"
-               # workaround for bug 282760
-               > "$S/pym/pysqlite2.py"
-               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"
-               rm "$S/pym/pysqlite2.py"
-       fi
-}
-
-src_test() {
-       # make files executable, in case they were created by patch
-       find bin -type f | xargs chmod +x
-       ./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/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 files
-
-       cd "$S" || die "cd failed"
-       for x in $(find bin -type d) ; do
-               exeinto $portage_base/$x || die "exeinto failed"
-               cd "$S"/$x || die "cd failed"
-               files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-               if [ -n "$files" ] ; then
-                       doexe $files || die "doexe failed"
-               fi
-               symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-               if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-               fi
-       done
-
-       cd "$S" || die "cd failed"
-       for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-               insinto $portage_base/$x || die "insinto failed"
-               cd "$S"/$x || die "cd failed"
-               # __pycache__ directories contain no py files
-               [[ "*.py" != $(echo *.py) ]] || continue
-               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
-
-       # We install some minimal tests for use as a preinst sanity check.
-       # These tests must be able to run without a full source tree and
-       # without relying on a previous portage instance being installed.
-       cd "$S" || die "cd failed"
-       exeinto $portage_base/pym/portage/tests || die
-       doexe pym/portage/tests/runTests || die
-       insinto $portage_base/pym/portage/tests || die
-       doins pym/portage/tests/*.py || die
-       insinto $portage_base/pym/portage/tests/lint || die
-       doins pym/portage/tests/lint/*.py || die
-       doins pym/portage/tests/lint/__test__ || die
-
-       # 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
-
-       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 quickpkg 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
-               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 [[ $ROOT == / ]] ; then
-               # Run some minimal tests as a sanity check.
-               local test_runner=$(find "$D" -name runTests)
-               if [[ -n $test_runner && -x $test_runner ]] ; then
-                       einfo "Running preinst sanity tests..."
-                       "$test_runner" || die "preinst sanity tests failed"
-               fi
-       fi
-
-       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
-
-       if [[ -d ${ROOT}var/log/portage && \
-               $(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
-               has_version '<sys-apps/portage-2.1.10.11' ; then
-               # Initialize permissions for bug #378451 and bug #377177, since older
-               # portage does not create /var/log/portage with the desired default
-               # permissions.
-               einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
-               chown portage:portage "${ROOT}var/log/portage"
-               chmod g+ws "${ROOT}var/log/portage"
-       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.0_alpha67.ebuild b/sys-apps/portage/portage-2.2.0_alpha67.ebuild
deleted file mode 100644 (file)
index d1d15d9..0000000
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha67.ebuild,v 1.1 2011/10/12 02:20:24 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="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-       !python2? ( !python3? (
-               build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-               !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-       ) )
-       python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# 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-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-       !<app-shells/bash-3.2_p17
-       !<app-admin/logrotate-3.8.0"
-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
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-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.0_alpha67
-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=
-[[ $TARBALL_PV = $PV ]] || 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}
-
-compatible_python_is_selected() {
-       [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-       # Bug #359731 - Die early if get_libdir fails.
-       [[ -z $(get_libdir) ]] && \
-               die "get_libdir returned an empty string"
-
-       if use python2 && use python3 ; then
-               ewarn "Both python2 and python3 USE flags are enabled, but only one"
-               ewarn "can be in the shebangs. Using python3."
-       fi
-       if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-               ewarn "Attempting to select a compatible default python interpreter"
-               local x success=0
-               for x in /usr/bin/python2.* ; do
-                       x=${x#/usr/bin/python2.}
-                       if [[ $x -ge 6 ]] 2>/dev/null ; then
-                               eselect python set python2.$x
-                               if compatible_python_is_selected ; then
-                                       elog "Default python interpreter is now set to python-2.$x"
-                                       success=1
-                                       break
-                               fi
-                       fi
-               done
-               if [ $success != 1 ] ; then
-                       eerror "Unable to select a compatible default python interpreter!"
-                       die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-               fi
-       fi
-
-       if use python3; then
-               python_set_active_version 3
-       elif use python2; then
-               python_set_active_version 2
-       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 -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-               die "Failed to patch portage.VERSION"
-       sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-               die "Failed to patch VERSION in doc/fragment/version"
-       sed -e "1s/VERSION/${PVR}/" -i man/* || \
-               die "Failed to patch VERSION in man page headers"
-
-       if ! use ipc ; then
-               einfo "Disabling ipc..."
-               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-                       -i pym/_emerge/AbstractEbuildProcess.py || \
-                       die "failed to patch AbstractEbuildProcess.py"
-       fi
-
-       if use python3; then
-               einfo "Converting shebangs for python3..."
-               python_convert_shebangs -r 3 .
-       elif use python2; then
-               einfo "Converting shebangs for python2..."
-               python_convert_shebangs -r 2 .
-       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=""
-               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"
-               # workaround for bug 282760
-               > "$S/pym/pysqlite2.py"
-               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"
-               rm "$S/pym/pysqlite2.py"
-       fi
-}
-
-src_test() {
-       # make files executable, in case they were created by patch
-       find bin -type f | xargs chmod +x
-       ./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/sets"
-       doins "$S"/cnf/sets/*.conf || die
-       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 files
-
-       cd "$S" || die "cd failed"
-       for x in $(find bin -type d) ; do
-               exeinto $portage_base/$x || die "exeinto failed"
-               cd "$S"/$x || die "cd failed"
-               files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-               if [ -n "$files" ] ; then
-                       doexe $files || die "doexe failed"
-               fi
-               symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-               if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-               fi
-       done
-
-       cd "$S" || die "cd failed"
-       for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-               insinto $portage_base/$x || die "insinto failed"
-               cd "$S"/$x || die "cd failed"
-               # __pycache__ directories contain no py files
-               [[ "*.py" != $(echo *.py) ]] || continue
-               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
-
-       # We install some minimal tests for use as a preinst sanity check.
-       # These tests must be able to run without a full source tree and
-       # without relying on a previous portage instance being installed.
-       cd "$S" || die "cd failed"
-       exeinto $portage_base/pym/portage/tests || die
-       doexe pym/portage/tests/runTests || die
-       insinto $portage_base/pym/portage/tests || die
-       doins pym/portage/tests/*.py || die
-       insinto $portage_base/pym/portage/tests/lint || die
-       doins pym/portage/tests/lint/*.py || die
-       doins pym/portage/tests/lint/__test__ || die
-
-       # 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
-
-       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 quickpkg 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
-               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 [[ $ROOT == / ]] ; then
-               # Run some minimal tests as a sanity check.
-               local test_runner=$(find "$D" -name runTests)
-               if [[ -n $test_runner && -x $test_runner ]] ; then
-                       einfo "Running preinst sanity tests..."
-                       "$test_runner" || die "preinst sanity tests failed"
-               fi
-       fi
-
-       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/*_alpha*}" ]; 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.0_alpha69.ebuild b/sys-apps/portage/portage-2.2.0_alpha69.ebuild
deleted file mode 100644 (file)
index 0c400fd..0000000
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha69.ebuild,v 1.1 2011/10/18 08:10:59 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="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-       !python2? ( !python3? (
-               build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-               !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-       ) )
-       python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# 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-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-       !<app-shells/bash-3.2_p17
-       !<app-admin/logrotate-3.8.0"
-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
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-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.0_alpha67
-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=
-[[ $TARBALL_PV = $PV ]] || 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}
-
-compatible_python_is_selected() {
-       [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-       # Bug #359731 - Die early if get_libdir fails.
-       [[ -z $(get_libdir) ]] && \
-               die "get_libdir returned an empty string"
-
-       if use python2 && use python3 ; then
-               ewarn "Both python2 and python3 USE flags are enabled, but only one"
-               ewarn "can be in the shebangs. Using python3."
-       fi
-       if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-               ewarn "Attempting to select a compatible default python interpreter"
-               local x success=0
-               for x in /usr/bin/python2.* ; do
-                       x=${x#/usr/bin/python2.}
-                       if [[ $x -ge 6 ]] 2>/dev/null ; then
-                               eselect python set python2.$x
-                               if compatible_python_is_selected ; then
-                                       elog "Default python interpreter is now set to python-2.$x"
-                                       success=1
-                                       break
-                               fi
-                       fi
-               done
-               if [ $success != 1 ] ; then
-                       eerror "Unable to select a compatible default python interpreter!"
-                       die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-               fi
-       fi
-
-       if use python3; then
-               python_set_active_version 3
-       elif use python2; then
-               python_set_active_version 2
-       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 -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-               die "Failed to patch portage.VERSION"
-       sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-               die "Failed to patch VERSION in doc/fragment/version"
-       sed -e "1s/VERSION/${PVR}/" -i man/* || \
-               die "Failed to patch VERSION in man page headers"
-
-       if ! use ipc ; then
-               einfo "Disabling ipc..."
-               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-                       -i pym/_emerge/AbstractEbuildProcess.py || \
-                       die "failed to patch AbstractEbuildProcess.py"
-       fi
-
-       if use python3; then
-               einfo "Converting shebangs for python3..."
-               python_convert_shebangs -r 3 .
-       elif use python2; then
-               einfo "Converting shebangs for python2..."
-               python_convert_shebangs -r 2 .
-       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=""
-               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"
-               # workaround for bug 282760
-               > "$S/pym/pysqlite2.py"
-               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"
-               rm "$S/pym/pysqlite2.py"
-       fi
-}
-
-src_test() {
-       # make files executable, in case they were created by patch
-       find bin -type f | xargs chmod +x
-       ./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/sets"
-       doins "$S"/cnf/sets/*.conf || die
-       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 files
-
-       cd "$S" || die "cd failed"
-       for x in $(find bin -type d) ; do
-               exeinto $portage_base/$x || die "exeinto failed"
-               cd "$S"/$x || die "cd failed"
-               files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-               if [ -n "$files" ] ; then
-                       doexe $files || die "doexe failed"
-               fi
-               symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-               if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-               fi
-       done
-
-       cd "$S" || die "cd failed"
-       for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-               insinto $portage_base/$x || die "insinto failed"
-               cd "$S"/$x || die "cd failed"
-               # __pycache__ directories contain no py files
-               [[ "*.py" != $(echo *.py) ]] || continue
-               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
-
-       # We install some minimal tests for use as a preinst sanity check.
-       # These tests must be able to run without a full source tree and
-       # without relying on a previous portage instance being installed.
-       cd "$S" || die "cd failed"
-       exeinto $portage_base/pym/portage/tests || die
-       doexe pym/portage/tests/runTests || die
-       insinto $portage_base/pym/portage/tests || die
-       doins pym/portage/tests/*.py || die
-       insinto $portage_base/pym/portage/tests/lint || die
-       doins pym/portage/tests/lint/*.py || die
-       doins pym/portage/tests/lint/__test__ || die
-
-       # 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
-
-       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 quickpkg 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
-               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 [[ $ROOT == / ]] ; then
-               # Run some minimal tests as a sanity check.
-               local test_runner=$(find "$D" -name runTests)
-               if [[ -n $test_runner && -x $test_runner ]] ; then
-                       einfo "Running preinst sanity tests..."
-                       "$test_runner" || die "preinst sanity tests failed"
-               fi
-       fi
-
-       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/*_alpha*}" ]; 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.0_alpha70.ebuild b/sys-apps/portage/portage-2.2.0_alpha70.ebuild
deleted file mode 100644 (file)
index 60db48b..0000000
+++ /dev/null
@@ -1,403 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha70.ebuild,v 1.1 2011/10/21 09:17:47 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="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-       !python2? ( !python3? (
-               build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) )
-               !build? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] >=dev-lang/python-3 ) )
-       ) )
-       python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# 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-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-       !<app-shells/bash-3.2_p17
-       !<app-admin/logrotate-3.8.0"
-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
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-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.0_alpha70
-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=
-[[ $TARBALL_PV = $PV ]] || 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}
-
-compatible_python_is_selected() {
-       [[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-       # Bug #359731 - Die early if get_libdir fails.
-       [[ -z $(get_libdir) ]] && \
-               die "get_libdir returned an empty string"
-
-       if use python2 && use python3 ; then
-               ewarn "Both python2 and python3 USE flags are enabled, but only one"
-               ewarn "can be in the shebangs. Using python3."
-       fi
-       if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-               ewarn "Attempting to select a compatible default python interpreter"
-               local x success=0
-               for x in /usr/bin/python2.* ; do
-                       x=${x#/usr/bin/python2.}
-                       if [[ $x -ge 6 ]] 2>/dev/null ; then
-                               eselect python set python2.$x
-                               if compatible_python_is_selected ; then
-                                       elog "Default python interpreter is now set to python-2.$x"
-                                       success=1
-                                       break
-                               fi
-                       fi
-               done
-               if [ $success != 1 ] ; then
-                       eerror "Unable to select a compatible default python interpreter!"
-                       die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-               fi
-       fi
-
-       if use python3; then
-               python_set_active_version 3
-       elif use python2; then
-               python_set_active_version 2
-       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 -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-               die "Failed to patch portage.VERSION"
-       sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-               die "Failed to patch VERSION in doc/fragment/version"
-       sed -e "1s/VERSION/${PVR}/" -i man/* || \
-               die "Failed to patch VERSION in man page headers"
-
-       if ! use ipc ; then
-               einfo "Disabling ipc..."
-               sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-                       -i pym/_emerge/AbstractEbuildProcess.py || \
-                       die "failed to patch AbstractEbuildProcess.py"
-       fi
-
-       if use python3; then
-               einfo "Converting shebangs for python3..."
-               python_convert_shebangs -r 3 .
-       elif use python2; then
-               einfo "Converting shebangs for python2..."
-               python_convert_shebangs -r 2 .
-       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=""
-               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"
-               # workaround for bug 282760
-               > "$S/pym/pysqlite2.py"
-               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"
-               rm "$S/pym/pysqlite2.py"
-       fi
-}
-
-src_test() {
-       # make files executable, in case they were created by patch
-       find bin -type f | xargs chmod +x
-       ./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/sets"
-       doins "$S"/cnf/sets/*.conf || die
-       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 files
-
-       cd "$S" || die "cd failed"
-       for x in $(find bin -type d) ; do
-               exeinto $portage_base/$x || die "exeinto failed"
-               cd "$S"/$x || die "cd failed"
-               files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-               if [ -n "$files" ] ; then
-                       doexe $files || die "doexe failed"
-               fi
-               symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-               if [ -n "$symlinks" ] ; then
-                       cp -P $symlinks "$D$portage_base/$x" || die "cp failed"
-               fi
-       done
-
-       cd "$S" || die "cd failed"
-       for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-               insinto $portage_base/$x || die "insinto failed"
-               cd "$S"/$x || die "cd failed"
-               # __pycache__ directories contain no py files
-               [[ "*.py" != $(echo *.py) ]] || continue
-               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
-
-       # We install some minimal tests for use as a preinst sanity check.
-       # These tests must be able to run without a full source tree and
-       # without relying on a previous portage instance being installed.
-       cd "$S" || die "cd failed"
-       exeinto $portage_base/pym/portage/tests || die
-       doexe pym/portage/tests/runTests || die
-       insinto $portage_base/pym/portage/tests || die
-       doins pym/portage/tests/*.py || die
-       insinto $portage_base/pym/portage/tests/lint || die
-       doins pym/portage/tests/lint/*.py || die
-       doins pym/portage/tests/lint/__test__ || die
-
-       # 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
-
-       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 quickpkg 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
-               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 [[ $ROOT == / ]] ; then
-               # Run some minimal tests as a sanity check.
-               local test_runner=$(find "$D" -name runTests)
-               if [[ -n $test_runner && -x $test_runner ]] ; then
-                       einfo "Running preinst sanity tests..."
-                       "$test_runner" || die "preinst sanity tests failed"
-               fi
-       fi
-
-       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/*_alpha*}" ]; 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
-}