EAPI bump; dropped unused patch file

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

4 files changed, 60 insertions, 63 deletions

diff --git a/dev-java/jgoodies-forms/ChangeLog b/dev-java/jgoodies-forms/ChangeLog
index e9bf2b4565b4..daf069a7c084 100644
--- a/dev-java/jgoodies-forms/ChangeLog
+++ b/dev-java/jgoodies-forms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jgoodies-forms
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.32 2014/07/11 17:43:05 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/ChangeLog,v 1.33 2014/09/07 15:59:54 ercpe Exp $
+
+*jgoodies-forms-1.3.0-r1 (07 Sep 2014)
+
+  07 Sep 2014; Johann Schmitz <ercpe@gentoo.org>
+  +jgoodies-forms-1.3.0-r1.ebuild, -files/jgoodies-forms-1.0.7-build.xml.patch:
+  EAPI bump; dropped unused patch file
 
 *jgoodies-forms-1.8.0 (11 Jul 2014)
 
diff --git a/dev-java/jgoodies-forms/Manifest b/dev-java/jgoodies-forms/Manifest
index 87385298860b..97f0bbc21343 100644
--- a/dev-java/jgoodies-forms/Manifest
+++ b/dev-java/jgoodies-forms/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX jgoodies-forms-1.0.7-build.xml.patch 2038 SHA256 3568de4814d7788b222236cfe5127231f33a81caf11795f02a1b022e4a5c524c SHA512 34b90f0715f49a98212e2679f14710b1c9422789b387e71ee4099ae50fce55a38a213f368eb13150c21ea65ccef95a7e8e3db2919e6fe0e794564cb259089d4c WHIRLPOOL efbf92d3244cce1cda486c2a90e4a86499f5d05d8b07e3a7cecc18ec8b64d33315a12274578f6e84fbd0bd76425b48bc82627e5d7c5e1408125d33f3f9a7db0b
 DIST forms-1_3_0.zip 1320397 SHA256 f707a074264c43e37dce7c42df24e433d089fab828a673bf264082397d1f5329 SHA512 d155cc85ec77f23f55e59d4651ef1f9df2ab749bc6cffd4dd7cfbc0035587a2e6bf03427e7bace6feb71e6c43efc87115d393fa54ea6da331ded21996b32a6e8 WHIRLPOOL 88c6aab03ab8e640bb74360c9ff96e3f6da2e64e4da29c851217e6588ffe625c7c73e2ede6ef211eb6a7bfe32ab46370edefb8eed6ff8bc06e875e50e8e33a46
 DIST jgoodies-forms-1_8_0.zip 1668539 SHA256 b090e455727fb2c2ecd1a6bb09b12d5c9f62f662d14b5a53d8b5cbd06fe064ab SHA512 dced4ddaea7e9157f99b7c27ad06bfed53c307181bfc21cee8f454ba8cececa3f5fd5186947fe5bb299c4de2032bd7489248e3e77623785ac47388306e3d6933 WHIRLPOOL 1e38380d171b381f94b3bec2bd4d492088755f40152555f6bd0f281042bec289373045d278f9e1634f5a05e554f7fa80676b6dfaf532ddbd5bde13abd343e37b
+EBUILD jgoodies-forms-1.3.0-r1.ebuild 1033 SHA256 8f39dd56f41f1f9ce8f2519367688ce0d3a7ef056d10146ef70f2b8b066a828b SHA512 00dd24640721980bb823fac6391505b5868d8307408aef60cea3f89651d378684ede172e5128e426dadb5fb8efc56014c5bec82c7c30d7362378971a1537c691 WHIRLPOOL f1d5e3fb65efec988e01646ed6a50beb022bd8f9f92b491d0a3ef6a32a8da70a7ba65d93f59acc3a06865d40f55b986bbb7871f48e2717b8b7b4bc96bf01b302
 EBUILD jgoodies-forms-1.3.0.ebuild 1460 SHA256 b2da41324b1882098337cf335b535407e5a7272dd637d60d39e67e3ad0b64b70 SHA512 ec1ea0181d5d2a0c1b4194b52edbad75afdd5087746f2fa24a2987c98bd79d1cf06ab06135e3f54602dd175b7d17b9ff4b18fab8dd2867f4221db137df17d9b6 WHIRLPOOL 821d1605cee0ecfa3e838bd2fa5e0d5a38736d8ec3d0baf4b82c340bd752e0dfaa45f1e91895c6d39db0361905b9ebbe6b3b443795e171efc0c11c073bf24086
 EBUILD jgoodies-forms-1.8.0.ebuild 926 SHA256 c4d270df90b40cd8bc603e4f9b8574b65693af48d8593e80636acd01621e206b SHA512 c8e011881f663d8b1c22186cf94dac226a6f3bb8467b97b3658a5f634cdaa1f7ed63b4d37a6e3e0f4cc5b26d1084f0b74535a7655b5adbe9be42d80d9e0836f4 WHIRLPOOL 423a3389e229020b3c0b0b75b2891089feb3d265894428bef440218ed50510306a96bd04782ac6589e27eee7415e7d3ba9e8900a6218594b73e874ef8dca06f1
-MISC ChangeLog 4590 SHA256 c7e3d5b9e57bbd9e566defcb326b68605a794cad0ad6b0d07071caa4ab31359d SHA512 d6f05b499a21857e8ec5e153a0b6958d76ea95dc6e69ef4721552786e94298ef6d29f85591b3c4ae79e5b7baada16a81c7f24d3751a600012e021fec6e6b311f WHIRLPOOL 46c45c01303304789a5fdbf09ed45a4f87f0427f183b6ed0a261d3edfd326692995e4c8c1b8be6cd3d294c11b57587b2e3ffc7b3f1e23318bcc04c3ad15cca03
+MISC ChangeLog 4799 SHA256 d0e7d9b5dc89c8502ddc18ad7765ef6b2b7f542c2ea35dcd0f5321fc56fe1c5e SHA512 9e4750dd14e50e07c2adfa986c9d29ff07a94e6426cf5b81f01401ac32224fee9c8a660aa5569774ebec9bbc2876fec7b21ee24e5854a116ba4b7327255b1dc1 WHIRLPOOL 8ec1777ef0e6298cb04d0f4a50645ecb51e3e080736ed6ef4d52eae917a91c79f6ef935bb7fb4e4a71f5aaccc1ed0e398e398c2840e109f98668202f57748305
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTwCIvAAoJEKCEBkJ3xQHtJt4H/3qC5f3y2VH3InyngICV7d6w
-cmZ3xEj2iXTjAVapTm0wwa3Uoj10PX3+vae3iMmXGC5mUyMBWUg1nBraQicW0/fc
-9tnGKj2+9MI5A6GEaVHKdrQr+GYQor2cghkgp+RfxqHrQ/oPWd7OPeYzhnpTCNR3
-V4t8MCiMhkeKdjTJutzcsUpB3XBKYyrPhPTjEiiJIFKa6z2Gzb23LsO5wIrT7TS/
-xdmunRdU25ehfxiGzmWi/gmKqb652CDjz5V2QIIyJktIRHdn9KjhLRJkFWhoCNXL
-hvpGbep22ht9Ro2ctWq3OtI97+CglrWP4wA9cLpQ0oTUKa13e58chiz/HG1820Y=
-=HDab
+iQEcBAEBCAAGBQJUDID/AAoJEKCEBkJ3xQHtc+cH/0PAbuv2TpcwzvXyesgeX1I+
+jbqL2wTNF8nxwpvVLUai9YiwgeUda4gb6fBoLofJTAAnPd3Z4slvnA0AF7raxex0
++ndeU5sOivTlK3hq3lNAJTFJ1WC6tVebH9BSOcc4BWUnIOwrn97+ZdlTIS3T05z2
+J4wUITFBR/bKJaka5YdPuh5hXAxqCr01Fir9FexC+TKceGR3H8HjsfsNBzmq+AA2
++zE8bHvFYfOXrD713iX8eeFIi4+sFvbdJc+g+SkHHuk35mylOdeV9Vba4aS5ZO/C
+mh24Uc/C6guZWBD3MULk9L7WzDg82fGvtMlcEx7mYqaMGbCF3liOFq1kzgKyj3o=
+=bW2J
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jgoodies-forms/files/jgoodies-forms-1.0.7-build.xml.patch b/dev-java/jgoodies-forms/files/jgoodies-forms-1.0.7-build.xml.patch
deleted file mode 100644
index ca92424f6df2..000000000000
--- a/dev-java/jgoodies-forms/files/jgoodies-forms-1.0.7-build.xml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Nru forms-1.0.7.vanilla/build.xml forms-1.0.7/build.xml
---- forms-1.0.7.vanilla/build.xml	2006-08-02 23:05:21.000000000 +0200
-+++ forms-1.0.7/build.xml	2006-08-02 23:07:45.000000000 +0200
-@@ -27,8 +27,6 @@
-     <!-- ***************************************************************** -->

-     <!-- Give users a chance to override build properties.                 -->

-     <!-- ***************************************************************** -->

--    <property file="${user.home}/forms.build.properties" />

--    <property file="${user.home}/build.properties" />

-     <property file="${basedir}/build.properties" />

-     <property file="${basedir}/default.properties" />

-  

-@@ -118,8 +116,7 @@
- 			optimize     ="${build.compile.optimize}"

-             source       ="${build.compile.source}"

- 			target       ="${build.compile.target}"

--			verbose      ="${build.compile.verbose}"

--			bootclasspath="${build.boot.classpath}" />

-+			verbose      ="${build.compile.verbose}" />

- 	</target>

- 	

-     <!-- ***************************************************************** -->

-@@ -139,7 +136,6 @@
-             source       ="${build.compile.source}"

- 			target       ="${build.compile.target}"

- 			verbose      ="${build.compile.verbose}"

--			bootclasspath="${build.boot.classpath}"

- 			classpathref ="classpath.core" />

- 	</target>

- 	

-@@ -161,7 +157,6 @@
-             source       ="${build.compile.source}"

-             target       ="${build.compile.target}"

-             verbose      ="${build.compile.verbose}"

--            bootclasspath="${build.boot.classpath}"

-             classpathref ="classpath.tests" />

-     </target>   

-     

-@@ -182,7 +177,6 @@
-             source       ="${build.compile.source}"

- 			target       ="${build.compile.target}"

- 			verbose      ="${build.compile.verbose}"

--			bootclasspath="${build.boot.classpath}"

- 			classpathref ="classpath.tutorial" />

- 	</target>

- 

-@@ -300,4 +294,4 @@
- 	</target>

- 	

-     

--</project>
-\ No newline at end of file
-+</project>

diff --git a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..94e6d311fc4e
--- /dev/null
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild,v 1.1 2014/09/07 15:59:54 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="forms"
+MY_PV=${PV//./_}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JGoodies Forms Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+EANT_FILTER_COMPILTER="jikes"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar build/${MY_PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.html || die
+
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/{core,extras}/com
+	use examples && java-pkg_doexamples src/tutorial
+}