Migrate to EAPI 1. Limit jdk version to <=1.6. Compile tests with test USE flag only. Avoid packing unit tests into the jar.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 103 insertions, 7 deletions

diff --git a/dev-java/metadata-extractor/ChangeLog b/dev-java/metadata-extractor/ChangeLog
index 2843b2928252..73212acb3458 100644
--- a/dev-java/metadata-extractor/ChangeLog
+++ b/dev-java/metadata-extractor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/metadata-extractor
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/ChangeLog,v 1.12 2008/03/11 15:47:43 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/ChangeLog,v 1.13 2009/01/31 13:46:36 serkan Exp $
+
+*metadata-extractor-2.2.2-r3 (31 Jan 2009)
+
+  31 Jan 2009; Serkan Kaba <serkan@gentoo.org>
+  +files/metadata-extractor-2.2.2-buildfix.patch,
+  +metadata-extractor-2.2.2-r3.ebuild:
+  Migrate to EAPI 1. Limit jdk version to <=1.6. Compile tests with test USE
+  flag only. Avoid packing unit tests into the jar.
 
   11 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
   metadata-extractor-2.2.2-r2.ebuild:
diff --git a/dev-java/metadata-extractor/Manifest b/dev-java/metadata-extractor/Manifest
index efdbfbdc72c1..c49df8555833 100644
--- a/dev-java/metadata-extractor/Manifest
+++ b/dev-java/metadata-extractor/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX metadata-extractor-2.2.2-buildfix.patch 2108 RMD160 88d5961b12038cf6ad5a4d3de3736c6133b0a770 SHA1 14fc58bf6c60e2ae07c86dc00de3370a50ee03fd SHA256 4290fdd842d15474b3fa73775761dc7cf10f55f078af615006ca8493a5ea9090
 DIST metadata-extractor-2.2.2-src.jar 3936358 RMD160 772f975acdad30357295d0dc4afdf316144c2024 SHA1 783b30f347ce89efe3f84da3cd106e0fa4a5f6f1 SHA256 38f8b12418afde99286b9b7c86158eb4fd2c47a23ed4af025af77bae301e1783
 EBUILD metadata-extractor-2.2.2-r2.ebuild 1256 RMD160 77dd7811e6502413941d3195161ea9773001c818 SHA1 ffc355567ddd3411e816754d932fa2cb21e5de47 SHA256 04ad1cefc38c030bbb4fa79c157dfc50afbb5b19f56c37911625a4ac893d3013
-MISC ChangeLog 1874 RMD160 5b4aca3239a7fd08036886bce05f65171c964fd9 SHA1 166d12afbc0a37349f2f449544fcc7dba06ebb7e SHA256 40b2a7aac2c536596c273d2a691f3743d97fbfb93694252bf2966239f1ab15b3
+EBUILD metadata-extractor-2.2.2-r3.ebuild 1205 RMD160 3cfeda512af5c2046e13b0cdabb9feaf6bb26a10 SHA1 efb025a822599b41db44f3088adaec037ee5000e SHA256 136d18998a16ded46b4ee27325a4147737a3294e58ec4952a6572bb7cba499f1
+MISC ChangeLog 2180 RMD160 084b35af5dbaa0d101ce86f9b04d10cbb421abd4 SHA1 9fcaf6f3382150f82580c048db0e69c180a098f7 SHA256 3a3c7bf7b4907243c1fe159b9794bb9659a9325cb1b0ba90e2286d2998a8ffd2
 MISC metadata.xml 363 RMD160 924507584ecded991a0a21959054ac3552d9e936 SHA1 523071c991448dbd8d6147a37fd04dbca4ca716a SHA256 5f79ff97b49035cdcac571169c99213709de8e5d5e178e4465b7aa156e8a7912
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH1qmkcxLzpIGCsLQRAl1JAJ9wfCRyN32FjNRv25oJ6JXdC+gvrwCfZyY7
-3wo5zEXcgLwgPmDjDcPDcbo=
-=1SGs
+iEYEARECAAYFAkmEVkIACgkQRh6X64ivZaJoggCeMtUv948gLQ2sGzGfPF0Ofpx8
+rcgAnRjBsfvZBqjuoQjEmbqIMqVw/FvE
+=IUEA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch b/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch
new file mode 100644
index 000000000000..fb455f4f0943
--- /dev/null
+++ b/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch
@@ -0,0 +1,46 @@
+--- metadata-extractor.build	2009-01-31 15:22:58.000000000 +0200
++++ metadata-extractor.build.fixed	2009-01-31 15:37:02.000000000 +0200
+@@ -24,25 +24,38 @@
+             srcdir="${src}"

+             destdir="${build}"

+             debug="${debug}"

+-            verbose="${verbose}"/>

++            verbose="${verbose}">
++            <exclude name="**/test/*.java"/>
++        </javac>

++    </target>
++    
++    <target name="compile-test" description="compile the source">

++        <javac classpath="${classpath}"

++            srcdir="${src}"

++            destdir="${build}"

++            debug="${debug}"

++            verbose="${verbose}">
++            <include name="**/test/*.java"/>
++        </javac>

+     </target>

+ 

+-    <target name="dist-binaries" depends="clean, compile, test" description="generate binary distribution">

++    <target name="dist-binaries" depends="clean, compile" description="generate binary distribution">

+         <jar destfile="${dist}/metadata-extractor-${version}.jar" update="false" basedir="${build}">

+             <manifest>

+                 <attribute name="Main-Class" value="com.drew.imaging.jpeg.JpegMetadataReader"/>

+-            </manifest>

++            </manifest>
++            <exclude name="**/test/*.class"/>

+         </jar>

+     </target>

+ 

+-    <target name="dist-source" depends="clean, compile, test" description="generate source distribution">

++    <target name="dist-source" depends="clean, compile" description="generate source distribution">

+         <jar destfile="${dist}/metadata-extractor-${version}-src.jar" update="false">

+             <fileset dir="."

+                 includes="${src}/**/*.java, ${src}/**/*.jpg, ${lib}/junit.jar, metadata-extractor.build, ReleaseNotes.txt"/>

+         </jar>

+     </target>

+ 

+-    <target name="test" depends="compile" description="run all junit tests">

++    <target name="test" depends="compile-test" description="run all junit tests">

+         <junit printsummary="yes" fork="yes" haltonfailure="yes">

+             <classpath>

+                 <pathelement location="${build}"/>

diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r3.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r3.ebuild
new file mode 100644
index 000000000000..2a13a3e12c9d
--- /dev/null
+++ b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/metadata-extractor-2.2.2-r3.ebuild,v 1.1 2009/01/31 13:46:36 serkan Exp $
+
+EAPI=1
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A general metadata extraction framework. Support currently exists for Exif and Iptc metadata segments. Extraction of these segments is provided for Jpeg files"
+HOMEPAGE="http://www.drewnoakes.com/code/exif/"
+SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	test? ( dev-java/junit:0 )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+S=${WORKDIR}/
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-buildfix.patch
+	mv metadata-extractor.build build.xml
+
+	use test && java-pkg_jar-from --build-only --into lib/ junit junit.jar
+}
+
+EANT_DOC_TARGET=""
+EANT_BUILD_TARGET="dist-binaries"
+
+src_install() {
+	dodoc ReleaseNotes.txt || die "dodoc failed"
+	java-pkg_newjar dist/*.jar "${PN}.jar"
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test
+}