From e099f77eec985549f0b4928a58cc3797c8a8a8f6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 29 Dec 2006 03:08:08 +0000 Subject: [PATCH] 2.1.2_rc4-r2 revbump. This fixes bugs #148603, #158931, #158983, #159161, #159252, and #159295. Package-Manager: portage-2.1.2_rc4-r2 --- sys-apps/portage/Manifest | 29 +-- .../portage/files/digest-portage-2.1.2_rc4 | 6 - sys-apps/portage/portage-2.1.2_rc4.ebuild | 226 ------------------ 3 files changed, 15 insertions(+), 246 deletions(-) delete mode 100644 sys-apps/portage/files/digest-portage-2.1.2_rc4 delete mode 100644 sys-apps/portage/portage-2.1.2_rc4.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 371aaa7f841a..b7f0e6d43944 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -20,6 +20,7 @@ DIST portage-2.1.1-r2.patch.bz2 5263 RMD160 6b749c6700784ea1ecc615b7b3ed39eade28 DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389 DIST portage-2.1.2_rc3.tar.bz2 334999 RMD160 98af2da9c8e698fe511d53c604c4c2b7703812cd SHA1 0e929b29172de4de90e5f27ceec46470a2772890 SHA256 547d4d3be34eeea555ea7b1b87bc0f51aef9d4099767d232a79086acdeacf862 DIST portage-2.1.2_rc4-r1.patch.bz2 8029 RMD160 fd81ced63ff0687b2d0875cbf167ec0c9719c2b7 SHA1 c7db38eba82f83db0ed365d12420efceeb4967ff SHA256 4df6679376c77b7392f0d321d6d5d5dcd5958892e9e05e8c940eb105bda063d0 +DIST portage-2.1.2_rc4-r2.patch.bz2 18370 RMD160 18916377fac1a43afc4645f8928d2a285909cf23 SHA1 8dddebfdc1497e50dbc284ce8f1ebb2f8239c050 SHA256 41011be59ffca2058bc7cfed3b9b3d46fb218910eeded9c9dc91c0b5d024cc7c DIST portage-2.1.2_rc4.tar.bz2 342408 RMD160 a5ff27e1db02929940aa90108cb8d9219c7f1a48 SHA1 7c5aea96360e067c9d6163caa4e6682b07ea2104 SHA256 15d33e3845850b7e6866cf1973256ad98f018e4cb097a1146161c58e7c7a601d 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 @@ -48,14 +49,14 @@ EBUILD portage-2.1.2_rc4-r1.ebuild 6874 RMD160 0df395d9df682fb480b510b84761f469e MD5 971def1e65a1cad1a7d5059b9f7b53aa portage-2.1.2_rc4-r1.ebuild 6874 RMD160 0df395d9df682fb480b510b84761f469ec3e7514 portage-2.1.2_rc4-r1.ebuild 6874 SHA256 3e40732ba58342e03e3cc01190ab2b7ac81376a41622b510375fad3caec99578 portage-2.1.2_rc4-r1.ebuild 6874 -EBUILD portage-2.1.2_rc4.ebuild 6871 RMD160 2e167d076477e2fb14e127e049b230a247168bb3 SHA1 762d71078f3411f5d02bbc3378602fbfdb39e7b4 SHA256 5622b6d46b57c6f5ccac526af54272b2619970590415dd21fe0f7edb0c29dab3 -MD5 6601d8b846e4dc3b8dae73bdd68a9adc portage-2.1.2_rc4.ebuild 6871 -RMD160 2e167d076477e2fb14e127e049b230a247168bb3 portage-2.1.2_rc4.ebuild 6871 -SHA256 5622b6d46b57c6f5ccac526af54272b2619970590415dd21fe0f7edb0c29dab3 portage-2.1.2_rc4.ebuild 6871 -MISC ChangeLog 18661 RMD160 1f5cbde3ecd769754faf3cfa77d2140b0d5c8c0d SHA1 057e3e135fce749bbf23f5dac9b5d91df68f75fb SHA256 894ed832d1664fb7dbced81ca3d9cebe036fa064b15ee6d56624b2b1e776eedf -MD5 fc364075f68ab1611d4929ac2811260e ChangeLog 18661 -RMD160 1f5cbde3ecd769754faf3cfa77d2140b0d5c8c0d ChangeLog 18661 -SHA256 894ed832d1664fb7dbced81ca3d9cebe036fa064b15ee6d56624b2b1e776eedf ChangeLog 18661 +EBUILD portage-2.1.2_rc4-r2.ebuild 6874 RMD160 fbf4416aee43a4eab1e29f31a63a20d8c8eb09c3 SHA1 186c2af7d8d78d4f83044c9cf72a24c8a9d2274a SHA256 6d7fb21e7613d970f4b6e51de8ebfd5c64b2f1905cd3e910e094aa72d9800350 +MD5 d284b0cd71977ff83a9646cc8b03129b portage-2.1.2_rc4-r2.ebuild 6874 +RMD160 fbf4416aee43a4eab1e29f31a63a20d8c8eb09c3 portage-2.1.2_rc4-r2.ebuild 6874 +SHA256 6d7fb21e7613d970f4b6e51de8ebfd5c64b2f1905cd3e910e094aa72d9800350 portage-2.1.2_rc4-r2.ebuild 6874 +MISC ChangeLog 18876 RMD160 09a401d451410ac8630953417fee87140f15a833 SHA1 3457f0dbe5f09e2953d1bdc3754cbc4a8b42e277 SHA256 8d4a6b6d7f52a12a2e12cfe029de8ca3620ea451143f82bc250811c23c5bd43b +MD5 445e0a08f57feb002e6de7bf2cfcc5c8 ChangeLog 18876 +RMD160 09a401d451410ac8630953417fee87140f15a833 ChangeLog 18876 +SHA256 8d4a6b6d7f52a12a2e12cfe029de8ca3620ea451143f82bc250811c23c5bd43b ChangeLog 18876 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -75,16 +76,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 25628c11555dc82fbcd6ac5efe46f45c files/digest-portage-2.1.2_rc4 530 -RMD160 35550aab855fb1dcd19a4eee1b05be66b58b5260 files/digest-portage-2.1.2_rc4 530 -SHA256 a5d8592442fc98226e14e7d63c877f8a1c9fcfade4876acdf0aac7ecc4e89345 files/digest-portage-2.1.2_rc4 530 MD5 e1caa98a1cc1553141ee458140108f7a files/digest-portage-2.1.2_rc4-r1 795 RMD160 6d710359768632dd4e6e4f561ceafd23899a5a2f files/digest-portage-2.1.2_rc4-r1 795 SHA256 e19b57ba487c336310c1242fe0ae05cd46eb32b2462bf065e5ef3da1b32b335e files/digest-portage-2.1.2_rc4-r1 795 +MD5 dd42b1698cc627d2d4a3b6b2d21a7d0b files/digest-portage-2.1.2_rc4-r2 798 +RMD160 1298b0164b22f47fa549026d4520f855660863c8 files/digest-portage-2.1.2_rc4-r2 798 +SHA256 8a5092c1a54131b65c76febcdede0847c9e8c720c6b3b66b7a06d6ab230abf45 files/digest-portage-2.1.2_rc4-r2 798 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFjyhq/ejvha5XGaMRArmTAKDZJ3lq4gn0LHrDiTirWXXNhmdIywCfRH+2 -VuRROTewBemSfYW+Oooe+k8= -=Myl/ +iD8DBQFFlIaS/ejvha5XGaMRApdNAJ9qcvtWOznGx11Rt+A892qsESJRagCg6uHS +eq0X1USM1icliz22WtSTdVY= +=vrUJ -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc4 b/sys-apps/portage/files/digest-portage-2.1.2_rc4 deleted file mode 100644 index d432afa2e187..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_rc4 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 efe9c50862533049db266ac46c903f82 portage-2.1.2_rc4.tar.bz2 342408 -RMD160 a5ff27e1db02929940aa90108cb8d9219c7f1a48 portage-2.1.2_rc4.tar.bz2 342408 -SHA256 15d33e3845850b7e6866cf1973256ad98f018e4cb097a1146161c58e7c7a601d portage-2.1.2_rc4.tar.bz2 342408 -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_rc4.ebuild b/sys-apps/portage/portage-2.1.2_rc4.ebuild deleted file mode 100644 index 83f4d277bad1..000000000000 --- a/sys-apps/portage/portage-2.1.2_rc4.ebuild +++ /dev/null @@ -1,226 +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_rc4.ebuild,v 1.1 2006/12/23 02:16:01 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 - elog "See NEWS and RELEASE-NOTES for further changes." - echo - portage_docs -} -- 2.26.2