diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2010-05-09 23:11:08 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2010-05-09 23:11:08 +0000 |
| commit | 2ad8124d40aa882119096cc1b0ad29793b060818 (patch) | |
| tree | 5bf43cad99dd01f0d3cf0c0bd1c911d42a7ea92c /dev-java/jgrapht | |
| parent | Delete older ebuild. (diff) | |
| download | gentoo-2-2ad8124d40aa882119096cc1b0ad29793b060818.tar.gz gentoo-2-2ad8124d40aa882119096cc1b0ad29793b060818.tar.bz2 gentoo-2-2ad8124d40aa882119096cc1b0ad29793b060818.zip | |
Fix inconsistency in JDK versions that caused the build to fail and migrated to EAPI 2. Fixes bug #317813.
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'dev-java/jgrapht')
| -rw-r--r-- | dev-java/jgrapht/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jgrapht/jgrapht-0.7.3.ebuild | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/dev-java/jgrapht/ChangeLog b/dev-java/jgrapht/ChangeLog index 3a96de542202..05e50465d239 100644 --- a/dev-java/jgrapht/ChangeLog +++ b/dev-java/jgrapht/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jgrapht # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/ChangeLog,v 1.2 2010/01/16 21:00:39 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/ChangeLog,v 1.3 2010/05/09 23:11:08 betelgeuse Exp $ + + 09 May 2010; Petteri Räty <betelgeuse@gentoo.org> jgrapht-0.7.3.ebuild: + Fix inconsistency in JDK versions that caused the build to fail and + migrated to EAPI 2. Fixes bug #317813. 16 Jan 2010; Petteri Räty <betelgeuse@gentoo.org> jgrapht-0.7.3.ebuild: Keyword ~x86. diff --git a/dev-java/jgrapht/jgrapht-0.7.3.ebuild b/dev-java/jgrapht/jgrapht-0.7.3.ebuild index 9b0fe6715bde..2ed0473835d1 100644 --- a/dev-java/jgrapht/jgrapht-0.7.3.ebuild +++ b/dev-java/jgrapht/jgrapht-0.7.3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/jgrapht-0.7.3.ebuild,v 1.2 2010/01/16 21:00:39 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jgrapht/jgrapht-0.7.3.ebuild,v 1.3 2010/05/09 23:11:08 betelgeuse Exp $ -EAPI="1" +EAPI="2" JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -15,8 +15,8 @@ SLOT="0" LICENSE="LGPL-2.1" IUSE="test" -CDEPEND="dev-java/touchgraph-graphlayout - dev-java/jgraph" +CDEPEND="dev-java/touchgraph-graphlayout:0 + dev-java/jgraph:0" DEPEND="${CDEPEND} >=virtual/jdk-1.5 @@ -24,15 +24,15 @@ DEPEND="${CDEPEND} dev-java/xmlunit:1 )" RDEPEND="${CDEPEND} - >=virtual/jre-1.4" + >=virtual/jre-1.5" JAVA_ANT_REWRITE_CLASSPATH="true" EANT_GENTOO_CLASSPATH="touchgraph-graphlayout jgraph" EANT_DOC_TARGET="javadoc" -src_unpack() { - unpack ${A} +java_prepare() { rm -rf "${S}/lib" || die + rm -v "${S}"/*.jar || die } src_install() { |