From ef551c54ed1d9f1b42f77757fff1a35f51d9abb2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 14 Jan 2007 23:22:33 +0000 Subject: [PATCH] 2.1.2 final release. Package-Manager: portage-2.1.2 --- sys-apps/portage/ChangeLog | 88 +------- sys-apps/portage/files/digest-portage-2.1.2 | 6 + sys-apps/portage/portage-2.1.2.ebuild | 224 ++++++++++++++++++++ 3 files changed, 236 insertions(+), 82 deletions(-) create mode 100644 sys-apps/portage/files/digest-portage-2.1.2 create mode 100644 sys-apps/portage/portage-2.1.2.ebuild diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 54a51fcaf674..77b6441abb45 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.330 2007/01/13 06:28:10 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.331 2007/01/14 23:22:33 zmedico Exp $ + +*portage-2.1.2 (15 Jan 2007) + + 15 Jan 2007; Zac Medico +portage-2.1.2.ebuild: + 2.1.2 final release. *portage-2.1.2_rc4-r9 (13 Jan 2007) @@ -57,87 +62,6 @@ 23 Dec 2006; Zac Medico +portage-2.1.2_rc4.ebuild: 2.1.2_rc4 release candidate. This is the last rc before 2.1.2 final. -*portage-2.1.2_rc3-r9 (21 Dec 2006) - - 21 Dec 2006; Zac Medico +portage-2.1.2_rc3-r9.ebuild: - 2.1.2_rc3-r9 revbump. This fixes bugs #158558, #158608, #158632, #158649, - and #158658. - -*portage-2.1.2_rc3-r8 (20 Dec 2006) - - 20 Dec 2006; Zac Medico +portage-2.1.2_rc3-r8.ebuild: - 2.1.2_rc3-r8 revbump. This fixes bugs #158558 and #158608. - -*portage-2.1.2_rc3-r7 (19 Dec 2006) - - 19 Dec 2006; Zac Medico +portage-2.1.2_rc3-r7.ebuild: - 2.1.2_rc3-r7 revbump. This fixes bugs #158354, #158503, and #158508. - -*portage-2.1.2_rc3-r6 (17 Dec 2006) - - 17 Dec 2006; Zac Medico +portage-2.1.2_rc3-r6.ebuild: - 2.1.2_rc3-r6 revbump. This fixes bugs #118455, #158177, and #158264. - -*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) - - 12 Dec 2006; Zac Medico +files/bug_157897.patch, - -portage-2.1.2_rc3-r3.ebuild, +portage-2.1.2_rc3-r4.ebuild: - 2.1.2_rc3-r4 revbump just to fix bug #157897. This patch fixes a KeyError - exception may occur when emerge is calculating dependencies. - -*portage-2.1.2_rc3-r3 (12 Dec 2006) - - 12 Dec 2006; Zac Medico +portage-2.1.2_rc3-r3.ebuild: - 2.1.2_rc3-r3 revbump. This fixes bug #157823 among other things. - -*portage-2.1.2_rc3-r2 (11 Dec 2006) - - 11 Dec 2006; Zac Medico - +portage-2.1.2_rc3-r2.ebuild, +files/buildpkgonly_blockers.patch: - 2.1.2_rc3-r2 revbump. This fixes bugs #128809, #157709, and #157734. - -*portage-2.1.2_rc3-r1 (10 Dec 2006) - - 10 Dec 2006; Zac Medico +portage-2.1.2_rc3-r1.ebuild: - 2.1.2_rc3-r1 revbump. This fixes bug #157369 among other things. - -*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, #152127, #157134, - #157370, #157385, and #157393. - -*portage-2.1.2_rc2-r5 (04 Dec 2006) - - 04 Dec 2006; Zac Medico +portage-2.1.2_rc2-r5.ebuild: - 2.1.2_rc2-r5 revbump. For bug #131633, RESTRICT=stricter has been disabled. - -*portage-2.1.2_rc2-r4 (03 Dec 2006) - - 03 Dec 2006; Zac Medico +portage-2.1.2_rc2-r4.ebuild: - 2.1.2_rc2-r4 revbump. This adds support for Manifest verification of - ebuilds in all phases, including metadata generation. - -*portage-2.1.2_rc2-r3 (28 Nov 2006) - - 28 Nov 2006; Zac Medico +portage-2.1.2_rc2-r3.ebuild: - 2.1.2_rc2-r3 revbump. This fixes bug #8423. - -*portage-2.1.2_rc2-r2 (25 Nov 2006) - - 25 Nov 2006; Zac Medico +portage-2.1.2_rc2-r2.ebuild: - 2.1.2_rc2-r2 revbump. This fixes bugs #150585 and #156014. - -*portage-2.1.2_rc2-r1 (20 Nov 2006) - - 20 Nov 2006; Zac Medico +portage-2.1.2_rc2-r1.ebuild: - 2.1.2_rc2-r1 revbump. This fixes bugs #155559 and #155739. - *portage-2.1.2_rc2 (18 Nov 2006) 18 Nov 2006; Zac Medico +portage-2.1.2_rc2.ebuild: diff --git a/sys-apps/portage/files/digest-portage-2.1.2 b/sys-apps/portage/files/digest-portage-2.1.2 new file mode 100644 index 000000000000..712d6b197f21 --- /dev/null +++ b/sys-apps/portage/files/digest-portage-2.1.2 @@ -0,0 +1,6 @@ +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.ebuild b/sys-apps/portage/portage-2.1.2.ebuild new file mode 100644 index 000000000000..179c6eb0bcb8 --- /dev/null +++ b/sys-apps/portage/portage-2.1.2.ebuild @@ -0,0 +1,224 @@ +# 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.ebuild,v 1.1 2007/01/14 23:22:33 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 + 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