From 1fc10e54df4a9e15e1f30ada6e5531157364755b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 29 Jan 2007 03:20:32 +0000 Subject: [PATCH] 2.1.2-r5 revbump. Bugs #162453 and #147007 track fixes since 2.1.1. Package-Manager: portage-2.1.2-r5 --- sys-apps/portage/ChangeLog | 7 +- sys-apps/portage/Manifest | 22 +- .../portage/files/digest-portage-2.1.2-r5 | 9 + sys-apps/portage/portage-2.1.2-r5.ebuild | 225 ++++++++++++++++++ 4 files changed, 255 insertions(+), 8 deletions(-) create mode 100644 sys-apps/portage/files/digest-portage-2.1.2-r5 create mode 100644 sys-apps/portage/portage-2.1.2-r5.ebuild diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index fee861bbbd76..ab3ffbeb7e8e 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,11 @@ # 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.337 2007/01/24 22:19:33 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.338 2007/01/29 03:20:32 zmedico Exp $ + +*portage-2.1.2-r5 (29 Jan 2007) + + 29 Jan 2007; Zac Medico +portage-2.1.2-r5.ebuild: + 2.1.2-r5 revbump. Bugs #162453 and #147007 track fixes since 2.1.1. *portage-2.1.2-r4 (24 Jan 2007) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 82c8c3ea80dc..3ee759ada28e 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-r4.patch.bz2 11308 RMD160 708dd1c9109f11e9f5dd46f9c2f1ed5590bce15a SHA1 dab05e5f453854912260ea77b1279786e6eeb36e SHA256 3966b84883512fdcabe6ccf4cdb6b990c6f7d436464ec7512d29e1e1c8319b1d +DIST portage-2.1.2-r5.patch.bz2 13738 RMD160 e118d07177007ab88e00d308c46df83c50d05036 SHA1 549a07354519aba39b399186e71ee99aaa012478 SHA256 7a132ffe4ffbe82be5b82a3262210af0a64412adb272459794111e8a50414c37 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 @@ -43,10 +44,14 @@ EBUILD portage-2.1.2-r4.ebuild 6794 RMD160 9b7df7fd0d3c48d87c7eeaf98cd80c57c11d9 MD5 76f9ec684c2a298fd14667a6bb650c73 portage-2.1.2-r4.ebuild 6794 RMD160 9b7df7fd0d3c48d87c7eeaf98cd80c57c11d958f portage-2.1.2-r4.ebuild 6794 SHA256 87b6ff274748ed9adb7e2fe20bfc826b6767963b3a629bcd9cace02f3c387535 portage-2.1.2-r4.ebuild 6794 -MISC ChangeLog 18550 RMD160 9b1a6efa6d11d8bdb3b90e8c8d5f183dc564052d SHA1 977c63dd53bec5dce520f1731d32f2a50d916923 SHA256 014505bf84762499227e999e4bb7ba1851bb5e7b43aa53d70012a1bb1dd5c97b -MD5 097eb26a61ba3878aa39bf3e79884c31 ChangeLog 18550 -RMD160 9b1a6efa6d11d8bdb3b90e8c8d5f183dc564052d ChangeLog 18550 -SHA256 014505bf84762499227e999e4bb7ba1851bb5e7b43aa53d70012a1bb1dd5c97b ChangeLog 18550 +EBUILD portage-2.1.2-r5.ebuild 6794 RMD160 d347db6c9bba3c82cdfc68a41ba14b3d2dac517f SHA1 98d212a7f971d53a83fb445982806d736d9f0648 SHA256 b86994f3adb9e0f50b89f75eeeee3669a329f541482f7dd8fb67e0139f36f3fb +MD5 c8826e8ea8dcda10d5f8dec63bda26f2 portage-2.1.2-r5.ebuild 6794 +RMD160 d347db6c9bba3c82cdfc68a41ba14b3d2dac517f portage-2.1.2-r5.ebuild 6794 +SHA256 b86994f3adb9e0f50b89f75eeeee3669a329f541482f7dd8fb67e0139f36f3fb portage-2.1.2-r5.ebuild 6794 +MISC ChangeLog 18728 RMD160 84b8a61a7e5fccde30cbcd3ea5b4ec26bea8bafd SHA1 84dc6a40e0ea86f2e61816563623bc6c4ec34f5f SHA256 f88f088495938096fce434830babf3e7fc1895062f68d6c09aea5723f0bc7584 +MD5 4a5b22838deeb473272b3fe6f6341a55 ChangeLog 18728 +RMD160 84b8a61a7e5fccde30cbcd3ea5b4ec26bea8bafd ChangeLog 18728 +SHA256 f88f088495938096fce434830babf3e7fc1895062f68d6c09aea5723f0bc7584 ChangeLog 18728 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -66,10 +71,13 @@ SHA256 1dbfd88dcf8f81cff40287b480099fe80fd5e0a9f0b153e23d7706446c01be22 files/di MD5 52f71d0a2f28f9f89efd6f3518a4366b files/digest-portage-2.1.2-r4 762 RMD160 19588fbda72e0d51680cb78add935f99099022fa files/digest-portage-2.1.2-r4 762 SHA256 71d1985fb140c7d3868a886d3609c47a43356d3e4e501535cc2bd0d9151dbc04 files/digest-portage-2.1.2-r4 762 +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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD4DBQFFt9t7/ejvha5XGaMRApCfAJYx9ChW1TdyWsCyGjL7FKPiFWdZAJ99KB+C -qQTZEePI8Ze0yjIrMyTyTw== -=8Xk7 +iD8DBQFFvWgG/ejvha5XGaMRAmWNAJ0a+g84iyNKJcjJ8Y1zHgLRBNH00QCgzFZd +7u5olZJBfCGVq43+hXNpQGg= +=GcaS -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/files/digest-portage-2.1.2-r5 b/sys-apps/portage/files/digest-portage-2.1.2-r5 new file mode 100644 index 000000000000..dcb40da2177b --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.2-r5 @@ -0,0 +1,9 @@ +MD5 1a30a1fc2770ec13c48c46125e9350fc portage-2.1.2-r5.patch.bz2 13738 +RMD160 e118d07177007ab88e00d308c46df83c50d05036 portage-2.1.2-r5.patch.bz2 13738 +SHA256 7a132ffe4ffbe82be5b82a3262210af0a64412adb272459794111e8a50414c37 portage-2.1.2-r5.patch.bz2 13738 +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-r5.ebuild b/sys-apps/portage/portage-2.1.2-r5.ebuild new file mode 100644 index 000000000000..ae4a00e79944 --- /dev/null +++ b/sys-apps/portage/portage-2.1.2-r5.ebuild @@ -0,0 +1,225 @@ +# 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-r5.ebuild,v 1.1 2007/01/29 03:20:32 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" +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 +} -- 2.26.2