From: Zac Medico Date: Sat, 3 Feb 2007 10:46:57 +0000 (+0000) Subject: Punt 2.1.2-r6 due to bug #165034. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fb5c2bdd509b4f0709dfadb900738bb905e37640;p=gentoo.git Punt 2.1.2-r6 due to bug #165034. Package-Manager: portage-2.1.2-r6 --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index a497b8bb4854..678eeb329e0b 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.340 2007/02/02 03:09:10 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.341 2007/02/03 10:46:57 zmedico Exp $ + + 03 Feb 2007; Zac Medico -portage-2.1.2-r6.ebuild: + Punt 2.1.2-r6 due to bug #165034. *portage-2.1.2-r6 (02 Feb 2007) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 6ab7aa159adb..130fcdd87866 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -17,7 +17,6 @@ DIST portage-2.0.51.22.tar.bz2 257823 RMD160 068a6fbc3e41f7357d1ee4d65894e7903c4 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-r5.patch.bz2 13738 RMD160 e118d07177007ab88e00d308c46df83c50d05036 SHA1 549a07354519aba39b399186e71ee99aaa012478 SHA256 7a132ffe4ffbe82be5b82a3262210af0a64412adb272459794111e8a50414c37 -DIST portage-2.1.2-r6.patch.bz2 15044 RMD160 42449b02ca375c7ed5a9a6f3ad890ee1c488b6b6 SHA1 267ac47c72df4b0cd2ec10ba5a0ea51f58a93e68 SHA256 4eefc1d3839b7bf9f8744032fb72d9974a95dbf6b709679a312fa746d17e843b DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf99 SHA1 72980508e881d837e78b9309d53dba62ef76c247 SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f @@ -34,14 +33,10 @@ EBUILD portage-2.1.2-r5.ebuild 6919 RMD160 b7af50d604247cf677ec69115c41bbe075fd6 MD5 db1e01ad3196b3f5820c4bbfcad7de59 portage-2.1.2-r5.ebuild 6919 RMD160 b7af50d604247cf677ec69115c41bbe075fd6162 portage-2.1.2-r5.ebuild 6919 SHA256 a1267791fa73051fb9d1ee5ad051cac9c8a0af9bb1736adcac0794893e3b8be5 portage-2.1.2-r5.ebuild 6919 -EBUILD portage-2.1.2-r6.ebuild 6919 RMD160 786262323a7336270171581cb36576c8d7e2ceba SHA1 7631bf1deef26b067f955530b5473ccc27046491 SHA256 3f23971612404134cccdda762c23a170d36f0e55ed6244b80dd6f169bafda658 -MD5 f2ac9f99b4834b4735fbafb4b30838cd portage-2.1.2-r6.ebuild 6919 -RMD160 786262323a7336270171581cb36576c8d7e2ceba portage-2.1.2-r6.ebuild 6919 -SHA256 3f23971612404134cccdda762c23a170d36f0e55ed6244b80dd6f169bafda658 portage-2.1.2-r6.ebuild 6919 -MISC ChangeLog 19028 RMD160 72480d3d6bf18e10bd56199b73d0393319355506 SHA1 0dc4d692018f3b2a536fd6e7d808984ceedac9f2 SHA256 0dc1274c1d107f8352ab750c7937e9214fd02c78593697759fa3d364037c8290 -MD5 d2d28f834a6d88fe3c99639fa5a6cb90 ChangeLog 19028 -RMD160 72480d3d6bf18e10bd56199b73d0393319355506 ChangeLog 19028 -SHA256 0dc1274c1d107f8352ab750c7937e9214fd02c78593697759fa3d364037c8290 ChangeLog 19028 +MISC ChangeLog 19138 RMD160 3e12f8755818f5a10e1576cdce6c0095ee74135b SHA1 441fd1e3b3fda170e41451b0fdd6ece885cd76ca SHA256 277ca261bc8e8c396bef00f8168747f7f9caa860c19f6f94fdd8c3547e1f0418 +MD5 bfcd2efe7c8c2f131107cf1b6a1fe118 ChangeLog 19138 +RMD160 3e12f8755818f5a10e1576cdce6c0095ee74135b ChangeLog 19138 +SHA256 277ca261bc8e8c396bef00f8168747f7f9caa860c19f6f94fdd8c3547e1f0418 ChangeLog 19138 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -55,13 +50,10 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di MD5 b4fab0025677257d932ea13742b51749 files/digest-portage-2.1.2-r5 762 RMD160 134279ba2d0847e0e665ce6898f57ddb195d9abc files/digest-portage-2.1.2-r5 762 SHA256 b1ab67ac8a5ca9d7e6ebad72300875f4ebfa1fca4adc71eda392b470be311138 files/digest-portage-2.1.2-r5 762 -MD5 9ba5eb284e0c7632918bbd16118611d2 files/digest-portage-2.1.2-r6 762 -RMD160 0a817c69a94707d9c3dd6c91178b7558ecc26c19 files/digest-portage-2.1.2-r6 762 -SHA256 aab68dd23c2cc299ccec4e7a3a1000f0de512b8446c7cfc871bee8f2c32eea13 files/digest-portage-2.1.2-r6 762 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFwqte/ejvha5XGaMRAhEnAKDMB5hW5878diIa/t22lOgcoJ0DcQCg0Qzo -sDwauDMjLN/QvZBo1qfM9Mg= -=um7V +iD8DBQFFxGgn/ejvha5XGaMRAkxSAKDawULMj6431kBVVl2dwa8dbmC0xgCfeIwF +zZwxMNkKuiph6PubonokRvg= +=D3iu -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2-r6 b/sys-apps/portage/files/digest-portage-2.1.2-r6 deleted file mode 100644 index acccf3238fe1..000000000000 --- a/sys-apps/portage/files/digest-portage-2.1.2-r6 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 cec326ea101511884a939079e9667f40 portage-2.1.2-r6.patch.bz2 15044 -RMD160 42449b02ca375c7ed5a9a6f3ad890ee1c488b6b6 portage-2.1.2-r6.patch.bz2 15044 -SHA256 4eefc1d3839b7bf9f8744032fb72d9974a95dbf6b709679a312fa746d17e843b portage-2.1.2-r6.patch.bz2 15044 -MD5 74c705793edb37ac2fb1d3b2e06c689d portage-2.1.2.tar.bz2 311900 -RMD160 75da869c02e3574babc2f40e07b18686f384cf99 portage-2.1.2.tar.bz2 311900 -SHA256 767e2756e51fbbff5a4fd33e3cec5ad83cf6eaad0fa0fa7c35ad07dbda11a008 portage-2.1.2.tar.bz2 311900 -MD5 6409f79dd5efe7922dd8fa36340c4912 portage-man-pl-2.1.2.tar.bz2 53893 -RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c portage-man-pl-2.1.2.tar.bz2 53893 -SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f portage-man-pl-2.1.2.tar.bz2 53893 diff --git a/sys-apps/portage/portage-2.1.2-r6.ebuild b/sys-apps/portage/portage-2.1.2-r6.ebuild deleted file mode 100644 index 0a90899e5b3b..000000000000 --- a/sys-apps/portage/portage-2.1.2-r6.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2007 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-r6.ebuild,v 1.1 2007/02/02 03:09:10 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 ) - userland_GNU? ( !selinux? ( >=sys-apps/coreutils-6.4 ) ) - selinux? ( >=dev-python/python-selinux-2.16 ) - doc? ( app-portage/portage-manpages ) - >=dev-python/pycrypto-2.0.1-r5" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives" - -PV_PL="2.1.2" -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 - einfo "Generating api docs" - 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() { - ./tests/runTests || \ - 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 -}