Remove old versions.
authorZac Medico <zmedico@gentoo.org>
Thu, 29 Dec 2011 22:09:28 +0000 (22:09 +0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 29 Dec 2011 22:09:28 +0000 (22:09 +0000)
Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

sys-apps/portage/ChangeLog
sys-apps/portage/Manifest
sys-apps/portage/portage-2.1.10.43.ebuild [deleted file]
sys-apps/portage/portage-2.2.0_alpha83.ebuild [deleted file]

index 94d4ba7d9895789dec5730eef67670904751fd78..ce8dbccd81f70adb3b009c30525b17a3d56a834f 100644 (file)
@@ -1,6 +1,10 @@
 # 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.943 2011/12/28 09:01:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.944 2011/12/29 22:09:28 zmedico Exp $
+
+  29 Dec 2011; Zac Medico <zmedico@gentoo.org> -portage-2.1.10.43.ebuild,
+  -portage-2.2.0_alpha83.ebuild:
+  Remove old versions.
 
 *portage-2.2.0_alpha84 (28 Dec 2011)
 
index 8f1f486ad9d46ea5401611a6689286c580f4d580..a8b603b86a3700cbed36dbdd260afbd09b419655 100644 (file)
@@ -4,33 +4,28 @@ 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.41.tar.bz2 920129 RMD160 c0f425eeb78d9e17d1abfd17787d27df72337931 SHA1 3fb7ab592ceb28544b0ca4a9ddcd1298e73eaaa3 SHA256 e29c94fda9bb2eb2eb191df26ea1db7f709db728d6c3844f7b23a3660b7c5bf9
-DIST portage-2.1.10.43.tar.bz2 925342 RMD160 f172b3bfd54e556e583119fd95f3248fe1c701ab SHA1 1073515c1417d7c3335703755a9a76dd55b9d7da SHA256 d8b86724fd83042b17659b0cfe02d86886448160ce6b94250cf5c261092dd666
 DIST portage-2.1.10.44.tar.bz2 781681 RMD160 b26cd8102620f966eefb2bf5214080d6ce0d8fc1 SHA1 1e1417d1b534fedb4e6ae749fc807c7ba8088a44 SHA256 688494c4b76189550e1a437835f8276f2047992ed6c617f62b01e459f8fbdf04
 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.2.0_alpha80.tar.bz2 918039 RMD160 95b6182987268266a707e34dae5537022981f693 SHA1 2fb9c77b5550b17b567ec24851e490b864698e54 SHA256 52b17d68ae7102e173ded21c2822a86214c6500a66be719064c2b0e13761f33f
 DIST portage-2.2.0_alpha81.patch.bz2 10884 RMD160 e12fa7d351db2de76923e1e0383d5bb8ae690a8f SHA1 03bc059ec2e50eb0ed890c1d2a999619726f2865 SHA256 383aab0e086e2d748c96d8625e4f4885662ded1c07fa6ae1fff6da261802de20
-DIST portage-2.2.0_alpha82.tar.bz2 924895 RMD160 8adefd935334b455520e679c85c05afa8bf8e199 SHA1 d47c74fc83d5ea57b633cdebe8d97d6ee1b9944c SHA256 1499f3bb614545b6510065c083b4d9b28bbea538d943cd5d11f8478c6b4a6298
-DIST portage-2.2.0_alpha83.patch.bz2 4461 RMD160 93e61304b9ed4e4048a9b9d360af83920d305676 SHA1 7649ed213ae5fbfa353e0ddb9f140358abd5c63f SHA256 4e2e31e494249cf62922a9ecc4053c54023340f9921ea1f9f36422ec660ed11f
 DIST portage-2.2.0_alpha84.tar.bz2 781776 RMD160 a65a67fd1539d86935e3874f2322eba4aa62b6a1 SHA1 7d3359fce4461d7fbb4b2a45e859c9dba17247fa SHA256 3bafc462e362b3cf99eac84e8c23439c230b2e14309fd431f93e8d1e2eb70a07
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
 EBUILD portage-2.1.10.11.ebuild 11500 RMD160 b1bd438bf34fd97e28a881df86eb5f8e8ee96df9 SHA1 9b9bb0f9d9b0799eee7b0893968b47171a620e0d SHA256 794358ef93f1082061d2dd355cd5e000b7de1e77d6fe56d63019882362812e9c
 EBUILD portage-2.1.10.41.ebuild 11545 RMD160 0cf87979384741d061cbe0606ac7def0de7c7d34 SHA1 50d11fde71bcb1b9d80a92717d6fa55ca595e15e SHA256 0674e50bb5cffbdb629a4f0b2ee183b11defa3b4ceb9bdb9a8a60152ec95b71f
-EBUILD portage-2.1.10.43.ebuild 11549 RMD160 f7f79a824a7ddb5b621af04daecdc66787550ace SHA1 5dc2b73fc261c5c22abc67ef2a4096f65272875c SHA256 05615a6d7c338c049463ff60e3a332a27c10d54ec60c6344e3f9c69f97f9f684
 EBUILD portage-2.1.10.44.ebuild 11549 RMD160 3c0f2f89a56724209beadd599c96659387a6e2b1 SHA1 a726804dd23bef144731183bfd8c8a992e16a4e7 SHA256 2ab0449676708613be281ebd6fa15f579b1bf10e6621472998805b53c9cf0434
 EBUILD portage-2.1.6.13.ebuild 9923 RMD160 d27d0aec5dca631deb00f9dc0d415e5d3b3b8140 SHA1 c88f3873cdb95dea9dc2f66101d43ad370254bf9 SHA256 6b4794c017d59118697193c9cb208285c13eb6bf377eb97546c5c072b7073048
 EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27c1 SHA1 4f6b8bac1f951311382b1c8f92969c71e54fb4f1 SHA256 08a1ef8de3117a1e48d7650cbce7828c8d1e8855ebfb5081b4069086bc189d26
 EBUILD portage-2.2.0_alpha81.ebuild 14633 RMD160 bf8c4325d02c88b142e1663a2e58e11684d338dc SHA1 6afe40ef7e47fa17f5836fd9792920d0496bfb6c SHA256 babe03cfd284767dc702d12097eda7b76f2b92d6b1d61a2bda2e13a643000c1c
-EBUILD portage-2.2.0_alpha83.ebuild 14758 RMD160 e15aa39a2c119b472fab6e67013b0ad198503607 SHA1 ecf39c5fcf923cede9e2b45feda68ea2e9db288d SHA256 92049c167c19d79209370a900385ebacf07f50a7491e49a137b9afbf30ed5606
 EBUILD portage-2.2.0_alpha84.ebuild 14758 RMD160 3ca5197e444a1cd7b42bb128a658154d80bf0e86 SHA1 4eaaf5aa4b1d17157a2e30486e9d4bf4c8ef4af0 SHA256 61260dda30cadc205e988a495a899ec24b4f50474d8c433fc10c17542e8b55ef
 EBUILD portage-9999.ebuild 13929 RMD160 f6aad5112e7c55fc08b7115fa9a7a5cce34dfec1 SHA1 b5fc31b1f86a3bdedfb6ecad513bde57d3bd6af5 SHA256 c7c63fe695f6de5056ccccf78bd885c501ee8d010feb2e0411979373654f9d5b
-MISC ChangeLog 73788 RMD160 896cb22b7aa1f86bc0935d428267be6ab450f9cb SHA1 b8efd69211353f1f47a97fbe1ac25726dcba7198 SHA256 2f39a9076a044e882e3632c2c6d33984eb9eb915ef77ef0694d5fc4e6a28a855
+MISC ChangeLog 73919 RMD160 dede8974c2652e6459475ddb1911595c7536821d SHA1 0acaffefcedebe6a0f7567c6e1b6bd34cd6a9a10 SHA256 e3d83d715c21cd9405bbdb16cc08e8d492bf7eb8c3ebefff6fd6c1ed9cc00178
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk762vkACgkQ/ejvha5XGaM7DQCePUdFyufuLJGfwdper+NB+g5u
-sW8An0cZ20NrSrMDhE4iJkBiyRiOiE0u
-=BCSA
+iEYEARECAAYFAk785R0ACgkQ/ejvha5XGaMG1QCfShsou0gfAIb056dfwFPQWdnR
+K00An3WIyPx4P1RJPkizjVDZH+obqEV5
+=SPU+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.1.10.43.ebuild b/sys-apps/portage/portage-2.1.10.43.ebuild
deleted file mode 100644 (file)
index f239da0..0000000
+++ /dev/null
@@ -1,354 +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.43.ebuild,v 1.1 2011/12/24 12:33:56 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 )"
-# 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=$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=true || REPO_LAYOUT_CONF_WARN=false
-}
-
-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 ; 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
-}
-
-pkg_postrm() {
-       python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2.0_alpha83.ebuild b/sys-apps/portage/portage-2.2.0_alpha83.ebuild
deleted file mode 100644 (file)
index d71ceda..0000000
+++ /dev/null
@@ -1,436 +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_alpha83.ebuild,v 1.1 2011/12/24 12:34: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=3
-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 xattr"
-
-# 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.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-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
-       xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-       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_alpha82
-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 xattr && use kernel_linux ; then
-               einfo "Adding FEATURES=xattr to make.globals ..."
-               echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-                       || die "failed to append to make.globals"
-       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
-
-       if [[ -n ${EPREFIX} ]] ; then
-               einfo "Setting portage.const.EPREFIX ..."
-               sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-                       -i pym/portage/const.py || \
-                       die "Failed to patch portage.const.EPREFIX"
-
-               einfo "Prefixing shebangs ..."
-               find . -type f -print0 | \
-               while read -r -d $'\0' ; do
-                       local shebang=$(head -n1 "$REPLY")
-                       if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-                               sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-                                       die "sed failed"
-                       fi
-               done
-
-               einfo "Adjusting make.globals ..."
-               sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
-                       -e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
-                       -e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
-                       -i cnf/make.globals || die "sed failed"
-
-               einfo "Adding FEATURES=force-prefix to make.globals ..."
-               echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-                       || die "failed to append to make.globals"
-       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 "$ED$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 "$ED$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 "${ED}${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 "$ED" -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 "${EROOT}/etc/make.globals" ]; then
-               rm "${EROOT}/etc/make.globals"
-       fi
-
-       has_version "<${CATEGORY}/${PN}-2.2_alpha" \
-               && MINOR_UPGRADE=true || MINOR_UPGRADE=false
-
-       has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
-               && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
-
-       # 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 "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
-               has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
-               && NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
-       [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
-               && REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
-}
-
-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 ; then
-               einfo "moving set references from the worldfile into world_sets"
-               cd "${EROOT}/var/lib/portage/"
-               grep "^@" world >> world_sets
-               sed -i -e '/^@/d' world
-       fi
-
-       if $NEEDED_REBUILD_UPGRADE ; then
-               einfo "rebuilding NEEDED.ELF.2 files"
-               for cpv in "${EROOT}/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 ; 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
-
-       if $MINOR_UPGRADE ; 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
-}
-
-pkg_postrm() {
-       python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}