diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-04-16 18:38:34 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-04-16 18:38:34 +0000 |
| commit | 40df74ad952284873f51792c7186b05e0ddee4be (patch) | |
| tree | 5dafac4afeab4dde35da90c69602146ff0599e99 /dev-java | |
| parent | License for dev-java/concurrent-util, bug 463998. (diff) | |
| download | gentoo-2-40df74ad952284873f51792c7186b05e0ddee4be.tar.gz gentoo-2-40df74ad952284873f51792c7186b05e0ddee4be.tar.bz2 gentoo-2-40df74ad952284873f51792c7186b05e0ddee4be.zip | |
Fix the use of distutils-r1. Fixes bug #466086.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/javatoolkit/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild | 19 |
2 files changed, 16 insertions, 8 deletions
diff --git a/dev-java/javatoolkit/ChangeLog b/dev-java/javatoolkit/ChangeLog index 165b35ef8d67..0b18824a7b7b 100644 --- a/dev-java/javatoolkit/ChangeLog +++ b/dev-java/javatoolkit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/javatoolkit # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.70 2013/04/16 09:42:35 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/ChangeLog,v 1.71 2013/04/16 18:38:34 mgorny Exp $ + + 16 Apr 2013; Michał Górny <mgorny@gentoo.org> javatoolkit-0.3.0-r9.ebuild: + Fix the use of distutils-r1. Fixes bug #466086. *javatoolkit-0.3.0-r9 (16 Apr 2013) diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild index c92dd7b848ec..d8d66c6e16bc 100644 --- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild +++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.1 2013/04/16 09:42:35 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.2 2013/04/16 18:38:34 mgorny Exp $ EAPI="5" -PYTHON_COMPAT=(jython2_5 python2_{5,6,7}) +PYTHON_COMPAT=(python2_{5,6,7}) PYTHON_REQ_USE="xml(+)" -inherit eutils multilib distutils-r1 +inherit distutils-r1 eutils multilib DESCRIPTION="Collection of Gentoo-specific tools for Java" HOMEPAGE="http://www.gentoo.org/proj/en/java/" @@ -19,10 +19,15 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="" python_prepare_all() { - epatch "${FILESDIR}/${P}-python2.6.patch" - epatch "${FILESDIR}/${P}-no-pyxml.patch" + local PATCHES=( + "${FILESDIR}/${P}-python2.6.patch" + "${FILESDIR}/${P}-no-pyxml.patch" + ) + + distutils-r1_python_prepare_all } -python_configure_all() { - mydistutilsargs=( --install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin ) +python_install() { + distutils-r1_python_install \ + --install-scripts="${EPREFIX}"/usr/$(get_libdir)/${PN}/bin } |