From: Zac Medico Date: Wed, 20 Dec 2006 05:13:55 +0000 (+0000) Subject: 2.1.2_rc3-r8 revbump. This fixes bugs #158558 and #158608. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b972690b8ce17e2962ca650941e189dfdeffb5b;p=gentoo.git 2.1.2_rc3-r8 revbump. This fixes bugs #158558 and #158608. Package-Manager: portage-2.1.2_rc3-r8 --- diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 991728bb4be0..3d0fb644249a 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -18,8 +18,8 @@ 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_rc3-r6.patch.bz2 14308 RMD160 cfa20b2ca53c483fb1e723b9e21f32c304066fb7 SHA1 18c88fbb5f28f621b1efafced7d41d502a15b466 SHA256 14eca10d16033d16f8547bef7851347decd5332ec5bfbe8ddfdfda954dbfe8cd DIST portage-2.1.2_rc3-r7.patch.bz2 16034 RMD160 f4dad160db6a8dcc65fb29544121a9d7d0935338 SHA1 6e1cca81f6cf0a3a874bdcf0c044737dc1138b69 SHA256 825343d6e89b479ed7e97ef059d0cf303e21bcb83880a559d4f9cf432688138d +DIST portage-2.1.2_rc3-r8.patch.bz2 19065 RMD160 c3316a57ebe0368b1abfc36f4858e038dff113d1 SHA1 4fca08ef3f81879da399d3d2e5feafab4fae7326 SHA256 8d431b68f1dfa1edb9824e21d75882e0860674c7052551af1739300cc9230727 DIST portage-2.1.2_rc3.tar.bz2 334999 RMD160 98af2da9c8e698fe511d53c604c4c2b7703812cd SHA1 0e929b29172de4de90e5f27ceec46470a2772890 SHA256 547d4d3be34eeea555ea7b1b87bc0f51aef9d4099767d232a79086acdeacf862 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b DIST portage-man-pl-2.1.2_rc1.tar.bz2 53030 RMD160 9ed9037256f3eba59600028f2d8f78792a33383a SHA1 a511121897609bd5a261981fcc7f6789eb1deaaf SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a @@ -40,22 +40,22 @@ EBUILD portage-2.1.1-r2.ebuild 7234 RMD160 7516a62adb99ae3e88d6db389cccee1efca3b MD5 c583bfb1e33476953f90a66ab2557c53 portage-2.1.1-r2.ebuild 7234 RMD160 7516a62adb99ae3e88d6db389cccee1efca3b532 portage-2.1.1-r2.ebuild 7234 SHA256 2e517ceee2ec5a426effa4716c2e95b22db3acc62faab3fd637b78498634ef61 portage-2.1.1-r2.ebuild 7234 -EBUILD portage-2.1.2_rc3-r6.ebuild 7863 RMD160 33decab7b55bcbaa6bb1aac8a160bb0e8066d710 SHA1 49523d945b676eaba72ed226ab1bce76f775ca1b SHA256 208085c87b66649e4c5d5e7a0a4911506f6542fc9c375a399b398f822595a303 -MD5 ebee7ec7605aa81fae20daa7e27cf1a1 portage-2.1.2_rc3-r6.ebuild 7863 -RMD160 33decab7b55bcbaa6bb1aac8a160bb0e8066d710 portage-2.1.2_rc3-r6.ebuild 7863 -SHA256 208085c87b66649e4c5d5e7a0a4911506f6542fc9c375a399b398f822595a303 portage-2.1.2_rc3-r6.ebuild 7863 EBUILD portage-2.1.2_rc3-r7.ebuild 7863 RMD160 7a0a7856d119cf232c37854c80258c2f9cac7fa5 SHA1 b51b508ff150e29dd74e2e0dc4eb40f7d914e4a4 SHA256 5d215b2998f8eeb422f47022a3827eb5d8800466bed111f82dec5351966ae5e8 MD5 d46b92165c67b1a0051fb3477e272868 portage-2.1.2_rc3-r7.ebuild 7863 RMD160 7a0a7856d119cf232c37854c80258c2f9cac7fa5 portage-2.1.2_rc3-r7.ebuild 7863 SHA256 5d215b2998f8eeb422f47022a3827eb5d8800466bed111f82dec5351966ae5e8 portage-2.1.2_rc3-r7.ebuild 7863 +EBUILD portage-2.1.2_rc3-r8.ebuild 7863 RMD160 2a66111214c020cc88f29f85f3eb01aa6c460b2b SHA1 d753f7ef66751d171cd0b29065b5046a14aef61d SHA256 89e27183eab3695a4b1d62415f1efbd8b01daa0319df07849f0acc382b62b744 +MD5 c12bc33af413b369a58940feddc6eccd portage-2.1.2_rc3-r8.ebuild 7863 +RMD160 2a66111214c020cc88f29f85f3eb01aa6c460b2b portage-2.1.2_rc3-r8.ebuild 7863 +SHA256 89e27183eab3695a4b1d62415f1efbd8b01daa0319df07849f0acc382b62b744 portage-2.1.2_rc3-r8.ebuild 7863 EBUILD portage-2.1.2_rc3.ebuild 7860 RMD160 23c146fe4b1529720c20bf9839c82ca11028cb66 SHA1 25f54ab24bf11d88e459db105f94601c3fa72947 SHA256 facfeb1f297993a51c4cfe36c52fcec706d409528a9bba2a62990456c06feb55 MD5 3daf64c4d73c3bddbafe517fe7ebcb52 portage-2.1.2_rc3.ebuild 7860 RMD160 23c146fe4b1529720c20bf9839c82ca11028cb66 portage-2.1.2_rc3.ebuild 7860 SHA256 facfeb1f297993a51c4cfe36c52fcec706d409528a9bba2a62990456c06feb55 portage-2.1.2_rc3.ebuild 7860 -MISC ChangeLog 22021 RMD160 bd023a9dda79800168e00795fd8bc2fd98cf562d SHA1 29f7b8e929637305f41a28e33a7534dd3eb37481 SHA256 9324959cfefa1b7bb210fb40642b7546dfd636abaa1ae2b6fcd5bbaa99365149 -MD5 e64487780aec28f37741f7322468415f ChangeLog 22021 -RMD160 bd023a9dda79800168e00795fd8bc2fd98cf562d ChangeLog 22021 -SHA256 9324959cfefa1b7bb210fb40642b7546dfd636abaa1ae2b6fcd5bbaa99365149 ChangeLog 22021 +MISC ChangeLog 22198 RMD160 1961004cdd3d94f936653f1d126fa651b6556751 SHA1 ffbf476df0ccd2cc29a07034280b0e79875b1a9d SHA256 447f9e4c64756cedb4b4760c9d0b91f0c6700fd16b86c3a95a9bbfe3b697c325 +MD5 f9d14f1e2b591c134905afde0f7e9c91 ChangeLog 22198 +RMD160 1961004cdd3d94f936653f1d126fa651b6556751 ChangeLog 22198 +SHA256 447f9e4c64756cedb4b4760c9d0b91f0c6700fd16b86c3a95a9bbfe3b697c325 ChangeLog 22198 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -75,16 +75,16 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di MD5 751568bb8edb2468806a596f06b4cfcb files/digest-portage-2.1.2_rc3 530 RMD160 6409faa66b3cfce612474516be061e4b4e5514d7 files/digest-portage-2.1.2_rc3 530 SHA256 0b6331d7a25052d2dd0be1018dd89f82f33bc4ae5c18ad89a51aab48b8d1d2c5 files/digest-portage-2.1.2_rc3 530 -MD5 8e34b063efcfb88d547eb413c8df8f2d files/digest-portage-2.1.2_rc3-r6 798 -RMD160 942ae3a262768901e26a3375c2447dd7373b3e7f files/digest-portage-2.1.2_rc3-r6 798 -SHA256 c6c56515c70c401f98a4c7fa9d8229ef1fa5a19580878ebc4c183b8bc0748528 files/digest-portage-2.1.2_rc3-r6 798 MD5 3c302a3ac506919b6a418985833f61e7 files/digest-portage-2.1.2_rc3-r7 798 RMD160 7ac090add3736023c0d4f97e0687eb798595843a files/digest-portage-2.1.2_rc3-r7 798 SHA256 834cc34c8c2f2dde9be34c144a205b130ae4538c12e577159bb7cd047a5788e1 files/digest-portage-2.1.2_rc3-r7 798 +MD5 296e1fa3c3699455f263101a57788166 files/digest-portage-2.1.2_rc3-r8 798 +RMD160 2db6bf4e518fd2ef56eb2a402dfbdae0f8fd316e files/digest-portage-2.1.2_rc3-r8 798 +SHA256 e07ec06b2f9b3360042eaadcc6a8b9117cd8772dd884d846866e0b2fc0610c58 files/digest-portage-2.1.2_rc3-r8 798 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFh2Zn/ejvha5XGaMRAhyjAKCniLmQflKrFMgra5r6fWtaYpbYCQCeJweT -N3kUw2Y9HkF0WJyx01kVtns= -=WZPF +iD8DBQFFiMZ8/ejvha5XGaMRAiUlAJ0cZ1w2VkZFYiRgHtHutzspWx8b7QCeNmxd +DGDmVdBANVRFg5Zm/5ExavE= +=I8zP -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc3-r6 b/sys-apps/portage/files/digest-portage-2.1.2_rc3-r6 deleted file mode 100644 index a13bc9f747fb..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_rc3-r6 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 a980f04686a582dc5ea2a2126b4c5502 portage-2.1.2_rc3-r6.patch.bz2 14308 -RMD160 cfa20b2ca53c483fb1e723b9e21f32c304066fb7 portage-2.1.2_rc3-r6.patch.bz2 14308 -SHA256 14eca10d16033d16f8547bef7851347decd5332ec5bfbe8ddfdfda954dbfe8cd portage-2.1.2_rc3-r6.patch.bz2 14308 -MD5 2fb183cd39a87178d3772a938dd06223 portage-2.1.2_rc3.tar.bz2 334999 -RMD160 98af2da9c8e698fe511d53c604c4c2b7703812cd portage-2.1.2_rc3.tar.bz2 334999 -SHA256 547d4d3be34eeea555ea7b1b87bc0f51aef9d4099767d232a79086acdeacf862 portage-2.1.2_rc3.tar.bz2 334999 -MD5 624d18249325e364c13dc7ef7647f986 portage-man-pl-2.1.2_rc1.tar.bz2 53030 -RMD160 9ed9037256f3eba59600028f2d8f78792a33383a portage-man-pl-2.1.2_rc1.tar.bz2 53030 -SHA256 1d03dbfab182397a9fd739604ab526b644e07b9de397f029ea3e7f6969ed1e5a portage-man-pl-2.1.2_rc1.tar.bz2 53030 diff --git a/sys-apps/portage/portage-2.1.2_rc3-r6.ebuild b/sys-apps/portage/portage-2.1.2_rc3-r6.ebuild deleted file mode 100644 index e6e389955af9..000000000000 --- a/sys-apps/portage/portage-2.1.2_rc3-r6.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2006 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_rc3-r6.ebuild,v 1.1 2006/12/17 01:10:15 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_rc1" -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() { - local test_runner="./tests/runTests" - chmod +x ${test_runner} - PYTHONPATH="${S}:${S}/pym:${PYTHONPATH}" ${test_runner} || \ - 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 - ewarn "In portage-2.1.2_rc2, the implicit RDEPEND behavior has been reverted back to" - ewarn "the way it was in