From fcae746085cae87cfb493182ab8b41f300674788 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 12 Nov 2006 01:57:41 +0000 Subject: [PATCH] 2.1.2_rc1-r6 revbump. This fixes bugs #100478 and #154554. Package-Manager: portage-2.1.2_rc1-r6 --- sys-apps/portage/Manifest | 30 +-- .../portage/files/digest-portage-2.1.2_rc1-r3 | 9 - sys-apps/portage/portage-2.1.2_rc1-r3.ebuild | 205 ------------------ 3 files changed, 15 insertions(+), 229 deletions(-) delete mode 100644 sys-apps/portage/files/digest-portage-2.1.2_rc1-r3 delete mode 100644 sys-apps/portage/portage-2.1.2_rc1-r3.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index b8f64854be74..1119e8543e4c 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -18,9 +18,9 @@ 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_rc1-r3.patch.bz2 10110 RMD160 7862868e7dd7d118461bc4714c6e83c2167ecc69 SHA1 c9b5c5bd975890923adf934a73257698ed62a617 SHA256 99aa012b7feb47af8ed37e5189728188c715c8405f9d2bd1790cb38fb8ab5699 DIST portage-2.1.2_rc1-r4.patch.bz2 11084 RMD160 9e1c0faf5211bd73066d69333d8f8c3b99c6df9b SHA1 1b54d798363df9aaa469b68cad5b57bc795e0a2f SHA256 3fde47286877d6418463f2f1dccaed24b34994d19988aba04fdf41ee76ae5734 DIST portage-2.1.2_rc1-r5.patch.bz2 15622 RMD160 9e26cb4cd274ceaa2be12b22b2524784b88be86c SHA1 242335de2bfbd6ab11942fb15753b01dd7da8249 SHA256 265e29a3631931bb911b9e3e840f9643d3eaac02222bd02daa203a080694939f +DIST portage-2.1.2_rc1-r6.patch.bz2 18716 RMD160 cb4c19dffddffeddaf526977e32c1ca3eb2075b6 SHA1 ff71da046f18a977ee8e99412444f8a2b8a50f53 SHA256 ea76596e268d0801104256f71dddc0bf7ef902bcdd67ca7f6739ecece3ed5a39 DIST portage-2.1.2_rc1.tar.bz2 313134 RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 SHA1 17f6dfb1f01eb53a3d2046dc518373d2a1472bed SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b DIST portage-man-pl-2.1.2_pre3.tar.bz2 52723 RMD160 29ab9951091789e096b1b13b69f8dfca36b23f2d SHA1 abf8f99b684efd3aa5053c6e40ef2a74755a70b6 SHA256 3084288d59bdb061b614a4aca4a2f135caf98c9bad36b749f834d1d7fb64a761 @@ -46,10 +46,6 @@ EBUILD portage-2.1.1.ebuild 6243 RMD160 fe9e3907df7d62b778134ffb417615fdf00d506a MD5 02773f7cafb9bbb12339af7f5107de87 portage-2.1.1.ebuild 6243 RMD160 fe9e3907df7d62b778134ffb417615fdf00d506a portage-2.1.1.ebuild 6243 SHA256 7875f1597c5e75c333ba3323b3ebea38a255426d447aa57cc6c95fd9da30756c portage-2.1.1.ebuild 6243 -EBUILD portage-2.1.2_rc1-r3.ebuild 6183 RMD160 22b32aece5ad7d29e53c718ddc677847a57c79b7 SHA1 69161f608558d070bad4ff9e5b4a0f22b173ae71 SHA256 6d33b5e5171081a16e6363390875743b2960097eed8dae722880e477d48e9dc9 -MD5 79b8c7a64af59c763317942d144fd0c6 portage-2.1.2_rc1-r3.ebuild 6183 -RMD160 22b32aece5ad7d29e53c718ddc677847a57c79b7 portage-2.1.2_rc1-r3.ebuild 6183 -SHA256 6d33b5e5171081a16e6363390875743b2960097eed8dae722880e477d48e9dc9 portage-2.1.2_rc1-r3.ebuild 6183 EBUILD portage-2.1.2_rc1-r4.ebuild 6183 RMD160 34e9d2af2f359a10fcdd23751acfb8cadf67dbf7 SHA1 a6af0d128532cecf17b680a8ba78f12b7c4c8c88 SHA256 4e2e08913d22bd30f0e0cd83b92ebd958d98f58f36d779a6568712c0d486cbb4 MD5 6b07da3642d4b4b1a63d9c0946d814a6 portage-2.1.2_rc1-r4.ebuild 6183 RMD160 34e9d2af2f359a10fcdd23751acfb8cadf67dbf7 portage-2.1.2_rc1-r4.ebuild 6183 @@ -58,10 +54,14 @@ EBUILD portage-2.1.2_rc1-r5.ebuild 6182 RMD160 03c3663c8d8b8c6b3643fd06c9fb47ad0 MD5 19563ec4358b4504f12e0744c586d7ec portage-2.1.2_rc1-r5.ebuild 6182 RMD160 03c3663c8d8b8c6b3643fd06c9fb47ad0f6addb5 portage-2.1.2_rc1-r5.ebuild 6182 SHA256 d7b8215d79af02cdc2749b10ae55ee2769474b9f9e0d048bf4b46548f1f9abd7 portage-2.1.2_rc1-r5.ebuild 6182 -MISC ChangeLog 21072 RMD160 3786d0d7db0d1458b41698d05cca79c8e59bbd06 SHA1 337b1f072622599b0d84a6c5a08649b2a1bf3091 SHA256 46c1a6634832bb0b1a1fe85f3159d6c1b0ac4078d8288d3707416ca55c9fe608 -MD5 fccef3e9d2e612f32ca9c2f6359546dc ChangeLog 21072 -RMD160 3786d0d7db0d1458b41698d05cca79c8e59bbd06 ChangeLog 21072 -SHA256 46c1a6634832bb0b1a1fe85f3159d6c1b0ac4078d8288d3707416ca55c9fe608 ChangeLog 21072 +EBUILD portage-2.1.2_rc1-r6.ebuild 6643 RMD160 34fdf60ef8475c59b343091aa05f1a8a32d6e32e SHA1 d085f228833fe41f41e8dcd8ad7a354e8df51b80 SHA256 a23e982205c52fc2c2dc22425f8c32df94e7b5ca90b1ff839e1f61960f3320f7 +MD5 760a7342a94940d6ae68aee2648f5936 portage-2.1.2_rc1-r6.ebuild 6643 +RMD160 34fdf60ef8475c59b343091aa05f1a8a32d6e32e portage-2.1.2_rc1-r6.ebuild 6643 +SHA256 a23e982205c52fc2c2dc22425f8c32df94e7b5ca90b1ff839e1f61960f3320f7 portage-2.1.2_rc1-r6.ebuild 6643 +MISC ChangeLog 21250 RMD160 865962cc779efbd425bc4a4ab49be8cafbebc75b SHA1 0ccb36be6fba20d46f330f468478ac9b5242b6c6 SHA256 f5f2a6eacbb630ce7f9ab17310d09ee6676fb136d1aa8bb2963cca815a3d3dd9 +MD5 98f2a3daf7b4c316904a7a5603c3d5a6 ChangeLog 21250 +RMD160 865962cc779efbd425bc4a4ab49be8cafbebc75b ChangeLog 21250 +SHA256 f5f2a6eacbb630ce7f9ab17310d09ee6676fb136d1aa8bb2963cca815a3d3dd9 ChangeLog 21250 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -81,19 +81,19 @@ SHA256 21f118dacba4951bac7c5e575c03cc09ead96ecaf45892cb963bba2fcd3d1d6d files/di MD5 3add5888d02ad00946eb670f1d6eff5c files/digest-portage-2.1.1-r2 1021 RMD160 082589ba69cde6b349a156722316ba10bdcfe0cd files/digest-portage-2.1.1-r2 1021 SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/digest-portage-2.1.1-r2 1021 -MD5 c9defdc35913488b9c488a6fa6fcc1c2 files/digest-portage-2.1.2_rc1-r3 801 -RMD160 6a1df826851f59d41ce4963eb9db317d74d7aafc files/digest-portage-2.1.2_rc1-r3 801 -SHA256 a083d2fa28221fb8e4ffe64e8daca7baa5fda6310df2f5fc43c11876d39bf3d7 files/digest-portage-2.1.2_rc1-r3 801 MD5 54dc5611c9194ff42d6799c353ad6c31 files/digest-portage-2.1.2_rc1-r4 801 RMD160 ee59924ed547f03c92e050e43c4d12ad604039d9 files/digest-portage-2.1.2_rc1-r4 801 SHA256 d2c7612c82d26da5691150683db93b3c2a548c9b12896b74f376945968770ed5 files/digest-portage-2.1.2_rc1-r4 801 MD5 eb8ce5d7dab18adeb14c73e733744099 files/digest-portage-2.1.2_rc1-r5 798 RMD160 4175282b35a7c73b4bcd1116016a0bee38a50c70 files/digest-portage-2.1.2_rc1-r5 798 SHA256 503c743441419c4b2b010c4090ba6f65f729edd834730fae4c813c2e0cff348d files/digest-portage-2.1.2_rc1-r5 798 +MD5 b4bc00c97f385b631fe47587dc14698b files/digest-portage-2.1.2_rc1-r6 798 +RMD160 b0e5ae3a2944712efb869cbb2fb0e0f7d9f0d0ca files/digest-portage-2.1.2_rc1-r6 798 +SHA256 c85250868ddc8279506341c2f0dd3b69f02c8b719a2dd7ca48d56e4ca50d5734 files/digest-portage-2.1.2_rc1-r6 798 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFVhtKnrYavmz4OngRAv+bAKCjHw+/dm1C8+yA7GTSvJZY/0mJ6ACeMGXE -NUGYpMnskCrs2wmul1okDgA= -=95l4 +iD8DBQFFVn+J/ejvha5XGaMRAh1fAKDyouQg0UsNQY51VwY/9RQATCOylQCgxplb +yg4+IxKHuYebJVZNFMpTQc8= +=cbl6 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r3 b/sys-apps/portage/files/digest-portage-2.1.2_rc1-r3 deleted file mode 100644 index e69b57140250..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_rc1-r3 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 3dfe862b7293af3fbc5d6079aa65242f portage-2.1.2_rc1-r3.patch.bz2 10110 -RMD160 7862868e7dd7d118461bc4714c6e83c2167ecc69 portage-2.1.2_rc1-r3.patch.bz2 10110 -SHA256 99aa012b7feb47af8ed37e5189728188c715c8405f9d2bd1790cb38fb8ab5699 portage-2.1.2_rc1-r3.patch.bz2 10110 -MD5 218eb9853085ed02f389e73258e7422e portage-2.1.2_rc1.tar.bz2 313134 -RMD160 b154c7994e12843f8dae4ddf2198636ce7d79e08 portage-2.1.2_rc1.tar.bz2 313134 -SHA256 9a4ed0ac303a34e62b288424be26de47b56a48cd5cc9ce9c19d54dae2a85dc33 portage-2.1.2_rc1.tar.bz2 313134 -MD5 aa8c11d2540016412e9662cfd1fded60 portage-man-pl-2.1.2_pre3.tar.bz2 52723 -RMD160 29ab9951091789e096b1b13b69f8dfca36b23f2d portage-man-pl-2.1.2_pre3.tar.bz2 52723 -SHA256 3084288d59bdb061b614a4aca4a2f135caf98c9bad36b749f834d1d7fb64a761 portage-man-pl-2.1.2_pre3.tar.bz2 52723 diff --git a/sys-apps/portage/portage-2.1.2_rc1-r3.ebuild b/sys-apps/portage/portage-2.1.2_rc1-r3.ebuild deleted file mode 100644 index 88c6fb6116d3..000000000000 --- a/sys-apps/portage/portage-2.1.2_rc1-r3.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_rc1-r3.ebuild,v 1.3 2006/11/03 11:01:00 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 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-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_pre3" -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 -} - -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 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." - - portage_docs -} -- 2.26.2