2.1.2-r3 revbump. Bug #162453 tracks fixes since 2.1.2.
authorZac Medico <zmedico@gentoo.org>
Tue, 23 Jan 2007 23:33:03 +0000 (23:33 +0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 23 Jan 2007 23:33:03 +0000 (23:33 +0000)
Package-Manager: portage-2.1.2-r3

sys-apps/portage/ChangeLog
sys-apps/portage/Manifest
sys-apps/portage/files/digest-portage-2.1.2-r2 [deleted file]
sys-apps/portage/files/digest-portage-2.1.2-r3 [moved from sys-apps/portage/files/digest-portage-2.1.2-r1 with 66% similarity]
sys-apps/portage/portage-2.1.2-r2.ebuild [deleted file]
sys-apps/portage/portage-2.1.2-r3.ebuild [moved from sys-apps/portage/portage-2.1.2-r1.ebuild with 99% similarity]

index f7ddd4ad45466fea91e17d746294a2a17b450fb8..3bdfc48ecda9b4e06de04aabe975493b1adf3e4f 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.335 2007/01/22 00:12:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.336 2007/01/23 23:33:03 zmedico Exp $
+
+*portage-2.1.2-r3 (23 Jan 2007)
+
+  23 Jan 2007; Zac Medico <zmedico@gentoo.org> +portage-2.1.2-r3.ebuild:
+  2.1.2-r3 revbump. Bug #162453 tracks fixes since 2.1.2.
 
 *portage-2.1.2-r2 (21 Jan 2007)
 
index 509d4330286777fcc855d87340ddc34ab08b349f..80d0995a4a45249d2ddbb9841e69e7ab71149d00 100644 (file)
@@ -18,8 +18,7 @@ DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d
 DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5e4d9 SHA1 9471d5412ef205e452dac985da3871346800c1cc SHA256 eee5bcc98558ca5300fa1f8dc37135c6ff73f4cd52b985218a30846176ad53f1
 DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28e489 SHA1 4eaedfedf867346d67744d95d5cb3ad5b0da4417 SHA256 4d2bc33b66c6354f008d798507137a347e35ef7448a10ef17e5108160acb0414
 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389
-DIST portage-2.1.2-r1.patch.bz2 7540 RMD160 5a03c9ad9e2a1787ffb23e128df81f6617222ca3 SHA1 e794535572dd9ed28286edb9d9ff6e23844cb7cc SHA256 81a6e079375bc4f3d6bbaf1f0c5d5fae240f9be11fdfecd2f1d8fd3189aff534
-DIST portage-2.1.2-r2.patch.bz2 9551 RMD160 98839b9b33d9c564897933d102ff996bc7eeeca2 SHA1 65812ce997dce297efd5cc7636bc364316a02922 SHA256 90f467fd64c509a889e4165d26fc55845bc6b8ddbbd75c61cccb9fdff9cb94fe
+DIST portage-2.1.2-r3.patch.bz2 11085 RMD160 843156e196312b7f8ffb9626442d745b8bbf569d SHA1 cbed9f402ff4ed92ed0fec99ab36427f6e19ac58 SHA256 fba16b400b81cc2f59e3d5fd2a3ef00ce99a2ccc2eca3d17047767c37955ddc0
 DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008
 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
@@ -40,18 +39,14 @@ EBUILD portage-2.1.1-r2.ebuild 7230 RMD160 5511aed85ca200fc1d8429578b69f5bdd5862
 MD5 0c9d6a4a1e21df4128b7dfb51d4eba97 portage-2.1.1-r2.ebuild 7230
 RMD160 5511aed85ca200fc1d8429578b69f5bdd5862602 portage-2.1.1-r2.ebuild 7230
 SHA256 1f5f3a9f58f62acc2adb3d61ef5e574bc114cbad6d6acd598b82b78071271ee6 portage-2.1.1-r2.ebuild 7230
-EBUILD portage-2.1.2-r1.ebuild 6764 RMD160 12cd6b62ca445f9e57fdd81357773cfd8585a7f9 SHA1 39e78be72be2a49a7484bd382fc156624079c8cd SHA256 c77d1186ba1fb978800bc5b2d9d7fd1bbd5abf8990cc9f180480b320e33164ee
-MD5 0b37aafc48b97841a1641da70a212858 portage-2.1.2-r1.ebuild 6764
-RMD160 12cd6b62ca445f9e57fdd81357773cfd8585a7f9 portage-2.1.2-r1.ebuild 6764
-SHA256 c77d1186ba1fb978800bc5b2d9d7fd1bbd5abf8990cc9f180480b320e33164ee portage-2.1.2-r1.ebuild 6764
-EBUILD portage-2.1.2-r2.ebuild 6764 RMD160 d46f9eb10c903851833725adf86c7d2f8b9f480a SHA1 76c4610dbcbe63a83b0f82873aa9efa36e56d269 SHA256 387ff8ea5fe28164f92f82a12e831322114fc6f0600dfb58c8371ec34fbd2ac2
-MD5 441b410740cb3ec300ea2a4da8359cb7 portage-2.1.2-r2.ebuild 6764
-RMD160 d46f9eb10c903851833725adf86c7d2f8b9f480a portage-2.1.2-r2.ebuild 6764
-SHA256 387ff8ea5fe28164f92f82a12e831322114fc6f0600dfb58c8371ec34fbd2ac2 portage-2.1.2-r2.ebuild 6764
-MISC ChangeLog 18005 RMD160 f5c2f525499fde53621dc53ad62394e14003d25d SHA1 ff7ffbc31dd42fd0d57a17ce1f79d450574ceb76 SHA256 89907f479c9481d8927730bb8f76a87b28910925cd1c4c754e2e35d50fdcb813
-MD5 f48817f08834f396c5956d447129f2d7 ChangeLog 18005
-RMD160 f5c2f525499fde53621dc53ad62394e14003d25d ChangeLog 18005
-SHA256 89907f479c9481d8927730bb8f76a87b28910925cd1c4c754e2e35d50fdcb813 ChangeLog 18005
+EBUILD portage-2.1.2-r3.ebuild 6764 RMD160 3104a9e3f90c42f264656b6b936d19b782cd192b SHA1 8316ec02f80b6e0ed6ff444296bfb0f05dac0ffb SHA256 8fee94eed5d0bc6d242f174028fd233b593e70cb16d8490d8ff8ce7792a3ec99
+MD5 619aecd974a98032873230c60cf45d37 portage-2.1.2-r3.ebuild 6764
+RMD160 3104a9e3f90c42f264656b6b936d19b782cd192b portage-2.1.2-r3.ebuild 6764
+SHA256 8fee94eed5d0bc6d242f174028fd233b593e70cb16d8490d8ff8ce7792a3ec99 portage-2.1.2-r3.ebuild 6764
+MISC ChangeLog 18170 RMD160 62283d07017f9bb728e2e39c6a05593c97c47c64 SHA1 a5a59e97858baaada3086cafe50c44b7ec36b7c1 SHA256 13d6e4d0e5521a8f1cd7768d25cf0f687f4fe5a90d0f842ad7016d8da7d6e51b
+MD5 378515c2afbd4bfb6f26163fc1c88e1e ChangeLog 18170
+RMD160 62283d07017f9bb728e2e39c6a05593c97c47c64 ChangeLog 18170
+SHA256 13d6e4d0e5521a8f1cd7768d25cf0f687f4fe5a90d0f842ad7016d8da7d6e51b ChangeLog 18170
 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46
 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282
 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282
@@ -68,16 +63,13 @@ SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/di
 MD5 3add5888d02ad00946eb670f1d6eff5c files/digest-portage-2.1.1-r2 1021
 RMD160 082589ba69cde6b349a156722316ba10bdcfe0cd files/digest-portage-2.1.1-r2 1021
 SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/digest-portage-2.1.1-r2 1021
-MD5 649baa980ba7c5f2e08b34034e71e079 files/digest-portage-2.1.2-r1 759
-RMD160 c313594834aa9e409d767d49100f60a0480c36e8 files/digest-portage-2.1.2-r1 759
-SHA256 e6443a2340b8426eb45ef5e77751fdf510599bd8e08ae452f09475497c33bbf9 files/digest-portage-2.1.2-r1 759
-MD5 0de18688f14df5ab3e7fe63cd1726686 files/digest-portage-2.1.2-r2 759
-RMD160 dc37ea2a70ed77bb2837f3b58a10712f7305b75b files/digest-portage-2.1.2-r2 759
-SHA256 d22bfe22a7ad24940358b3f8a4d8f312315507530c18f88e6ec184073cf6fa4b files/digest-portage-2.1.2-r2 759
+MD5 493b4d52c224f2c8a037fcb08f1c45df files/digest-portage-2.1.2-r3 762
+RMD160 bd302a3d02af75a7e6e851a73ff3d9f2db2515a6 files/digest-portage-2.1.2-r3 762
+SHA256 751117ac6f3622b7a150d313eea72bdb03c9c775103a6499df82d44a321eeaad files/digest-portage-2.1.2-r3 762
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFtAF1/ejvha5XGaMRAjY1AJ9dsnfuUu038OR44qn+i6pmlftU2wCdFQYs
-EJxSJTrR6XZwiHYPa5raBKA=
-=B2It
+iD8DBQFFtps1/ejvha5XGaMRAi+FAJ96kRfdDOD2BmhTZXo3Uc8RbNC30gCgo/3C
+Ba7P3kiTYGgqNHe9fKkK5/Y=
+=fYau
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/files/digest-portage-2.1.2-r2 b/sys-apps/portage/files/digest-portage-2.1.2-r2
deleted file mode 100644 (file)
index 4331fbb..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 078913bfe47861c8455b233b28fa6167 portage-2.1.2-r2.patch.bz2 9551
-RMD160 98839b9b33d9c564897933d102ff996bc7eeeca2 portage-2.1.2-r2.patch.bz2 9551
-SHA256 90f467fd64c509a889e4165d26fc55845bc6b8ddbbd75c61cccb9fdff9cb94fe portage-2.1.2-r2.patch.bz2 9551
-MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
-RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
-SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
-MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893
-RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893
-SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893
similarity index 66%
rename from sys-apps/portage/files/digest-portage-2.1.2-r1
rename to sys-apps/portage/files/digest-portage-2.1.2-r3
index 3f85753e44b6a13ee07550c99d8eb8a5af21804a..b28c3cafd6314ee670d4d5456f5c76ef6ee04e0b 100644 (file)
@@ -1,6 +1,6 @@
-MD5 e1af7e310a5d32e4ec11c57e0b1a2148 portage-2.1.2-r1.patch.bz2 7540
-RMD160 5a03c9ad9e2a1787ffb23e128df81f6617222ca3 portage-2.1.2-r1.patch.bz2 7540
-SHA256 81a6e079375bc4f3d6bbaf1f0c5d5fae240f9be11fdfecd2f1d8fd3189aff534 portage-2.1.2-r1.patch.bz2 7540
+MD5 45255362c7c4be0f89e3462236621a5a portage-2.1.2-r3.patch.bz2 11085
+RMD160 843156e196312b7f8ffb9626442d745b8bbf569d portage-2.1.2-r3.patch.bz2 11085
+SHA256 fba16b400b81cc2f59e3d5fd2a3ef00ce99a2ccc2eca3d17047767c37955ddc0 portage-2.1.2-r3.patch.bz2 11085
 MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900
 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900
 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900
diff --git a/sys-apps/portage/portage-2.1.2-r2.ebuild b/sys-apps/portage/portage-2.1.2-r2.ebuild
deleted file mode 100644 (file)
index 3664e01..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r2.ebuild,v 1.1 2007/01/22 00:12:32 zmedico Exp $
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="The Portage Package Management System. The primary 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-PROVIDE="virtual/portage"
-SLOT="0"
-# USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5).
-IUSE_ELIBC="elibc_glibc elibc_uclibc elibc_FreeBSD"
-IUSE_USERLAND="userland_Darwin userland_GNU"
-IUSE="build doc epydoc selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}"
-DEPEND=">=dev-lang/python-2.3
-       !build? ( >=sys-apps/sed-4.0.5 )
-       epydoc? ( >=dev-python/epydoc-2.0 )"
-RDEPEND=">=dev-lang/python-2.3
-       !build? ( >=sys-apps/sed-4.0.5
-               dev-python/python-fchksum
-               !userland_Darwin? ( >=app-shells/bash-3.0 ) )
-       elibc_glibc? ( >=sys-apps/sandbox-1.2.17 )
-       elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 )
-       !userland_Darwin? ( >=app-misc/pax-utils-0.1.13 )
-       selinux? ( >=dev-python/python-selinux-2.16 )
-       doc? ( app-portage/portage-manpages )
-       >=dev-python/pycrypto-2.0.1-r5"
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
-       ${SRC_ARCHIVES}/${PN}-${PV}.tar.bz2
-       linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-       ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}.tar.bz2 )"
-
-PATCHVER=""
-[ "${PR}" != "r0" ] && PATCHVER="-${PR}"
-if [ -n "${PATCHVER}" ]; then
-       SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PV}${PATCHVER}.patch.bz2
-       ${SRC_ARCHIVES}/${PN}-${PV}${PATCHVER}.patch.bz2"
-fi
-
-if [ -n "${PATCHVER_PL}" ]; then
-       SRC_URI="${SRC_URI} linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2
-       ${SRC_ARCHIVES}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch.bz2 )"
-fi
-
-S="${WORKDIR}"/${PN}-${PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-portage_docs() {
-       elog ""
-       elog "For help with using portage please consult the Gentoo Handbook"
-       elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-       elog ""
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       if [ -n "${PATCHVER}" ]; then
-               cd "${S}"
-               epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-       fi
-       if [ "${PR}" != "r0" ]; then
-               elog "Setting portage.VERSION to ${PVR} ..."
-               sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
-                       die "Failed to patch portage.VERSION"
-               eend 0
-       fi
-       if [ -n "${PATCHVER_PL}" ]; then
-               use linguas_pl && \
-                       epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-       fi
-}
-
-src_compile() {
-       append-lfs-flags
-
-       cd "${S}"/src
-       $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tbz2tool tbz2tool.c || \
-               die "Failed to build tbz2tool"
-
-       if use elibc_FreeBSD; then
-               cd "${S}"/src/bsd-flags
-               chmod +x setup.py
-               ./setup.py build || die "Failed to install bsd-chflags module"
-       fi
-
-       if use epydoc; then
-               mkdir "${WORKDIR}"/api
-               local my_modules
-               my_modules="$(find "${S}/pym" -name "*.py" \
-                       | sed -e 's:.*__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-                        -e 's:/:.:g')" || die "error listing modules"
-               PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \
-                       -qqqqq --ignore-param-mismatch ${my_modules} || die "epydoc failed"
-       fi
-}
-
-src_test() {
-       ./tests/runTests || \
-               die "test(s) failed"
-}
-
-src_install() {
-       local portage_base="/usr/lib/portage"
-       cd "${S}"/cnf
-       insinto /etc
-       doins etc-update.conf dispatch-conf.conf make.globals
-       if [ -f "make.conf.${ARCH}".diff ]; then
-               patch make.conf "make.conf.${ARCH}".diff || \
-                       die "Failed to patch make.conf.example"
-               newins make.conf make.conf.example
-       else
-               eerror ""
-               eerror "Portage does not have an arch-specific configuration for this arch."
-               eerror "Please notify the arch maintainer about this issue. Using generic."
-               eerror ""
-               newins make.conf make.conf.example
-       fi
-
-       if use elibc_FreeBSD; then
-               cd "${S}"/src/bsd-flags
-               ./setup.py install --root "${D}" || \
-                       die "Failed to install bsd-chflags module"
-       fi
-
-       dodir ${portage_base}/bin
-       exeinto ${portage_base}/bin
-       # BSD and OSX need a sed wrapper so that find/xargs work properly
-       if use userland_GNU; then
-               rm "${S}"/bin/sed || die "Failed to remove sed wrapper"
-       fi
-       cd "${S}"/bin
-       doexe *
-       doexe "${S}"/src/tbz2tool
-       dosym newins ${portage_base}/bin/donewins
-
-       for mydir in pym pym/cache pym/elog_modules; do
-               dodir ${portage_base}/${mydir}
-               insinto ${portage_base}/${mydir}
-               cd "${S}"/${mydir}
-               doins *.py
-       done
-
-       doman "${S}"/man/*.[0-9]
-       if use linguas_pl; then
-               doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
-               doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
-       fi
-       dodoc "${S}"/ChangeLog
-       dodoc "${S}"/NEWS
-       dodoc "${S}"/RELEASE-NOTES
-       use epydoc && dohtml -r "${WORKDIR}"/api
-
-       dodir /usr/bin
-       for x in ebuild emerge portageq repoman tbz2tool xpak; do
-               dosym ../lib/portage/bin/${x} /usr/bin/${x}
-       done
-
-       dodir /usr/sbin
-       local my_syms="archive-conf
-               dispatch-conf
-               emaint
-               emerge-webrsync
-               env-update
-               etc-update
-               fixpackages
-               quickpkg
-               regenworld"
-       local x
-       for x in ${my_syms}; do
-               dosym ../lib/portage/bin/${x} /usr/sbin/${x}
-       done
-
-       dodir /etc/portage
-       keepdir /etc/portage
-
-       doenvd "${FILESDIR}"/05portage.envd
-}
-
-pkg_preinst() {
-       local portage_base="/usr/lib/portage"
-       if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then
-               rm -rf "${IMAGE}"/${portage_base}/pym/*
-               mv "${IMAGE}"/${portage_base}/bin/tbz2tool "${T}"
-               rm -rf "${IMAGE}"/${portage_base}/bin/*
-               mv "${T}"/tbz2tool "${IMAGE}"/${portage_base}/bin/
-       else
-               for mydir in bin pym pym/cache pym/elog_modules; do
-                       rm "${ROOT}"/${portage_base}/${mydir}/*.pyc >& /dev/null
-                       rm "${ROOT}"/${portage_base}/${mydir}/*.pyo >& /dev/null
-               done
-       fi
-}
-
-pkg_postinst() {
-       local x
-
-       if [ ! -f "${ROOT}/var/lib/portage/world" ] &&
-          [ -f "${ROOT}"/var/cache/edb/world ] &&
-          [ ! -h "${ROOT}"/var/cache/edb/world ]; then
-               mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world
-               ln -s ../../lib/portage/world /var/cache/edb/world
-       fi
-
-       for x in "${ROOT}"/etc/._cfg????_make.globals; do
-               # Overwrite the globals file automatically.
-               [ -e "${x}" ] && mv -f "${x}" "${ROOT}etc/make.globals"
-       done
-
-       ewarn "In portage-2.1.2, installation actions do not necessarily pull in build time"
-       ewarn "dependencies that are not strictly required.  This behavior is adjustable"
-       ewarn "via the new --with-bdeps option that is documented in the emerge(1) man page."
-       ewarn "For more information regarding this change, please refer to bug #148870."
-       echo
-       elog "See NEWS and RELEASE-NOTES for further changes."
-       echo
-       portage_docs
-}
similarity index 99%
rename from sys-apps/portage/portage-2.1.2-r1.ebuild
rename to sys-apps/portage/portage-2.1.2-r3.ebuild
index 938e5fd36fbf3a96e873b9717a5c8d68ee6b4b53..3ab81b8e4c2e730734b8d24bac7d73202e7dbbe5 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r1.ebuild,v 1.1 2007/01/19 04:09:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r3.ebuild,v 1.1 2007/01/23 23:33:03 zmedico Exp $
 
 inherit toolchain-funcs eutils flag-o-matic