From ae7f5ccd97b908a210e74b8227d59c54d4a10b02 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Thu, 18 Oct 2012 12:53:24 +0000 Subject: pull in 0.8.5; fix bugs 438370, 437216; update for python abi awareness (Portage version: 2.1.11.23/cvs/Linux x86_64) --- sys-apps/pkgcore/ChangeLog | 10 +++++++- sys-apps/pkgcore/pkgcore-0.8.5.ebuild | 46 +++++++++++++++++++++++++++++++++++ sys-apps/pkgcore/pkgcore-9999.ebuild | 24 +++++++++++------- 3 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 sys-apps/pkgcore/pkgcore-0.8.5.ebuild (limited to 'sys-apps') diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog index 90d04d5fc3a5..25ab2a239a54 100644 --- a/sys-apps/pkgcore/ChangeLog +++ b/sys-apps/pkgcore/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-apps/pkgcore # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.160 2012/10/04 13:57:37 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.161 2012/10/18 12:53:24 ferringb Exp $ + +*pkgcore-0.8.5 (18 Oct 2012) + + 18 Oct 2012; Brian Harring +pkgcore-0.8.5.ebuild, + pkgcore-9999.ebuild: + Fix py3k doc building support, update package name rules to recently + changed PMS rules; bug #438370. Finally, fix a racey false positive 437216. + Finally, add python ABI awareness so pkgcore gets installed in all contexts. *pkgcore-0.8.4 (04 Oct 2012) diff --git a/sys-apps/pkgcore/pkgcore-0.8.5.ebuild b/sys-apps/pkgcore/pkgcore-0.8.5.ebuild new file mode 100644 index 000000000000..b84c6d7720cf --- /dev/null +++ b/sys-apps/pkgcore/pkgcore-0.8.5.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.8.5.ebuild,v 1.1 2012/10/18 12:53:24 ferringb Exp $ + +EAPI="3" +DISTUTILS_SRC_TEST="setup.py" +SUPPORT_PYTHON_ABIS="1" + +PYTHON_ABI="2.5 2.6 2.7 3.1 3.2" +inherit distutils eutils + +DESCRIPTION="pkgcore package manager" +HOMEPAGE="http://pkgcore.googlecode.com/" +SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="-doc build" + +RDEPEND=">=dev-lang/python-2.5 + >=dev-python/snakeoil-0.5.2 + || ( >=dev-lang/python-2.5 dev-python/pycrypto )" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx dev-python/pyparsing )" + +DOCS="AUTHORS NEWS" + +pkg_setup() { + # disable snakeoil 2to3 caching... + unset PY2TO3_CACHEDIR + python_pkg_setup +} + +src_compile() { + distutils_src_compile $(use_enable doc html-docs) +} + +src_install() { + distutils_src_install $(use_enable doc html-docs) +} + +pkg_postinst() { + distutils_pkg_postinst + pplugincache +} diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild index 8132bf399d7f..b1960cc8d7f8 100644 --- a/sys-apps/pkgcore/pkgcore-9999.ebuild +++ b/sys-apps/pkgcore/pkgcore-9999.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.8 2012/03/29 06:53:13 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-9999.ebuild,v 1.9 2012/10/18 12:53:24 ferringb Exp $ EAPI="3" DISTUTILS_SRC_TEST="setup.py" +SUPPORT_PYTHON_ABIS="1" +PYTHON_ABI="2.5 2.6 2.7 3.1 3.2" EGIT_REPO_URI="https://code.google.com/p/pkgcore/" inherit distutils git-2 @@ -15,14 +17,13 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="+doc +man" +IUSE="+doc" -RDEPEND=">=dev-lang/python-2.4 +RDEPEND=">=dev-lang/python-2.5 =dev-python/snakeoil-9999 || ( >=dev-lang/python-2.5 dev-python/pycrypto )" DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) - man? ( dev-python/sphinx ) + dev-python/sphinx dev-python/pyparsing" DOCS="AUTHORS NEWS" @@ -34,13 +35,18 @@ pkg_setup() { } src_compile() { - distutils_src_compile $(use_enable doc html-docs) \ - $(use_enable man man-pages) + local x + distutils_src_compile $(use_enable doc html-docs) + # Find the first set of generated manpages, and symlink + # those into the source root. + for x in ${PYTHON_ABIS}; do + ln -s "${S}/build-${x}/sphinx/man" "${S}/man" + break + done } src_install() { - distutils_src_install $(use_enable doc html-docs) \ - $(use_enable man man-pages) + distutils_src_install $(use_enable doc html-docs) } pkg_postinst() { -- cgit v1.2.3-65-gdbad