From f14b21df7195592be081b8ef896f71e0650a451f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 11 Dec 2006 00:08:20 +0000 Subject: [PATCH] 2.1.2_rc3-r2 revbump. This fixes bugs #128809, #157709, and #157734. Package-Manager: portage-2.1.2_rc3-r2 --- sys-apps/portage/Manifest | 34 +-- .../portage/files/digest-portage-2.1.2_rc3-r1 | 9 - sys-apps/portage/portage-2.1.2_rc3-r1.ebuild | 239 ------------------ 3 files changed, 19 insertions(+), 263 deletions(-) delete mode 100644 sys-apps/portage/files/digest-portage-2.1.2_rc3-r1 delete mode 100644 sys-apps/portage/portage-2.1.2_rc3-r1.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index bb0a53072ec4..5256fe6a0250 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -13,12 +13,16 @@ AUX README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 SHA1 cfc8f MD5 c906e2e6782e197725b70f84cfe112a4 files/README.RESCUE 137 RMD160 b8d015f266501fd1f57c91899c6815de9f9d5685 files/README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 files/README.RESCUE 137 +AUX buildpkgonly_blockers.patch 447 RMD160 d9d460cb31581d47938b992d7426a7df1dcdec63 SHA1 f95f5078beb7845f7a482b1b69f7d6942ab5fa2e SHA256 10380f23461da51b0f22b3d976c60765f8445343ba5303106bce470fe1fd8385 +MD5 f896b99316a4dfcaeed35fcfe035f8e1 files/buildpkgonly_blockers.patch 447 +RMD160 d9d460cb31581d47938b992d7426a7df1dcdec63 files/buildpkgonly_blockers.patch 447 +SHA256 10380f23461da51b0f22b3d976c60765f8445343ba5303106bce470fe1fd8385 files/buildpkgonly_blockers.patch 447 DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c467cfe SHA1 16459ce2b19592c94ec580bcfade5a89750a62fb SHA256 f0dac4366b5234b084645bbbd6b871a5abe05d501cf868046af2777e02a4100c DIST portage-2.1-r2.tar.bz2 280469 RMD160 2507c4e2db3fdf1157e44430b449f618e99f5d57 SHA1 06ec20f96618271c7835ce505d4979b8f7914067 SHA256 854c61dd0232cca50d9bb9a3e9e13f22589b76029ea7eeacab2bc5d4ec7e48cc 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-r1.patch.bz2 8797 RMD160 915563bf1e3f7412af05f9efa41df70cb00b5caa SHA1 a760dbe4dd579bbd8092faa3e98e256ec5ce9442 SHA256 a42d5e9eaa79bd4f1cfc64bfc25f96a24ab3bb54ba820af7f69cd2be1cce7ee0 +DIST portage-2.1.2_rc3-r2.patch.bz2 9960 RMD160 518a524da148f71bbf320fa012b5f8827d739e50 SHA1 871c7cb335160ac6b830a0ca5c88e197d2fe21fd SHA256 7004b846d6ce68d1b623222833429632b9b3898f0a6acec9e93036507e894b90 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 @@ -39,18 +43,18 @@ 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-r1.ebuild 7863 RMD160 bbfd6a8b807b85a4e3f49186971260a514225b1b SHA1 81e341befd6473d95950935a1d6551eae6b3599f SHA256 65c92d6dc29c7eed9cad3d99c082d3b6a9d5cf3e5c11c6e6a95e1ae607d6b18c -MD5 96ca3392ad7fb039b0b8d821a171b117 portage-2.1.2_rc3-r1.ebuild 7863 -RMD160 bbfd6a8b807b85a4e3f49186971260a514225b1b portage-2.1.2_rc3-r1.ebuild 7863 -SHA256 65c92d6dc29c7eed9cad3d99c082d3b6a9d5cf3e5c11c6e6a95e1ae607d6b18c portage-2.1.2_rc3-r1.ebuild 7863 +EBUILD portage-2.1.2_rc3-r2.ebuild 7913 RMD160 f371054e49bbc6ceab917b867a9d3a5be7b9a17f SHA1 7980bda597b7374b150826c321d7e617ec13c280 SHA256 6593b72df36fd6265d313fb60795ec26636c11c5d48331c5e66046768f0c64c7 +MD5 7da711cd1bd7532817c30e9bd5e7e695 portage-2.1.2_rc3-r2.ebuild 7913 +RMD160 f371054e49bbc6ceab917b867a9d3a5be7b9a17f portage-2.1.2_rc3-r2.ebuild 7913 +SHA256 6593b72df36fd6265d313fb60795ec26636c11c5d48331c5e66046768f0c64c7 portage-2.1.2_rc3-r2.ebuild 7913 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 20748 RMD160 2bd3825cc7e1bf68300383f785c1fd7e19e78a37 SHA1 0b17cd1159802c452b0cba8dbc547d2151379d59 SHA256 39bbd31741f4facea64bf41a8d5ad4873a90bdc9a9cd08010631376688c41f07 -MD5 2ac0ccb9c11fc0ff51fb568e0a0f2246 ChangeLog 20748 -RMD160 2bd3825cc7e1bf68300383f785c1fd7e19e78a37 ChangeLog 20748 -SHA256 39bbd31741f4facea64bf41a8d5ad4873a90bdc9a9cd08010631376688c41f07 ChangeLog 20748 +MISC ChangeLog 20973 RMD160 9dd9043920da9f65cbc15c1a9c0c9b10fb6e7d02 SHA1 1557b5fd10880e15aebe384fd06bf2ef44e51e6d SHA256 54804ff5179db0969874144e5d710e21c7583c3df9c379253741cd1174c14dc0 +MD5 510401b2973e6363a461d4fda0abc9f1 ChangeLog 20973 +RMD160 9dd9043920da9f65cbc15c1a9c0c9b10fb6e7d02 ChangeLog 20973 +SHA256 54804ff5179db0969874144e5d710e21c7583c3df9c379253741cd1174c14dc0 ChangeLog 20973 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -70,13 +74,13 @@ 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 67862c9397f0868420279bd8f54ce081 files/digest-portage-2.1.2_rc3-r1 795 -RMD160 7f17f00821ce7e965c7e253195eedf8081e51448 files/digest-portage-2.1.2_rc3-r1 795 -SHA256 78fe962558c3df671ccfaee41da3902a19b84b1f163fdc54bcd85194017fb885 files/digest-portage-2.1.2_rc3-r1 795 +MD5 fc9ebfbbc99ea9349abcf332864d705b files/digest-portage-2.1.2_rc3-r2 795 +RMD160 c85132e4bcbc9495b52be0ab27d2232920fd1ab7 files/digest-portage-2.1.2_rc3-r2 795 +SHA256 bf45471e76c8c93deb6519752ca7f473042df5b8158c3663e44e0e26ea008461 files/digest-portage-2.1.2_rc3-r2 795 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFe5Ik/ejvha5XGaMRAsSCAJ45IWn8f7cmzh1ozT8jQ+8Ynf1pIACg0Qkh -wOLb2OpNQNVcvngT1t0xpk4= -=Dxed +iD8DBQFFfKFn/ejvha5XGaMRAgx2AJ4xBsekB7XhCJ7mdd5lRlJcRMbJ/gCgmNBR +/G/uKjQQo/gmVt904MDzNTw= +=a7m0 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc3-r1 b/sys-apps/portage/files/digest-portage-2.1.2_rc3-r1 deleted file mode 100644 index ebd74d8f202f..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_rc3-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 66199b1453a9eb64d8fcf8eda892bac4 portage-2.1.2_rc3-r1.patch.bz2 8797 -RMD160 915563bf1e3f7412af05f9efa41df70cb00b5caa portage-2.1.2_rc3-r1.patch.bz2 8797 -SHA256 a42d5e9eaa79bd4f1cfc64bfc25f96a24ab3bb54ba820af7f69cd2be1cce7ee0 portage-2.1.2_rc3-r1.patch.bz2 8797 -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-r1.ebuild b/sys-apps/portage/portage-2.1.2_rc3-r1.ebuild deleted file mode 100644 index acd21e15808e..000000000000 --- a/sys-apps/portage/portage-2.1.2_rc3-r1.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-r1.ebuild,v 1.1 2006/12/10 04:50:50 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