[gentoo-commits] gentoo commit in xml/htdocs/proj/en/java: java-devel.xml

[Petteri Raty (betelgeuse)]

betelgeuse    09/03/27 19:13:38

  Modified:             java-devel.xml
  Log:
  Update example ebuilds to EAPI 2.

Revision  Changes    Path
1.36                 xml/htdocs/proj/en/java/java-devel.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/java/java-devel.xml?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/java/java-devel.xml?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/java/java-devel.xml?r1=1.35&r2=1.36

Index: java-devel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/java/java-devel.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- java-devel.xml	23 Feb 2009 20:22:30 -0000	1.35
+++ java-devel.xml	27 Mar 2009 19:13:38 -0000	1.36
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/java/java-devel.xml,v 1.35 2009/02/23 20:22:30 serkan Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/java/java-devel.xml,v 1.36 2009/03/27 19:13:38 betelgeuse Exp $ -->
 
 <guide link="/doc/en/java-devel.xml">
 <title>Gentoo Java Packaging Guide</title>
@@ -362,7 +362,7 @@
 
 <pre caption="Example: Pure java package">
 
-EAPI=1
+EAPI="2"
 JAVA_PKG_IUSE="doc examples source"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -378,7 +378,7 @@
 
 COMMON_DEP="
         dev-java/xerces:2
-        >=dev-java/log4j-1.2.8"
+        >=dev-java/log4j-1.2.8:0"
 
 RDEPEND=">=virtual/jre-1.4
         ${COMMON_DEP}"
@@ -388,9 +388,7 @@
 
 S=${WORKDIR}/${P}-src
 
-src_unpack() {
-        unpack ${A}
-
+java_prepare() {
         cd "${S}/lib"
         rm -v *.jar || die
 
@@ -408,6 +406,9 @@
 </pre>
 
 <pre caption="Example: Optional java support">
+
+EAPI="2"
+
 inherit eutils java-pkg-opt-2
 
 DESCRIPTION="Fictional example ebuild"
@@ -422,10 +423,7 @@
 DEPEND="java? ( >=virtual/jdk-1.4 )"
 RDEPEND="java? ( >=virtual/jre-1.4 )"
 
-pkg_unpack() {
-        unpack ${A}
-        cd "${S}"
-
+java_prepare() {
         epatch "${FILESDIR}/${P}.patch"
 }
 
@@ -570,7 +568,7 @@
 fex: Add source/target attributes to javac calls.
 </p>
 <p>
-The eclasses uses a post src_unpack hook in order to rewrite the build.xml files.
+The rewriting is done in java-ant-2_src_configure for EAPI 2 or eant for earlier EAPIs.
 </p>
 <p>
 Some variables you can set from your ebuild. (Usually not needed)