From b55d59b661dca8ed7e9a1407cffdf6a94a335d63 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 14 Dec 2006 08:17:23 +0000 Subject: [PATCH] 2.1.2_rc3-r5 revbump. This completes the fix for bug #157897. Package-Manager: portage-2.1.2_rc3-r5 --- sys-apps/portage/ChangeLog | 7 +- sys-apps/portage/Manifest | 22 +- .../portage/files/digest-portage-2.1.2_rc3-r5 | 9 + sys-apps/portage/portage-2.1.2_rc3-r5.ebuild | 239 ++++++++++++++++++ 4 files changed, 269 insertions(+), 8 deletions(-) create mode 100644 sys-apps/portage/files/digest-portage-2.1.2_rc3-r5 create mode 100644 sys-apps/portage/portage-2.1.2_rc3-r5.ebuild diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 222468ea1cb7..ca248622c01a 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,11 @@ # 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.315 2006/12/12 12:22:22 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.316 2006/12/14 08:17:23 zmedico Exp $ + +*portage-2.1.2_rc3-r5 (14 Dec 2006) + + 14 Dec 2006; Zac Medico +portage-2.1.2_rc3-r5.ebuild: + 2.1.2_rc3-r5 revbump. This completes the fix for bug #157897. *portage-2.1.2_rc3-r4 (12 Dec 2006) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index c65129c0417b..0a9a4080e862 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -23,6 +23,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_rc3-r3.patch.bz2 11231 RMD160 6cbd9b86e7929c47d95bc372b473cba4680270e3 SHA1 a6fa299a3d7161226a2562c19c23dfe98eea608e SHA256 efa4659b013e0ae0a68e1091907372d9f8f7342afb0dea799f958dde63cb6ed0 +DIST portage-2.1.2_rc3-r5.patch.bz2 12671 RMD160 2c01b39160bd6266f7029a7df9f0f1bb42527233 SHA1 8a1509ef70b7c7226f0b7d881d9ac88d14fb928a SHA256 07e4de75f42cb8a20225779253f1dcbe8b146b6d17e776cad66867dfad7a72ee 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 @@ -47,14 +48,18 @@ EBUILD portage-2.1.2_rc3-r4.ebuild 7907 RMD160 5865f78a20edd9ac154283a0a6420344b MD5 35fa595b5581c54702176cc6e2e3f8fa portage-2.1.2_rc3-r4.ebuild 7907 RMD160 5865f78a20edd9ac154283a0a6420344bfe1bb93 portage-2.1.2_rc3-r4.ebuild 7907 SHA256 e2331ac62f4fb462b80b732a974407a9e8ff196d38908d228ccffa522bc5cfe7 portage-2.1.2_rc3-r4.ebuild 7907 +EBUILD portage-2.1.2_rc3-r5.ebuild 7863 RMD160 0f478275314e9b9cb8dc6ea81a96d80e3f868a74 SHA1 e64601d927737c709727b85cc0535f80e45bd7cf SHA256 238fc30c6f7b436bbe8da40cc4bab8f2f4bd4a5d9fefd571458b0d7b495c7d74 +MD5 8899ed1e3ad2f02abbc80244a8f9de10 portage-2.1.2_rc3-r5.ebuild 7863 +RMD160 0f478275314e9b9cb8dc6ea81a96d80e3f868a74 portage-2.1.2_rc3-r5.ebuild 7863 +SHA256 238fc30c6f7b436bbe8da40cc4bab8f2f4bd4a5d9fefd571458b0d7b495c7d74 portage-2.1.2_rc3-r5.ebuild 7863 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 21467 RMD160 f9172aafaa78729d03dc77d263562f3116324f50 SHA1 22879156200407a8f28b2da7464ba4c70a30499b SHA256 39f7aa7a00e81629267b7fbd6089330ed09f75b87f262e33fad6e60e1209d9cf -MD5 45c4c32b972e0d42a7d601062a9c9fde ChangeLog 21467 -RMD160 f9172aafaa78729d03dc77d263562f3116324f50 ChangeLog 21467 -SHA256 39f7aa7a00e81629267b7fbd6089330ed09f75b87f262e33fad6e60e1209d9cf ChangeLog 21467 +MISC ChangeLog 21647 RMD160 07d0b40a163afc88a6114818eed937c76f6618bf SHA1 1a523df3ef303497468fa6d44474f92ceaca9f54 SHA256 455c5d592782dfe5f235b3163a7fbfbaa0813d0d34c4e3299117222c8c69c7e4 +MD5 6fafdc78b7d59f6bc6159ffdcec49fc9 ChangeLog 21647 +RMD160 07d0b40a163afc88a6114818eed937c76f6618bf ChangeLog 21647 +SHA256 455c5d592782dfe5f235b3163a7fbfbaa0813d0d34c4e3299117222c8c69c7e4 ChangeLog 21647 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -77,10 +82,13 @@ SHA256 0b6331d7a25052d2dd0be1018dd89f82f33bc4ae5c18ad89a51aab48b8d1d2c5 files/di MD5 35c1c428b0a6c704c3796605ac2ae646 files/digest-portage-2.1.2_rc3-r4 798 RMD160 54978f9a0b089762f6a8ea211e6e68db75ceea12 files/digest-portage-2.1.2_rc3-r4 798 SHA256 92cdb69bb36139720fab6cef0c8774d23e4754282bfd86f6368b2e452e409a76 files/digest-portage-2.1.2_rc3-r4 798 +MD5 70e7021df5a77c63f587801ead42a852 files/digest-portage-2.1.2_rc3-r5 798 +RMD160 dc5be32ac7b925fffb4656e146a283e3f005137c files/digest-portage-2.1.2_rc3-r5 798 +SHA256 e96437e3eb504424c9069f0956b22b49e6fb9d16d49e35f20366262757b39738 files/digest-portage-2.1.2_rc3-r5 798 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFfp62/ejvha5XGaMRAsDhAJ9c9fUAD3jSZSGXm1rRgUA81XWJyQCg20UJ -J+HKuVNdW/axJBdYhvzNORs= -=ca6n +iD8DBQFFgQiV/ejvha5XGaMRAjC1AJ9TrTbwfpCuXgG/Ksc958bYjoMjLACgnGjk +0YkHOpRfDbX7YUqLmeAd7U4= +=DHIJ -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2_rc3-r5 b/sys-apps/portage/files/digest-portage-2.1.2_rc3-r5 new file mode 100644 index 000000000000..131891fbdfa6 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.2_rc3-r5 @@ -0,0 +1,9 @@ +MD5 6b71ee1693b0b73ff169e9cbb0f2c512 portage-2.1.2_rc3-r5.patch.bz2 12671 +RMD160 2c01b39160bd6266f7029a7df9f0f1bb42527233 portage-2.1.2_rc3-r5.patch.bz2 12671 +SHA256 07e4de75f42cb8a20225779253f1dcbe8b146b6d17e776cad66867dfad7a72ee portage-2.1.2_rc3-r5.patch.bz2 12671 +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-r5.ebuild b/sys-apps/portage/portage-2.1.2_rc3-r5.ebuild new file mode 100644 index 000000000000..c9a4e58c03e0 --- /dev/null +++ b/sys-apps/portage/portage-2.1.2_rc3-r5.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-r5.ebuild,v 1.1 2006/12/14 08:17: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 + ewarn "In portage-2.1.2_rc2, the implicit RDEPEND behavior has been reverted back to" + ewarn "the way it was in