From ed54f12e13152da445b1560f370bb1a2d1af2b04 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 9 Oct 2006 01:54:22 +0000 Subject: [PATCH] 2.1.2_pre2-r7 revbump. This fixes bugs #140021, #149608, #150251, and #150361. Package-Manager: portage-2.1.2_pre2-r7 --- sys-apps/portage/Manifest | 31 +-- .../files/digest-portage-2.1.2_pre2-r4 | 12 - sys-apps/portage/portage-2.1.2_pre2-r4.ebuild | 205 ------------------ 3 files changed, 16 insertions(+), 232 deletions(-) delete mode 100644 sys-apps/portage/files/digest-portage-2.1.2_pre2-r4 delete mode 100644 sys-apps/portage/portage-2.1.2_pre2-r4.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 4ebc42f2c423..516a3b0ced8c 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -21,11 +21,12 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4 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.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f254 SHA1 6fdcb9897cef7f48d98829ab96caf37e31bd14a2 SHA256 3a5da4bb41ca8495f2673178f120622d8d923d8117b8744921418af5843c0389 -DIST portage-2.1.2_pre2-r4.patch.bz2 8550 RMD160 9e32f27abe3dc59aa4a563dc58d58290dddf3a68 SHA1 39796251833ffb1f024a98c2741c78d6f758dbaf SHA256 85e0074ac5f5c015fb0b5f8c40140b76fdceaa903e6961d7ff0df6dd23d6cde7 DIST portage-2.1.2_pre2-r5.patch.bz2 10242 RMD160 e8fa1cd22b51bddb533d3c4ea7f7cfa759643917 SHA1 e59dcf2b9ec46677e36856792ed4098556a77bcc SHA256 578fdc0fdc063b008932c48f6e8bbdd7162767eb2fb68e632971ff32d980c436 DIST portage-2.1.2_pre2-r6.patch.bz2 11618 RMD160 de8fa5c9d3dc263cdb488d49935d05e3fd633a24 SHA1 469c033ef6001fe704959aceb427cbc485c119b1 SHA256 8ac31dbfddadf4e383595090dd8268bb4b3b9a79523daf97050bf893738522a4 +DIST portage-2.1.2_pre2-r7.patch.bz2 13902 RMD160 51ba3a5702704490c593d69ca80484d6301d792d SHA1 6baf75ced9aae10ee7d21ec1ad05ad3e030699e2 SHA256 6d968fa1dc759d71db882fdcf4bba411b7b96359375670984c5ba73d0f0a3d7a DIST portage-2.1.2_pre2.tar.bz2 302712 RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 SHA1 11297373bc85c6b870ac04f711278d8ec0fffaeb SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b +DIST portage-man-pl-2.1.2_pre2-r7.patch.bz2 14420 RMD160 f6b798efcc39b81541f5a324dc68f832886731db SHA1 04958eeae1ffd7d32b518e421fb9cefd47844c3f SHA256 e621cb572cf8626c0dd9021830b67f1a3cfabbdffe89f3a7f85f4447e0aaa6e5 DIST portage-man-pl-2.1.2_pre2.tar.bz2 52838 RMD160 c3d9d59fd68606cb9c1b3f058a1ba2ebb6774101 SHA1 8d9132b1ff6f7b6c991de3e32acf1e0189e14cda SHA256 cda86d66967304338c73eb391a782aeee0b239c03d3484df04ca8db2a31bfc8c DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 EBUILD portage-2.0.51.22-r3.ebuild 5746 RMD160 acc2d23c94adbe7823d4193ff3af316be5e173c7 SHA1 a2378c598b797d463bcbac3cada663589fc45d9c SHA256 973bf27adcb1ff03fc1d06aa5851c2a1d82df571297064f41e2d0802a8cd3410 @@ -44,10 +45,6 @@ EBUILD portage-2.1.1.ebuild 6223 RMD160 5140ef703944fb3e33e619d56bae5d3bc5d8273d MD5 4ea59171eb61742c3894f253c040b584 portage-2.1.1.ebuild 6223 RMD160 5140ef703944fb3e33e619d56bae5d3bc5d8273d portage-2.1.1.ebuild 6223 SHA256 e5cf6598da0ae949cd6e6ac07e8bf9881bbf352791503fbe50d04ce59358a830 portage-2.1.1.ebuild 6223 -EBUILD portage-2.1.2_pre2-r4.ebuild 6146 RMD160 dd0215c30781d82da0fba88c2c62f464671d1097 SHA1 a1d1242d2cda6ae46ae2d283d07caa55058a34e2 SHA256 0943fe678a3f97fba6d0ee7b0a34ad53ec88f5995c48802356cdc788801eebba -MD5 5e624d1602e409609649b80e8e6998c2 portage-2.1.2_pre2-r4.ebuild 6146 -RMD160 dd0215c30781d82da0fba88c2c62f464671d1097 portage-2.1.2_pre2-r4.ebuild 6146 -SHA256 0943fe678a3f97fba6d0ee7b0a34ad53ec88f5995c48802356cdc788801eebba portage-2.1.2_pre2-r4.ebuild 6146 EBUILD portage-2.1.2_pre2-r5.ebuild 6146 RMD160 475c00d3b1fc12debcb84f36ea6d1e2030c34833 SHA1 bf446583dffd0416bb87ea67a9508af13095b4b3 SHA256 4110d3dfd80ee5b74f9607b3ef4b2acddc51ef969eab6f659b558d4a15264db0 MD5 1cf9bdf12563a10e3cdba4d6b1b30e9f portage-2.1.2_pre2-r5.ebuild 6146 RMD160 475c00d3b1fc12debcb84f36ea6d1e2030c34833 portage-2.1.2_pre2-r5.ebuild 6146 @@ -56,10 +53,14 @@ EBUILD portage-2.1.2_pre2-r6.ebuild 6192 RMD160 b308e282d26abedad551d85602e0f054 MD5 9a6866cc8f178228b22e5056cc69d87f portage-2.1.2_pre2-r6.ebuild 6192 RMD160 b308e282d26abedad551d85602e0f054a4b66a57 portage-2.1.2_pre2-r6.ebuild 6192 SHA256 4c51eee925da5d9a3399aa8d92dc609f7d033324bc9426e50edafe714fead935 portage-2.1.2_pre2-r6.ebuild 6192 -MISC ChangeLog 15625 RMD160 57f8596a33424b3b5c47bfd812e8f57f6e277669 SHA1 a24773be28b44b06ac37e79eec3faf47a89a473a SHA256 135a66c3bfcc75f3eee5df48c9881211f76f1c40d515845926350b8b0a3827a8 -MD5 8a62403b467d85ad70b72dc88cfa5fbf ChangeLog 15625 -RMD160 57f8596a33424b3b5c47bfd812e8f57f6e277669 ChangeLog 15625 -SHA256 135a66c3bfcc75f3eee5df48c9881211f76f1c40d515845926350b8b0a3827a8 ChangeLog 15625 +EBUILD portage-2.1.2_pre2-r7.ebuild 6153 RMD160 eb3822e40e9ef05d46ff51ac233bb3a129c841d0 SHA1 8b1a76b56bd9491f2569e951ef13f38ca2ff3fc9 SHA256 0b4ce82d9299d9e918db0dd4f0bbc1bb71edf2a8808f0b6ae9554dfe0f71d8aa +MD5 a3d2d094eabfb782868e8da7befa8743 portage-2.1.2_pre2-r7.ebuild 6153 +RMD160 eb3822e40e9ef05d46ff51ac233bb3a129c841d0 portage-2.1.2_pre2-r7.ebuild 6153 +SHA256 0b4ce82d9299d9e918db0dd4f0bbc1bb71edf2a8808f0b6ae9554dfe0f71d8aa portage-2.1.2_pre2-r7.ebuild 6153 +MISC ChangeLog 15826 RMD160 66c3d93ad747f345be56ba3a45a169fe99f36636 SHA1 70fa06d64a43bfc5f14d170dd330b7bd8c0df3cc SHA256 17ffbec29d297229925e38c0ec0c87ecf618e0b4221f0ec33c2660d596115684 +MD5 5dd4c56b741579aa3f72ab990ae7d4bf ChangeLog 15826 +RMD160 66c3d93ad747f345be56ba3a45a169fe99f36636 ChangeLog 15826 +SHA256 17ffbec29d297229925e38c0ec0c87ecf618e0b4221f0ec33c2660d596115684 ChangeLog 15826 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -76,19 +77,19 @@ SHA256 54848742dff9ea07bf01d3fc8988a31a868faf590b33982ef6f3f81f87c97e0c files/di MD5 84cc321543f8146e88db8ed6060d554f files/digest-portage-2.1.1-r1 1021 RMD160 6b1ee9d511161b46d6b844985a27a9e57fd48898 files/digest-portage-2.1.1-r1 1021 SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/digest-portage-2.1.1-r1 1021 -MD5 76ba2ce853dd121f7e47e436c701654b files/digest-portage-2.1.2_pre2-r4 1051 -RMD160 6ba26ccbd3aa56b18181cc4ced7de1cf08f49c24 files/digest-portage-2.1.2_pre2-r4 1051 -SHA256 2f362727a6a2cb9c3c8986c3583c934579af973284e05873a64fab0231a798a6 files/digest-portage-2.1.2_pre2-r4 1051 MD5 d284fed621cc6ce115fb97af1a675d60 files/digest-portage-2.1.2_pre2-r5 1054 RMD160 96192f7b025912b597f04bd6923c20929482abab files/digest-portage-2.1.2_pre2-r5 1054 SHA256 d207cf18c10cc8d4dd7a30a7f1a0b5c329e8354b278a1ccc375e65e01b6b8570 files/digest-portage-2.1.2_pre2-r5 1054 MD5 9dbea86f2781fe18c066c2aeb54f693f files/digest-portage-2.1.2_pre2-r6 807 RMD160 d8be0d3640f0192adb89823def1a7c3e9da96383 files/digest-portage-2.1.2_pre2-r6 807 SHA256 12ca4f57829aa2a2032ff04b1a264f492d44bd1a93eb7a94aed26dc63d0c5d89 files/digest-portage-2.1.2_pre2-r6 807 +MD5 7ee5a014c90671c2cf293f8c693609d0 files/digest-portage-2.1.2_pre2-r7 1099 +RMD160 a905ada84de1cb9096a650a46aafaef5c972cb78 files/digest-portage-2.1.2_pre2-r7 1099 +SHA256 b1a2fedd0b5c6ef5930eca6276bac6e896803aeeb1415a89142f9e8f29d3c3d1 files/digest-portage-2.1.2_pre2-r7 1099 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFKFBQ/ejvha5XGaMRAhz2AKDHoJx2ypGAjb+v9epKn5TdTQTHuACgvKkW -D2rl4hEl/w667au3sFrUOMU= -=hz69 +iD8DBQFFKat+/ejvha5XGaMRAtP1AJ9kjO2yhxGTcpBiyCaNitMM+dACswCg6DN+ +F+jEtwzXaEj4AYUWOCr2INk= +=Qnmr -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r4 b/sys-apps/portage/files/digest-portage-2.1.2_pre2-r4 deleted file mode 100644 index 3c1e9dbe1f69..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_pre2-r4 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 c79e3c74c9a976f38634048214060a77 portage-2.1.2_pre2-r4.patch.bz2 8550 -RMD160 9e32f27abe3dc59aa4a563dc58d58290dddf3a68 portage-2.1.2_pre2-r4.patch.bz2 8550 -SHA256 85e0074ac5f5c015fb0b5f8c40140b76fdceaa903e6961d7ff0df6dd23d6cde7 portage-2.1.2_pre2-r4.patch.bz2 8550 -MD5 5b419eec00e4534c412ac7e9ac92760b portage-2.1.2_pre2.tar.bz2 302712 -RMD160 4bd9d9b3ce76c63d4b86d12c5645403be54903c0 portage-2.1.2_pre2.tar.bz2 302712 -SHA256 caa9828537310067885c365ee49b72d6827cedc781c85825795a46932740e0e3 portage-2.1.2_pre2.tar.bz2 302712 -MD5 c6fe647803cc354a5b8ab22660caeb26 portage-man-pl-2.1-r1.patch.bz2 2076 -RMD160 be3898714b94fb0253c1826909649ea51da205ad portage-man-pl-2.1-r1.patch.bz2 2076 -SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b portage-man-pl-2.1-r1.patch.bz2 2076 -MD5 3a1c6f874490e12965812fa0920c539f portage-man-pl-2.1.tar.bz2 52425 -RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 portage-man-pl-2.1.tar.bz2 52425 -SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 portage-man-pl-2.1.tar.bz2 52425 diff --git a/sys-apps/portage/portage-2.1.2_pre2-r4.ebuild b/sys-apps/portage/portage-2.1.2_pre2-r4.ebuild deleted file mode 100644 index 87c4d5a30d5d..000000000000 --- a/sys-apps/portage/portage-2.1.2_pre2-r4.ebuild +++ /dev/null @@ -1,205 +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_pre2-r4.ebuild,v 1.1 2006/10/05 23:16:22 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 ~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 selinux linguas_pl ${IUSE_ELIBC} ${IUSE_USERLAND}" -DEPEND=">=dev-lang/python-2.3 - !build? ( >=sys-apps/sed-4.0.5 )" -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 ) - elibc_uclibc? ( sys-apps/sandbox ) - !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" -PATCHVER_PL="-r1" -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 -} - -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 - - 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 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." - - portage_docs -} -- 2.26.2