diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-10-10 17:39:20 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-10-10 17:39:20 +0000 |
| commit | 1174a9c049d458b5589c6a8772434f82aa52227b (patch) | |
| tree | bf3ed4572f4f7f542a94279b57094cf65be12f92 | |
| parent | alpha/ia64/m68k/s390/sh/sparc stable wrt #287219 (diff) | |
| download | gentoo-2-1174a9c049d458b5589c6a8772434f82aa52227b.tar.gz gentoo-2-1174a9c049d458b5589c6a8772434f82aa52227b.tar.bz2 gentoo-2-1174a9c049d458b5589c6a8772434f82aa52227b.zip | |
Merge from Prefix
(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)
| -rw-r--r-- | dev-python/m2crypto/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/m2crypto/m2crypto-0.20.2.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog index 335d5c2896b5..de6830ddcd91 100644 --- a/dev-python/m2crypto/ChangeLog +++ b/dev-python/m2crypto/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/m2crypto # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.46 2009/10/07 19:03:19 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.47 2009/10/10 17:39:20 grobian Exp $ + + 10 Oct 2009; Fabian Groffen <grobian@gentoo.org> m2crypto-0.20.2.ebuild: + Merge from Prefix *m2crypto-0.20.2 (07 Oct 2009) diff --git a/dev-python/m2crypto/m2crypto-0.20.2.ebuild b/dev-python/m2crypto/m2crypto-0.20.2.ebuild index 29c1b7162533..13a1517917f2 100644 --- a/dev-python/m2crypto/m2crypto-0.20.2.ebuild +++ b/dev-python/m2crypto/m2crypto-0.20.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild,v 1.1 2009/10/07 19:03:19 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild,v 1.2 2009/10/10 17:39:20 grobian Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -15,7 +15,7 @@ SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_PN}-$ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc" RDEPEND=">=dev-libs/openssl-0.9.8" @@ -39,15 +39,16 @@ src_test() { } src_install() { + [[ -z ${ED} ]] && local ED=${D} distutils_src_install if use doc; then cd "${S}/demo" - treecopy . "${D}/usr/share/doc/${PF}/example" + treecopy . "${ED}/usr/share/doc/${PF}/example" einfo "Generating API documentation..." cd "${S}/doc" - PYTHONPATH="${PYTHONPATH}:${D}$(python_get_sitedir)" epydoc --html --output=api --name=M2Crypto M2Crypto + PYTHONPATH="${PYTHONPATH}:${ED}$(python_get_sitedir)" epydoc --html --output=api --name=M2Crypto M2Crypto fi dohtml -r * } |