From 52989aa175c75e37c05a75f2afc6bc2033198616 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 5 Jan 2007 02:18:53 +0000 Subject: [PATCH] 2.1.2_rc4-r6 revbump. This fixes bug #111436 and has some other miscellaneous fixes including a workaround for one case of bug #147625. Package-Manager: portage-2.1.2_rc4-r6 --- sys-apps/portage/Manifest | 32 +-- .../portage/files/digest-portage-2.1.2_rc4-r4 | 9 - sys-apps/portage/portage-2.1.2_rc4-r4.ebuild | 226 ------------------ 3 files changed, 16 insertions(+), 251 deletions(-) delete mode 100644 sys-apps/portage/files/digest-portage-2.1.2_rc4-r4 delete mode 100644 sys-apps/portage/portage-2.1.2_rc4-r4.ebuild diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 529eab2dce82..aefaac79021c 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -19,8 +19,8 @@ DIST portage-2.1.1-r1.patch.bz2 4200 RMD160 e8c003983b1711e296774025f12f01463ed5 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.tar.bz2 334999 RMD160 98af2da9c8e698fe511d53c604c4c2b7703812cd SHA1 0e929b29172de4de90e5f27ceec46470a2772890 SHA256 547d4d3be34eeea555ea7b1b87bc0f51aef9d4099767d232a79086acdeacf862 -DIST portage-2.1.2_rc4-r4.patch.bz2 23102 RMD160 bf095b3a146d3d8522601c6e94be6967c3e8ea57 SHA1 ce0e44b4c0706d99bb66c18b2185777a54ec3cec SHA256 88459b63e9fb459f451b4dd78c2d98bf4761e8c000a00daa860fc9e9a192af37 DIST portage-2.1.2_rc4-r5.patch.bz2 25323 RMD160 f624ba5a5b98c3ef538a0a976a343b973bb1fca6 SHA1 aa8fd2e9861652fe2983fc320a735ba35afc779a SHA256 990793add7db5f21be51c88a06d83fb8b51a72cb47e5d586bf255d46795732ee +DIST portage-2.1.2_rc4-r6.patch.bz2 28400 RMD160 c171086d8e9786e6b1d2aadbde8d5f9a82e57446 SHA1 bc57b04a4148ba770fa08d9206a26b6c78e17e74 SHA256 55760f46e8b58226707030d79c651c7de6411dd7374193fb00997e100456905b 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 @@ -45,18 +45,18 @@ EBUILD portage-2.1.2_rc3.ebuild 7860 RMD160 23c146fe4b1529720c20bf9839c82ca11028 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 -EBUILD portage-2.1.2_rc4-r4.ebuild 6874 RMD160 6ddc159bd3db095ea908f4f8e8b0c7c72d483388 SHA1 c27f45e9082c27f132f89b435ef93b94386d69db SHA256 e429bf7b5842808d3194fb2623346c3aa51f6356bb18c4b206caca2d70756945 -MD5 325a52e98aa49d02a0bdfadf44ae6370 portage-2.1.2_rc4-r4.ebuild 6874 -RMD160 6ddc159bd3db095ea908f4f8e8b0c7c72d483388 portage-2.1.2_rc4-r4.ebuild 6874 -SHA256 e429bf7b5842808d3194fb2623346c3aa51f6356bb18c4b206caca2d70756945 portage-2.1.2_rc4-r4.ebuild 6874 EBUILD portage-2.1.2_rc4-r5.ebuild 6874 RMD160 48a55f8a493da6237c1763ce37784bb7d90dacd2 SHA1 10a81df4cfd15c385ccd0831a312af94c19c0432 SHA256 259351e9c099d1df3320b09c7dceed73670f1e7870f51862234320aaef13c2c9 MD5 9ed25a76d613b9e7416ed15e065a4ada portage-2.1.2_rc4-r5.ebuild 6874 RMD160 48a55f8a493da6237c1763ce37784bb7d90dacd2 portage-2.1.2_rc4-r5.ebuild 6874 SHA256 259351e9c099d1df3320b09c7dceed73670f1e7870f51862234320aaef13c2c9 portage-2.1.2_rc4-r5.ebuild 6874 -MISC ChangeLog 19473 RMD160 9e74b77851df55289b73a829bbdbb050cf4153a8 SHA1 b8bcc49da7de7dbabbb89ca8248177027731414e SHA256 e8dc2426a9875b8d1f5a4696b216b617012ac26b5bc883afdc310c2f1835920f -MD5 a093a667cf7f6041930fcf60bb11b86d ChangeLog 19473 -RMD160 9e74b77851df55289b73a829bbdbb050cf4153a8 ChangeLog 19473 -SHA256 e8dc2426a9875b8d1f5a4696b216b617012ac26b5bc883afdc310c2f1835920f ChangeLog 19473 +EBUILD portage-2.1.2_rc4-r6.ebuild 6874 RMD160 f06c0a46d11147ece2738c4ff6e6eae56bae3154 SHA1 ab0825320e538353ce2123fcd7565403a1a7797f SHA256 7cc6fcc2a47e99690413ea6541bb071813f3def052e3db810ccceb22d62ed2f7 +MD5 901924b85e7c50471947abdbc72434c2 portage-2.1.2_rc4-r6.ebuild 6874 +RMD160 f06c0a46d11147ece2738c4ff6e6eae56bae3154 portage-2.1.2_rc4-r6.ebuild 6874 +SHA256 7cc6fcc2a47e99690413ea6541bb071813f3def052e3db810ccceb22d62ed2f7 portage-2.1.2_rc4-r6.ebuild 6874 +MISC ChangeLog 19728 RMD160 fe9c0dac2b3f782bbdcb8370a2f9598c07fbd203 SHA1 2c9dddf9e8d774d70ca7ae5154059f76c2042045 SHA256 d41e22e3e5d44489e967b952ef1cd22016e78c0d0e923cce927834fac6f70121 +MD5 029d93bcc27a6023b7578a59bec587db ChangeLog 19728 +RMD160 fe9c0dac2b3f782bbdcb8370a2f9598c07fbd203 ChangeLog 19728 +SHA256 d41e22e3e5d44489e967b952ef1cd22016e78c0d0e923cce927834fac6f70121 ChangeLog 19728 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -76,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 184efd7247ba8fa319929475f0ef6e82 files/digest-portage-2.1.2_rc4-r4 798 -RMD160 73560ab83cf483a24e61ba496514f5e876d110d1 files/digest-portage-2.1.2_rc4-r4 798 -SHA256 d37d2d2b5d7dd4fcdc897ad45377aa5c14d315a4fae7c7c1def7dc9124aed83c files/digest-portage-2.1.2_rc4-r4 798 MD5 09c341594f4f4183d4e66d4f75f0c455 files/digest-portage-2.1.2_rc4-r5 798 RMD160 cabb3be32e2ceb4e6e6cff29e816ee20209a7229 files/digest-portage-2.1.2_rc4-r5 798 SHA256 d13c67d09403b784012192b389d9bcb81b5a246f58210be238357169ce2ae1db files/digest-portage-2.1.2_rc4-r5 798 +MD5 cfb8fbb7d0ab12cae71fbdedf568657a files/digest-portage-2.1.2_rc4-r6 798 +RMD160 84308a0f4fe38baebdd4be74e2150b19ccbf7d17 files/digest-portage-2.1.2_rc4-r6 798 +SHA256 bece2f13bef87de55e8f88aeb36003df3323a1026774c6295b867b1f3c01e37c files/digest-portage-2.1.2_rc4-r6 798 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFmuXs/ejvha5XGaMRAlM3AJ4q3sVhn/K65N2uFD1pUtYGQT7aoACfY5Dk -L0Ili5rYeM8OMzpQP6KwR/g= -=id/Z +iD8DBQFFnbWL/ejvha5XGaMRAvybAJ9yL3fb4hNDSClZstdOsOEQjIjbgwCfc/sx +gepz7IWRsdB6r7rf4EAX25A= +=NW8F -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc4-r4 b/sys-apps/portage/files/digest-portage-2.1.2_rc4-r4 deleted file mode 100644 index 41c3b33f00fb..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_rc4-r4 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 f7f562b5a7ad6e15dda059c0b0359f2c portage-2.1.2_rc4-r4.patch.bz2 23102 -RMD160 bf095b3a146d3d8522601c6e94be6967c3e8ea57 portage-2.1.2_rc4-r4.patch.bz2 23102 -SHA256 88459b63e9fb459f451b4dd78c2d98bf4761e8c000a00daa860fc9e9a192af37 portage-2.1.2_rc4-r4.patch.bz2 23102 -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-r4.ebuild b/sys-apps/portage/portage-2.1.2_rc4-r4.ebuild deleted file mode 100644 index 4d97d70aec71..000000000000 --- a/sys-apps/portage/portage-2.1.2_rc4-r4.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-r4.ebuild,v 1.1 2006/12/31 17:06:23 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