[gentoo-commits] gentoo-x86 commit in dev-java/struts: ChangeLog struts-1.2.9-r2.ebuild

["Petteri Raty (betelgeuse)" <betelgeuse@gentoo.org>]

betelgeuse    09/03/29 17:03:50

  Modified:             ChangeLog struts-1.2.9-r2.ebuild
  Log:
  Migrate to EAPI 2 for bug #239835.
  (Portage version: 2.2_rc27/cvs/Linux i686)

Revision  Changes    Path
1.44                 dev-java/struts/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	24 Mar 2009 19:04:44 -0000	1.43
+++ ChangeLog	29 Mar 2009 17:03:50 -0000	1.44
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.43 2009/03/24 19:04:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.44 2009/03/29 17:03:50 betelgeuse Exp $
+
+  29 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> struts-1.2.9-r2.ebuild:
+  Migrate to EAPI 2 for bug #239835.
 
   24 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> struts-1.2.9-r2.ebuild:
   Add SLOT deps for SLOT 0 deps.



1.6                  dev-java/struts/struts-1.2.9-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild?r1=1.5&r2=1.6

Index: struts-1.2.9-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- struts-1.2.9-r2.ebuild	24 Mar 2009 19:04:44 -0000	1.5
+++ struts-1.2.9-r2.ebuild	29 Mar 2009 17:03:50 -0000	1.6
@@ -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/struts/struts-1.2.9-r2.ebuild,v 1.5 2009/03/24 19:04:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r2.ebuild,v 1.6 2009/03/29 17:03:50 betelgeuse Exp $
 
-EAPI=1
+EAPI="2"
 JAVA_PKG_IUSE="doc examples source"
 WANT_ANT_TASKS="ant-trax"
 
@@ -15,7 +15,7 @@
 LICENSE="Apache-2.0"
 SLOT="1.2"
 COMMON_DEPS="
-	dev-java/antlr:0
+	>=dev-java/antlr-2.7.7:0[java]
 	dev-java/commons-beanutils:1.7
 	>=dev-java/commons-collections-2.1:0
 	>=dev-java/commons-digester-1.5:0
@@ -33,9 +33,7 @@
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-
+java_prepare() {
 	# the build.xml expects this directory to exist
 	mkdir "${S}/lib"
 	cd "${S}/lib"