From f3081ba55d4b2a3a74fd0cc5104e7650c936ee48 Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Sun, 29 Mar 2009 16:58:34 +0000 Subject: Migrate to EAPI 2 for bug #239835. (Portage version: 2.2_rc27/cvs/Linux i686) --- dev-java/werken-xpath/ChangeLog | 6 +++++- dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild | 14 ++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'dev-java/werken-xpath') diff --git a/dev-java/werken-xpath/ChangeLog b/dev-java/werken-xpath/ChangeLog index 8a82bec8e50f..963a1339a086 100644 --- a/dev-java/werken-xpath/ChangeLog +++ b/dev-java/werken-xpath/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/werken-xpath # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/ChangeLog,v 1.13 2009/03/24 19:11:35 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/ChangeLog,v 1.14 2009/03/29 16:58:34 betelgeuse Exp $ + + 29 Mar 2009; Petteri Räty + werken-xpath-0.9.4_beta-r1.ebuild: + Migrate to EAPI 2 for bug #239835. 24 Mar 2009; Petteri Räty werken-xpath-0.9.4_beta-r1.ebuild: diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild index 715cef0cba7c..b8e901b23179 100644 --- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild +++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild,v 1.8 2009/03/24 19:11:35 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild,v 1.9 2009/03/29 16:58:34 betelgeuse Exp $ -EAPI="1" +EAPI="2" JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 eutils versionator @@ -22,9 +22,10 @@ KEYWORDS="amd64 ppc x86 ~x86-fbsd" IUSE="" +# need the versioned atom to get keep ensure dep happy COMMON_DEP=" - dev-java/jdom:1.0_beta9 - dev-java/antlr:0" + ~dev-java/jdom-1.0_beta9:1.0_beta9 + >=dev-java/antlr-2.7.7:0[java]" DEPEND=">=virtual/jdk-1.4 ${COMMON_DEP}" RDEPEND=">=virtual/jre-1.4 @@ -32,10 +33,7 @@ RDEPEND=">=virtual/jre-1.4 S="${WORKDIR}/${MY_PN}" -src_unpack() { - unpack ${A} - cd "${S}" - +java_prepare() { # Courtesy of JPackages :) epatch "${FILESDIR}/${P}-jpp-compile.patch" epatch "${FILESDIR}/${P}-jpp-jdom.patch" -- cgit v1.2.3-65-gdbad