From: Zac Medico Date: Sat, 25 Nov 2006 03:26:41 +0000 (+0000) Subject: 2.1.2_rc2-r2 revbump. This fixes bugs #150585 and #156014. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80678a25475f6d76d6e9026f81bc7b7aa3615e13;p=gentoo.git 2.1.2_rc2-r2 revbump. This fixes bugs #150585 and #156014. Package-Manager: portage-2.1.2_rc2-r2 --- diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 24e4cafc37a1..604ebcb54fb9 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -19,6 +19,7 @@ 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_rc2-r1.patch.bz2 4985 RMD160 331b6bbb160c54df26938b55cbb8a027b3ce5c42 SHA1 ffde9c685baded38a1016fd57a979c42a04fde46 SHA256 c8341e761a2eacd6776f9ad346cd3f6b7b47ce3f330ad7c649ff7a30d3408f79 +DIST portage-2.1.2_rc2-r2.patch.bz2 7225 RMD160 1eef0a51be3f2d4aef0888ad29c67475bb11cfc8 SHA1 602ff17edff8f7e9c026fdbc30e1249d3cfd1c88 SHA256 6d8a89ed1284447331c4dc48167b7a565ed9af62c13743c956442fec0989dd1c DIST portage-2.1.2_rc2.tar.bz2 322321 RMD160 bb7db9529c3a86dd03b708f8fb498c11a55ded03 SHA1 d521fe93e7e39fa119fc3074ec926cc01ae79e7b SHA256 64345d0f836225be932e23bfcb9d3a253853067e9f0c842807a7ba2d9c31f0f1 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 @@ -43,14 +44,14 @@ EBUILD portage-2.1.2_rc2-r1.ebuild 7699 RMD160 41850c06b13c8b4f5357860125b17ee2f MD5 fa885d0cfe1f163974190850105eaadf portage-2.1.2_rc2-r1.ebuild 7699 RMD160 41850c06b13c8b4f5357860125b17ee2fb7e10d7 portage-2.1.2_rc2-r1.ebuild 7699 SHA256 93a7301b2d43101134836f16bf0afaa83e0505ab1ca45fdf9e6045b9beafb075 portage-2.1.2_rc2-r1.ebuild 7699 -EBUILD portage-2.1.2_rc2.ebuild 7696 RMD160 7e9e15263e1aa4b98b28a436cce8e532fa21e921 SHA1 3dbe35322adc7b0075651656eedeea7b8b7727b3 SHA256 b67737d8c7af0945cb0ffa7c795b6c55de8392143c558e1b08ad18f9fdf9d6a7 -MD5 b0850048c5dc86631909900f0c0ba984 portage-2.1.2_rc2.ebuild 7696 -RMD160 7e9e15263e1aa4b98b28a436cce8e532fa21e921 portage-2.1.2_rc2.ebuild 7696 -SHA256 b67737d8c7af0945cb0ffa7c795b6c55de8392143c558e1b08ad18f9fdf9d6a7 portage-2.1.2_rc2.ebuild 7696 -MISC ChangeLog 19577 RMD160 25c8993b2090203fd507b47707d9b5de3913edc4 SHA1 6ca9c569bed4b0b2b0a9b842d9b3434fef012482 SHA256 10f640d372f376ce1b802b29b16cf1fdc8bec79cc980dd202e427615064e585e -MD5 b4284a4872cdc57ac6e854c5dd213d54 ChangeLog 19577 -RMD160 25c8993b2090203fd507b47707d9b5de3913edc4 ChangeLog 19577 -SHA256 10f640d372f376ce1b802b29b16cf1fdc8bec79cc980dd202e427615064e585e ChangeLog 19577 +EBUILD portage-2.1.2_rc2-r2.ebuild 7699 RMD160 dbfbd06876ca6c760dc8ecd8ec5e4da13198cd53 SHA1 d79c0657c8cc1194cfa6ddff5c44d98f67b27a7c SHA256 9c9ef88520d1e475bf084b210cba2d8e13223e4b31feaa121dc7394c808224fb +MD5 4b323655605879e53d99abef34f5bde2 portage-2.1.2_rc2-r2.ebuild 7699 +RMD160 dbfbd06876ca6c760dc8ecd8ec5e4da13198cd53 portage-2.1.2_rc2-r2.ebuild 7699 +SHA256 9c9ef88520d1e475bf084b210cba2d8e13223e4b31feaa121dc7394c808224fb portage-2.1.2_rc2-r2.ebuild 7699 +MISC ChangeLog 19754 RMD160 4d376c852a350cb0400d98c2d58115b7d04c349c SHA1 71250dc172ce15216b232f2ae4b3fe0cd0fb160d SHA256 9af73ae9a92457d68218b63e32296d66f85d9dfea02648ecbe741780802ee271 +MD5 a8cda7fde33f43706cc030866b609a7b ChangeLog 19754 +RMD160 4d376c852a350cb0400d98c2d58115b7d04c349c ChangeLog 19754 +SHA256 9af73ae9a92457d68218b63e32296d66f85d9dfea02648ecbe741780802ee271 ChangeLog 19754 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -67,16 +68,16 @@ 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 d519de49473722cf0e0d247df111c824 files/digest-portage-2.1.2_rc2 530 -RMD160 33cdb9874578a770ddec6c82328ed51287e2f968 files/digest-portage-2.1.2_rc2 530 -SHA256 d1b58c413f8901630d19365c5d02ef2fda1690c6abe6a66acfaaa55009f3dbf0 files/digest-portage-2.1.2_rc2 530 MD5 40630be18e779efddce1ceed2fc714f5 files/digest-portage-2.1.2_rc2-r1 795 RMD160 3864c2fd4b21288c42906179caddadfa0df327d3 files/digest-portage-2.1.2_rc2-r1 795 SHA256 1e6a7e6dcdc3e9a2143fa2bcdd8f9b9e51dcc1698f8115aac830c98dbf5c7809 files/digest-portage-2.1.2_rc2-r1 795 +MD5 60a2c2221fd5253a2c40fc8d4a7e1740 files/digest-portage-2.1.2_rc2-r2 795 +RMD160 e1b875561e39e0825f2d0bcb218d8fdcdd97a21f files/digest-portage-2.1.2_rc2-r2 795 +SHA256 c3c4ab6f2c160906fd7cdda9e651a275b8d2d7ae2418da3ecac5f7ac4a24f76e files/digest-portage-2.1.2_rc2-r2 795 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFYbzj/ejvha5XGaMRAsQNAKDw3kwqzPLyDeK4COIBS9cYOvdaZwCfWYho -UQ4qeMt3ldaEug0lPjvWjyU= -=gvDW +iD8DBQFFZ7fc/ejvha5XGaMRAmq6AKC2PUK/cW2gYT7DZE5hwYbWIF5b5ACfZc3q +1UsZvnGgdRrbeU/qM3yQcZw= +=gUtO -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc2 b/sys-apps/portage/files/digest-portage-2.1.2_rc2 deleted file mode 100644 index 4a52bfda11e7..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2_rc2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 333a807684b5f83524ff584148cbca27 portage-2.1.2_rc2.tar.bz2 322321 -RMD160 bb7db9529c3a86dd03b708f8fb498c11a55ded03 portage-2.1.2_rc2.tar.bz2 322321 -SHA256 64345d0f836225be932e23bfcb9d3a253853067e9f0c842807a7ba2d9c31f0f1 portage-2.1.2_rc2.tar.bz2 322321 -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_rc2.ebuild b/sys-apps/portage/portage-2.1.2_rc2.ebuild deleted file mode 100644 index b7264a6fefe5..000000000000 --- a/sys-apps/portage/portage-2.1.2_rc2.ebuild +++ /dev/null @@ -1,232 +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_rc2.ebuild,v 1.1 2006/11/18 02:46:24 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_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