From c662ba25fdf4e34ee2e9c418d1c8d8d91126075d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 8 Dec 2006 21:57:45 +0000 Subject: [PATCH] portage-2.1.2_rc3 release. This fixes bugs #142369, #156374, #157134, #157370, #157385, and #157393. Package-Manager: portage-2.1.2_rc3 --- sys-apps/portage/ChangeLog | 8 +- sys-apps/portage/Manifest | 24 +- .../portage/files/digest-portage-2.1.2_rc3 | 6 + sys-apps/portage/portage-2.1.2_rc3.ebuild | 239 ++++++++++++++++++ 4 files changed, 268 insertions(+), 9 deletions(-) create mode 100644 sys-apps/portage/files/digest-portage-2.1.2_rc3 create mode 100644 sys-apps/portage/portage-2.1.2_rc3.ebuild diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index ee1a84f3ffba..e3cdcd306b1e 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.309 2006/12/04 07:27:26 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.310 2006/12/08 21:57:45 zmedico Exp $ + +*portage-2.1.2_rc3 (08 Dec 2006) + + 08 Dec 2006; Zac Medico +portage-2.1.2_rc3.ebuild: + portage-2.1.2_rc3 release. This fixes bugs #142369, #156374, #157134, + #157370, #157385, and #157393. *portage-2.1.2_rc2-r5 (04 Dec 2006) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 75c0b6d26ec5..d7f1e61fc1a8 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -21,6 +21,7 @@ DIST portage-2.1.1.tar.bz2 297006 RMD160 489e6c3e82527917f5308fdbff1c9add1a03f25 DIST portage-2.1.2_rc2-r3.patch.bz2 8415 RMD160 6c0061d3df668c06234253567b628a7977c1db3c SHA1 f42d9c47a9079e0d1aaea91d6d0efeafded6cfcb SHA256 3f15c0ea137fa0316c6488a7ea4c870cc6384883e054915405bf5d6d1c2a943d DIST portage-2.1.2_rc2-r5.patch.bz2 18722 RMD160 e6da13638cdb6aea78b702218e48f466b28f7c6f SHA1 9cf1d2addd4c41042909c4b4b1d63c8b55c9abd3 SHA256 0d6499a3e741891e01ba53c6703a9a19c703fd3d23418216d0baeb76116e55b6 DIST portage-2.1.2_rc2.tar.bz2 322321 RMD160 bb7db9529c3a86dd03b708f8fb498c11a55ded03 SHA1 d521fe93e7e39fa119fc3074ec926cc01ae79e7b SHA256 64345d0f836225be932e23bfcb9d3a253853067e9f0c842807a7ba2d9c31f0f1 +DIST portage-2.1.2_rc3.tar.bz2 334999 RMD160 98af2da9c8e698fe511d53c604c4c2b7703812cd SHA1 0e929b29172de4de90e5f27ceec46470a2772890 SHA256 547d4d3be34eeea555ea7b1b87bc0f51aef9d4099767d232a79086acdeacf862 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 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 @@ -48,10 +49,14 @@ EBUILD portage-2.1.2_rc2-r5.ebuild 7699 RMD160 078229c2350ea0dffaffa784e792123d6 MD5 05e46b3c87253bac4c1ffe80e8b2b29b portage-2.1.2_rc2-r5.ebuild 7699 RMD160 078229c2350ea0dffaffa784e792123d69fa197c portage-2.1.2_rc2-r5.ebuild 7699 SHA256 3848ffd2c2faf31514250a92ebc3f77e5040558c216644303706eefcd6563d9b portage-2.1.2_rc2-r5.ebuild 7699 -MISC ChangeLog 20351 RMD160 b5d65a5b1c8049c0d19267fb7263fbb8bd2fefc6 SHA1 9585eb5479a3e728afcf8590f94ce89913c4b146 SHA256 5ea5cde50605ede5be97b1d38d391bd3ddd044476eba415860087cccac360d07 -MD5 f7d6b77d51a201a9ed1c79be3037dfa2 ChangeLog 20351 -RMD160 b5d65a5b1c8049c0d19267fb7263fbb8bd2fefc6 ChangeLog 20351 -SHA256 5ea5cde50605ede5be97b1d38d391bd3ddd044476eba415860087cccac360d07 ChangeLog 20351 +EBUILD portage-2.1.2_rc3.ebuild 7860 RMD160 23c146fe4b1529720c20bf9839c82ca11028cb66 SHA1 25f54ab24bf11d88e459db105f94601c3fa72947 SHA256 facfeb1f297993a51c4cfe36c52fcec706d409528a9bba2a62990456c06feb55 +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 +MISC ChangeLog 20565 RMD160 2c1c40eeb4c4af88ab7fd4aacb9f85e86b745ab0 SHA1 891f36f8f8819dd8a57f5b029b063d7536a416d1 SHA256 922c25dc67f944a98b176f287e9ee9c39a9562cd7ade12f3f49e1fb6a2456652 +MD5 30e3a01109dbc386908d5a16d0f13207 ChangeLog 20565 +RMD160 2c1c40eeb4c4af88ab7fd4aacb9f85e86b745ab0 ChangeLog 20565 +SHA256 922c25dc67f944a98b176f287e9ee9c39a9562cd7ade12f3f49e1fb6a2456652 ChangeLog 20565 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -74,10 +79,13 @@ SHA256 ad136421db7325d1d6627a3d3419eb1f9ba47b1b2d42ebda724618b7de6552d2 files/di MD5 27a70ce05e818ac6f7b5eed187d82cfe files/digest-portage-2.1.2_rc2-r5 798 RMD160 1ecb3e41e91fa6539917382629c2d4f53f9e360b files/digest-portage-2.1.2_rc2-r5 798 SHA256 15c6188619953e877f76115df9c7d089bc346c8f32eb6ba8419e811d6d768913 files/digest-portage-2.1.2_rc2-r5 798 +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 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFc83q/ejvha5XGaMRAsArAJwOB73sNB/8dVLey+WRUURWrOVPVQCeOxgv -rRIbGw1lGLPszGpgA/OD5Uc= -=EInD +iD8DBQFFed/w/ejvha5XGaMRAjQuAKCK93EycivwD37JwkKU2l66cuKmBwCdHs0r +C0dLeDP68O7g5bq2L9ykQrw= +=c8iB -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc3 b/sys-apps/portage/files/digest-portage-2.1.2_rc3 new file mode 100644 index 000000000000..2380e70a0099 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.2_rc3 @@ -0,0 +1,6 @@ +MD5 2fb183cd39a87178d3772a938dd06223 portage-2.1.2_rc3.tar.bz2 334999 +RMD160 98af2da9c8e698fe511d53c604c4c2b7703812cd portage-2.1.2_rc3.tar.bz2 334999 +SHA256 547d4d3be34eeea555ea7b1b87bc0f51aef9d4099767d232a79086acdeacf862 portage-2.1.2_rc3.tar.bz2 334999 +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_rc3.ebuild b/sys-apps/portage/portage-2.1.2_rc3.ebuild new file mode 100644 index 000000000000..ff5817c8e0c3 --- /dev/null +++ b/sys-apps/portage/portage-2.1.2_rc3.ebuild @@ -0,0 +1,239 @@ +# 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_rc3.ebuild,v 1.1 2006/12/08 21:57:45 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 + ewarn "In portage-2.1.2_rc2, the implicit RDEPEND behavior has been reverted back to" + ewarn "the way it was in