EAPI 5 bump; dropped unused build file

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

3 files changed, 19 insertions, 93 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/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
 }