EAPI 5 bump; dropped unused build file

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 35 insertions, 96 deletions

diff --git a/dev-java/jgoodies-binding/ChangeLog b/dev-java/jgoodies-binding/ChangeLog
index e5e229919d17..0a70ebafec01 100644
--- a/dev-java/jgoodies-binding/ChangeLog
+++ b/dev-java/jgoodies-binding/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jgoodies-binding
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-binding/ChangeLog,v 1.7 2008/02/13 03:53:55 ali_bush Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-binding/ChangeLog,v 1.8 2014/09/07 15:53:57 ercpe Exp $
+
+*jgoodies-binding-1.1.2-r1 (07 Sep 2014)
+
+  07 Sep 2014; Johann Schmitz <ercpe@gentoo.org>
+  +jgoodies-binding-1.1.2-r1.ebuild, -files/build-1.0.3.xml,
+  -jgoodies-binding-1.1.2.ebuild:
+  EAPI 5 bump; dropped unused build file
 
   13 Feb 2008; Alistair Bush <ali_bush@gentoo.org>
   jgoodies-binding-1.1.2.ebuild:
@@ -33,4 +40,3 @@
   10 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   +files/build-1.0.3.xml, +metadata.xml, +jgoodies-binding-1.0.3.ebuild:
   Initial import.
-
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
index 66dd27bc3787..6c7d4cfb8076 100644
--- a/dev-java/jgoodies-binding/Manifest
+++ b/dev-java/jgoodies-binding/Manifest
@@ -1,5 +1,18 @@
-AUX build-1.0.3.xml 2248 SHA256 282cda120b5673b7af2d787dc5ffa01edcd8f36a1192f6291722c68ebb0facd6 SHA512 45ac658cc245e2b66f47f0898b788e49637c1c7823ec2a767d551a96d0cf8e6bd16da50b16f5550d7d10002e3e0d2cad83f712042246eb4ee20ebc3c13d4d309 WHIRLPOOL 6c5a56ed230572f18a7e2ea2287f3e005f3d6900ebaa77e8220fb6e1362c71d5aeb757f4ec7a5e01ead7a17d25c3ce1e5be93377661cc00eb4aec20063c13141
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST binding-1_1_2.zip 1265099 SHA256 dcefcf854c9cfad7281ba86f767191ab657a0e34afe83075c96925fb44cf2958 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7 WHIRLPOOL 9660c62af445d28632c31a2fc0d7266d9bbbb8dcecb9080d63d2bbefc750d7501468dc8759c887c3019371595267af7b955717c6d13e2bce118be1c2c6358e1d
-EBUILD jgoodies-binding-1.1.2.ebuild 1432 SHA256 bb76628067bb018a033a88c1339744abb575ad217805c113342181c05a666742 SHA512 58e6241c251ca16f5782d1764dbc4c80a1f0b534840e9533dc1381e794249df44c27044cd591d67672be8ed9b2130e1d00260592f5c65b63aad141c9efbcf9bc WHIRLPOOL 03eb5a0a17b65b5053e220ad015473235955341d446ae37e8bd4526707004eccf6e59af066120bf8ed432fa73d3de140245174901d539413acd27c9f7929a7f9
-MISC ChangeLog 1257 SHA256 ad8b02ece6040f83560c744fb57f621599645775c60d062f64f6d6c5a2e9b559 SHA512 b19d46a7d3990080a8bbc56d7d33d7452b4ea777fa9e498cd996140d3c66e33b9f1d2d684fc5a19bac09fb27a24c3ba61654727c365ad9f631b1861f2f42ce2f WHIRLPOOL 1dc9170e6872f48c624cd48993876bcad59d149f5e28cac1eb7e93d7131f856dd62ab175fc68bf4f54c7846a5cb6da7664ff9b3456d39e405a553471d28af021
+EBUILD jgoodies-binding-1.1.2-r1.ebuild 1076 SHA256 f27fb010f34f9285c544d79da6063ca81d5c2611cd8b064633563d6e07d8de89 SHA512 00dbc248a05ff07191b11ce32fcf8574a0e3f93c9a6d5fa6e15233d2a0947ec853d7d40d71c571889e06dec3d694c536aeb13610c85f929339c2d84bb37602d7 WHIRLPOOL eea4b4c6e8ffdabbf1df86b659f385d687be8df17d14a15c03f182a9557956a10a982aeed1a84733071254b542cb9e80e208d3f01399970a956c71b43072910a
+MISC ChangeLog 1481 SHA256 65091ca84ad9de7ab5d87ae38535f88391027d5198b658a0fa07b3db02e1c64c SHA512 71d51d12717fe40898c462211913c4a2c4c749dd99b622f7fff7c19e0571758f86d1e5504f28a0aace8d8ac756e515f1c48582a65c7c4caa23fd12d458320ad0 WHIRLPOOL f0fa4bf3075bad2411b0e71d26d4f7365f54bcdadfaaecb6678e14e193d990577ab4227ca9c6e75e6f50eeecf2917a3ef908076d3cdd932cf15c53ceb84e94a7
 MISC metadata.xml 264 SHA256 91486f664497771234fe6600e7cc5ec87175584b3158faaba6f46fe41b4a3d65 SHA512 6b4c973d051856e3b51bc3b3c76b0d981f6effc6bc10705c79186d0bb02a37298d3422453efdbb6d620e71ca72c6be80b0fda4ca64842e58907e37b00b1d7f45 WHIRLPOOL 8bacb19735d917d9e3decd887d955a8a7e1dd415cc54a0f2a7ba6be3be0de082ebe27e899eaef72677d218c4ed2e6b13036b21890843042eb84034f036e5901a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUDH+ZAAoJEKCEBkJ3xQHti7gH+gPtr2q3Il9MBCTOQqbRo7uv
+LBfBZfHxabQMUrbhd+TZZfKEyLiTGx59r5gz71yIKTXEUOC3KZrhQXOjd0av6EA4
+j1iAkPkzhATI3Nz7FnER78LVncAWosw230PZuB5zcFG6N5seZEzsmg9+rjV5FjVi
+FtO/jp0xjJrVKCrX4+DRyx1VbO4+Fn/iS6N/UfPdmUwD8QD4gFM+2pOS7mva7maq
+D49SC1quTAVhKu43ZzlRD1HlRkiElSTAi7Gsj7gFtt0EmH0Pxdm+3yOYfGBIqunf
+OKZVp/taSapP9OotzYY8TGvrPlg0CJtz+AtOaZXyabv43B9HxKfM1zKYUNbqXiA=
+=y2GH
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jgoodies-binding/files/build-1.0.3.xml b/dev-java/jgoodies-binding/files/build-1.0.3.xml
deleted file mode 100644
index ed52f8793628..000000000000
--- a/dev-java/jgoodies-binding/files/build-1.0.3.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Binding" default="jar" basedir=".">
-   
-   <!-- This is a customized build.xml for portage! -->
-   <!--
-      <property file="${basedir}/build.properties"/>
-      <property file="${basedir}/default.properties"/>
-   -->
-
-   <!-- Specification data -->
-   <property name="spec.title" value="JGoodies Binding API Specification"/>
-   <property name="spec.version" value="1.0.3"/>
-   <property name="spec.vendor" value="Karsten Lentzsch"/>
-
-   <!-- Implementation data -->
-   <property name="impl.title" value="JGoodies Binding"/>
-   <property name="impl.version" value="1.0.3"/>
-   <property name="impl.vender" value="Karsten Lentzsch"/>
-   
-   <!-- Directory structure information -->
-   <property name="build" value="${basedir}/build"/>
-   <property name="src" value="${basedir}/src"/>
-
-   <!-- JavaDoc information -->
-   <property name="packages" value="com.jgoodies.*"/>
-   
-   <target name="init">
-      <tstamp />
-      <mkdir dir="${build}"/>
-      <mkdir dir="${build}/doc"/>
-      <mkdir dir="${build}/doc/api"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <manifest file="MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-         <attribute name="Specification-Title" value="${spec.title}"/>
-         <attribute name="Specification-Version" value="${spec.version}"/>
-         <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-         <attribute name="Implementation-Title" value="${impl.title}"/>
-         <attribute name="Implementation-Version" value="${impl.version}"/>
-         <attribute name="Implementation-Vendor" value="${impl.vendor}"/>
-      </manifest>
-   </target>
-   
-   <target name="compile" depends="init">
-      <javac srcdir="${src}"
-             destdir="${build}"
-             source="1.4"
-             target="1.4"
-             encoding="ISO-8859-1"/>
-   </target>
-
-   <target name="javadoc" depends="compile">
-	   <javadoc sourcepath="${src}" packagenames="${packages}" destdir="${build}/docs/"/>
-   </target>
-
-   <target name="jar" depends="compile,manifest">
-      <jar jarfile="binding-${impl.version}.jar" manifest="MANIFEST.MF">
-         <fileset dir="${build}"/>
-      </jar>
-   </target>
-
-</project>
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
index 594231912e67..885f82984aa8 100644
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild,v 1.6 2008/02/13 03:53:55 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild,v 1.1 2014/09/07 15:53:57 ercpe Exp $
+
+EAPI=5
 
 JAVA_PKG_IUSE="doc examples source"
 
@@ -13,7 +15,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
 
 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4.2
@@ -23,37 +25,20 @@ RDEPEND=">=virtual/jre-1.4.2
 
 S=${WORKDIR}/binding-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Clean up the directory structure
-	rm -rvf *.jar lib
+RESTRICT="test"
 
-	# Copy the Gentoo'ized build.xml
-	# cp ${FILESDIR}/build-${PV}.xml ${S}
-	java-ant_xml-rewrite -f build.xml -d -e javac -a bootclasspath
-	#	|| die "Failed to fix bootclasspath"
-	java-pkg_filter-compiler jikes
-}
+EANT_FILTER_COMPILER="jikes"
 
-src_compile() {
-	eant jar # precompile javadocs
+java_prepare() {
+	find -name "*.jar" -delete || die
 }
 
-RESTRICT="test"
-# Needs X
-#src_test() {
-#	eant test -D\
-#		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
-#}
-
 src_install() {
 	java-pkg_dojar build/binding.jar
 
 	dodoc RELEASE-NOTES.txt || die
 	dohtml README.html || die
 	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/core/*
+	use source && java-pkg_dosrc src/core/com
 	use examples && java-pkg_doexamples src/tutorial
 }