summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-03-29 16:58:34 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-03-29 16:58:34 +0000
commitf3081ba55d4b2a3a74fd0cc5104e7650c936ee48 (patch)
tree83af34706b99ad89c6579ac8679d0379bc207b41 /dev-java/werken-xpath
parentclean up; stable x86, request/report/tested by B.vd Berg on IRC #gentoo-vdr (diff)
downloadgentoo-2-f3081ba55d4b2a3a74fd0cc5104e7650c936ee48.tar.gz
gentoo-2-f3081ba55d4b2a3a74fd0cc5104e7650c936ee48.tar.bz2
gentoo-2-f3081ba55d4b2a3a74fd0cc5104e7650c936ee48.zip
Migrate to EAPI 2 for bug #239835.
(Portage version: 2.2_rc27/cvs/Linux i686)
Diffstat (limited to 'dev-java/werken-xpath')
-rw-r--r--dev-java/werken-xpath/ChangeLog6
-rw-r--r--dev-java/werken-xpath/werken-xpath-0.9.4_beta-r1.ebuild14
2 files changed, 11 insertions, 9 deletions
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 <betelgeuse@gentoo.org>
+ werken-xpath-0.9.4_beta-r1.ebuild:
+ Migrate to EAPI 2 for bug #239835.
24 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
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"