From: Zac Medico Date: Thu, 26 Apr 2007 21:40:36 +0000 (+0000) Subject: 2.1.2.5 maintenance release. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc53bdfb162dfd074517276b1e24c0b936b81b58;p=gentoo.git 2.1.2.5 maintenance release. Package-Manager: portage-2.1.2.5 --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 8b6fe26f4e53..334205018ae2 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -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.376 2007/04/16 04:19:19 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.377 2007/04/26 21:40:36 zmedico Exp $ + +*portage-2.1.2.5 (26 Apr 2007) + + 26 Apr 2007; Zac Medico +portage-2.1.2.5.ebuild: + 2.1.2.5 maintenance release. This fixes bugs #175344, #175781, and #176139. *portage-2.1.2.4 (15 Apr 2007) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 7f4e14748a3f..5c9dc89e6f31 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -17,8 +17,7 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4 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.2.patch.bz2 36946 RMD160 cb55d2d2aa68ee149c8f6d9d94dfa3be5a884554 SHA1 2897ef16683d7cc8d5b8da04b67b93fcc83634d4 SHA256 1f5dd5105698773d46ce2345e9b5668271147d3b68e223216f965bf75a133f73 -DIST portage-2.1.2.3.patch.bz2 41518 RMD160 e30844294c3b7c803966a7da30f022c6b5e5b936 SHA1 1704b7f37a8cbdbc4ecaf51850d889536cc2d1d4 SHA256 bd0812aa965edd26c7b9ebcafbd87c86cce2521593f09fddf0da2078fedc9794 -DIST portage-2.1.2.4.patch.bz2 48348 RMD160 84be368bb945044ac0259336e3cda2880b634d9a SHA1 07d3f043df253305fcb69a0a809c26c4d2ee6e95 SHA256 ed54853f25f7d2abf6ba9a9cdab9c8cee941328610c6f7566981b33d5b516106 +DIST portage-2.1.2.5.patch.bz2 49267 RMD160 35be319d07d91b8d7a25c6ef92425a5b9637abd8 SHA1 f2b5e789f5e95e1b479733dbb9040c1d38e8a371 SHA256 2ff23e1b7b906adee9550148cfb5fa2d04e71d90d6a86c332afd3dc1aeba306a 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 @@ -35,22 +34,18 @@ EBUILD portage-2.1.2.2.ebuild 7011 RMD160 e7bc1c9ce8788df19da8609c305a7c54ca3b4b MD5 4c835c577886243b275aa3d9d4ef00da portage-2.1.2.2.ebuild 7011 RMD160 e7bc1c9ce8788df19da8609c305a7c54ca3b4b96 portage-2.1.2.2.ebuild 7011 SHA256 9899d28591768c7d88e030bbb5d60375cdf292aa2eaef6000d4d16723a6563d8 portage-2.1.2.2.ebuild 7011 -EBUILD portage-2.1.2.3.ebuild 7101 RMD160 d99e78cd24b1173357a222d0bb858d688f6d8dcb SHA1 c97529da166749317d20ac803e0c8d6d2cae1fa7 SHA256 4b510adbada8dd4b56b2c1274599d71c053be1cfd96e5946af7adf29c38bf376 -MD5 397e66cfc7b8589a184d54f6c069892e portage-2.1.2.3.ebuild 7101 -RMD160 d99e78cd24b1173357a222d0bb858d688f6d8dcb portage-2.1.2.3.ebuild 7101 -SHA256 4b510adbada8dd4b56b2c1274599d71c053be1cfd96e5946af7adf29c38bf376 portage-2.1.2.3.ebuild 7101 -EBUILD portage-2.1.2.4.ebuild 7102 RMD160 f30b066a878c561d99787cfe7a05dc5a18ce0a3c SHA1 c7bd25fd86ed826917df63f3fc5a7602165b078c SHA256 a928f1fd8d8f71e14ed2a8b439bb6c0f5d68437b946b0f8f3f3466567d448912 -MD5 0c83c94212fcc9673618d7e14a9bbb47 portage-2.1.2.4.ebuild 7102 -RMD160 f30b066a878c561d99787cfe7a05dc5a18ce0a3c portage-2.1.2.4.ebuild 7102 -SHA256 a928f1fd8d8f71e14ed2a8b439bb6c0f5d68437b946b0f8f3f3466567d448912 portage-2.1.2.4.ebuild 7102 -MISC ChangeLog 19751 RMD160 c5e9054d248bcfd5aae4f26759ebd7adbc1172e4 SHA1 fb09845ea9f124d51f122e338305a0bfa9a7ea22 SHA256 c38d8a303ed1a536bf2eb9a2ba3e4fab489e8bc8bcef78b60d7c65f1c73a992e -MD5 4ef42a88b4e85a8467e7a1176609f682 ChangeLog 19751 -RMD160 c5e9054d248bcfd5aae4f26759ebd7adbc1172e4 ChangeLog 19751 -SHA256 c38d8a303ed1a536bf2eb9a2ba3e4fab489e8bc8bcef78b60d7c65f1c73a992e ChangeLog 19751 -MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 -MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 -RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 -SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 metadata.xml 282 +EBUILD portage-2.1.2.5.ebuild 7102 RMD160 81546cc3d763d021471929f98e07780e708a0d6c SHA1 a2e1d48fc217270be5661e1934c7c6f4a92e5ea5 SHA256 c67f3f984e6bc4f9b2b6917563d092b59cb854d69ebac5a885deef8254c52354 +MD5 1a78ef634aab85ac3b7a1ab3c339f1b5 portage-2.1.2.5.ebuild 7102 +RMD160 81546cc3d763d021471929f98e07780e708a0d6c portage-2.1.2.5.ebuild 7102 +SHA256 c67f3f984e6bc4f9b2b6917563d092b59cb854d69ebac5a885deef8254c52354 portage-2.1.2.5.ebuild 7102 +MISC ChangeLog 19935 RMD160 c905ae4464bcda6c31c3fe4087050f0804ffa8e6 SHA1 d1c8cca47ce66200698552f548e7d40fcf5cdf3f SHA256 2fb751dd85399bdb0ae0a98d68df55411712b4587f66a2abd048680ef73e1f37 +MD5 de40d9bd5c09a024bfd195c1f6e9dd12 ChangeLog 19935 +RMD160 c905ae4464bcda6c31c3fe4087050f0804ffa8e6 ChangeLog 19935 +SHA256 2fb751dd85399bdb0ae0a98d68df55411712b4587f66a2abd048680ef73e1f37 ChangeLog 19935 +MISC metadata.xml 282 RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 SHA1 91e4b3ed133aefe77b32ea6de69cd0062b8e40a4 SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18 +MD5 dfcfc175ec5ae4909adae41bc375bcd6 metadata.xml 282 +RMD160 6c4808b6cd95ab87688faa56ba4d2fcf15d2ab53 metadata.xml 282 +SHA256 8f9dedd85eefb6985a8f28c79b4e7ec448ff3933fbac27cd169e15ed9e686c18 metadata.xml 282 MD5 705737811b9ae5871759cca1a00013d0 files/digest-portage-2.0.51.22-r3 256 RMD160 1bab4fc9bf2e3d805e696a68704ea119671f0474 files/digest-portage-2.0.51.22-r3 256 SHA256 ffe8e80d9f9a07f59b1ec992dc0e0c20aee41408302d64ffa0e2ef72deaf1686 files/digest-portage-2.0.51.22-r3 256 @@ -60,16 +55,13 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di MD5 925d42c079e45eec3f978b5f7016bc5e files/digest-portage-2.1.2.2 759 RMD160 5c05ea1481402ffdc98a69bb6e0f3307596cef33 files/digest-portage-2.1.2.2 759 SHA256 d8cbd61eab242247e3a0f76d5fafd63a398e4f1b4219e2193dd41f3a926fae05 files/digest-portage-2.1.2.2 759 -MD5 356e8100db292bd356319df6f08cec39 files/digest-portage-2.1.2.3 759 -RMD160 056b2ee35e80536b99048edeb9c0236192042afa files/digest-portage-2.1.2.3 759 -SHA256 35b33c67d81b1c8610528563db07b6a2791540f50a05d5aa305733ca595265d1 files/digest-portage-2.1.2.3 759 -MD5 c76d38c1d0bd2b2b8d71bc13bebd609e files/digest-portage-2.1.2.4 759 -RMD160 fd945e1cc4ad6afbbed3453f746432011bee9087 files/digest-portage-2.1.2.4 759 -SHA256 15dbd5e28f73a89cc6ce0f75ae787d98db5bcacf24d089d0c0a8df0610b34442 files/digest-portage-2.1.2.4 759 +MD5 4914e4e1859d58ddcedb87bd34f89963 files/digest-portage-2.1.2.5 759 +RMD160 f164fb9d1ac42bba564a7cb8ab7d3659fd8d28e8 files/digest-portage-2.1.2.5 759 +SHA256 4d058cee1e6485828d32dbd60f8b53f1619e57cad9317bf478a4ddc0d5cb4a39 files/digest-portage-2.1.2.5 759 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGIvlL/ejvha5XGaMRAt2tAJ0U3phdt7Nbge7PZ0d5mDDgahwGawCgqsxi -nNfS5g5cjjcNEg59KipNhoQ= -=olf2 +iD8DBQFGMRxZ/ejvha5XGaMRArJDAKDyoEigzmxjtUZAx29lQMCEJRSY2gCgiA7k +uCCoIDXIUTpCUZMd23QuRuo= +=7iQl -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2.4 b/sys-apps/portage/files/digest-portage-2.1.2.4 deleted file mode 100644 index 5853690949d7..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2.4 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 8ccd507c79a76a3873a757c6c6b82c70 portage-2.1.2.4.patch.bz2 48348 -RMD160 84be368bb945044ac0259336e3cda2880b634d9a portage-2.1.2.4.patch.bz2 48348 -SHA256 ed54853f25f7d2abf6ba9a9cdab9c8cee941328610c6f7566981b33d5b516106 portage-2.1.2.4.patch.bz2 48348 -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 diff --git a/sys-apps/portage/files/digest-portage-2.1.2.3 b/sys-apps/portage/files/digest-portage-2.1.2.5 similarity index 66% rename from sys-apps/portage/files/digest-portage-2.1.2.3 rename to sys-apps/portage/files/digest-portage-2.1.2.5 index b02862303fe3..430b51add4bd 100644 --- a/sys-apps/portage/files/digest-portage-2.1.2.3 +++ b/sys-apps/portage/files/digest-portage-2.1.2.5 @@ -1,6 +1,6 @@ -MD5 574d72a70e339eea3f516581cd6de8e0 portage-2.1.2.3.patch.bz2 41518 -RMD160 e30844294c3b7c803966a7da30f022c6b5e5b936 portage-2.1.2.3.patch.bz2 41518 -SHA256 bd0812aa965edd26c7b9ebcafbd87c86cce2521593f09fddf0da2078fedc9794 portage-2.1.2.3.patch.bz2 41518 +MD5 d13afe664cef4cc261e2bb2575c5d7cb portage-2.1.2.5.patch.bz2 49267 +RMD160 35be319d07d91b8d7a25c6ef92425a5b9637abd8 portage-2.1.2.5.patch.bz2 49267 +SHA256 2ff23e1b7b906adee9550148cfb5fa2d04e71d90d6a86c332afd3dc1aeba306a portage-2.1.2.5.patch.bz2 49267 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/metadata.xml b/sys-apps/portage/metadata.xml index 3fc0be22d69e..b52ecfe7c07c 100644 --- a/sys-apps/portage/metadata.xml +++ b/sys-apps/portage/metadata.xml @@ -2,6 +2,6 @@ no-herd -zmedico@gentoo.org dev-portage@gentoo.org +zmedico@gentoo.org diff --git a/sys-apps/portage/portage-2.1.2.4.ebuild b/sys-apps/portage/portage-2.1.2.4.ebuild deleted file mode 100644 index 80a5e90b6f6c..000000000000 --- a/sys-apps/portage/portage-2.1.2.4.ebuild +++ /dev/null @@ -1,230 +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.4.ebuild,v 1.1 2007/04/16 04:19:19 zmedico Exp $ - -inherit toolchain-funcs eutils flag-o-matic multilib - -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 ~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 ) - userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) ) - selinux? ( >=dev-python/python-selinux-2.16 ) - doc? ( app-portage/portage-manpages ) - >=dev-python/pycrypto-2.0.1-r5 - >=net-misc/rsync-2.6.4" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# rsync-2.6.4 rdep is for the --filter option #167668 -SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" - -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=${PVR} -if [ -n "${PATCHVER}" ]; then - SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2 - ${SRC_ARCHIVES}/${PN}-${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}-${PATCHVER}.patch" - fi - einfo "Setting portage.VERSION to ${PVR} ..." - sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \ - die "Failed to patch portage.VERSION" - eend 0 - 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 - einfo "Generating api docs" - 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 libdir=$(get_libdir) - local portage_base="/usr/${libdir}/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 ../${libdir}/portage/bin/${x} /usr/bin/${x} - done - - dodir /usr/sbin - local my_syms="archive-conf - dispatch-conf - emaint - emerge-webrsync - env-update - etc-update - fixpackages - quickpkg - regenworld" - local x - for x in ${my_syms}; do - dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x} - done - dosym env-update /usr/sbin/update-env - dosym etc-update /usr/sbin/update-etc - - dodir /etc/portage - keepdir /etc/portage - - echo PYTHONPATH=\"${portage_base}/pym\" > "${WORKDIR}"/05portage.envd - doenvd "${WORKDIR}"/05portage.envd -} - -pkg_preinst() { - local portage_base="/usr/$(get_libdir)/portage" - if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then - rm -rf "${D}"/${portage_base}/pym/* - mv "${D}"/${portage_base}/bin/tbz2tool "${T}" - rm -rf "${D}"/${portage_base}/bin/* - mv "${T}"/tbz2tool "${D}"/${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 -} diff --git a/sys-apps/portage/portage-2.1.2.3.ebuild b/sys-apps/portage/portage-2.1.2.5.ebuild similarity index 99% rename from sys-apps/portage/portage-2.1.2.3.ebuild rename to sys-apps/portage/portage-2.1.2.5.ebuild index 90ff57f10f25..374a6d0b6463 100644 --- a/sys-apps/portage/portage-2.1.2.3.ebuild +++ b/sys-apps/portage/portage-2.1.2.5.ebuild @@ -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.3.ebuild,v 1.2 2007/04/13 12:40:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2.5.ebuild,v 1.1 2007/04/26 21:40:36 zmedico Exp $ inherit toolchain-funcs eutils flag-o-matic multilib