Revision bump. EAPI 5.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

6 files changed, 74 insertions, 51 deletions

diff --git a/dev-java/l2fprod-common/ChangeLog b/dev-java/l2fprod-common/ChangeLog
index e9abe4050e55..3911a15779ac 100644
--- a/dev-java/l2fprod-common/ChangeLog
+++ b/dev-java/l2fprod-common/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/l2fprod-common
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/l2fprod-common/ChangeLog,v 1.6 2012/04/13 18:48:55 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/l2fprod-common/ChangeLog,v 1.7 2014/03/08 17:23:06 tomwij Exp $
+
+*l2fprod-common-7.3-r2 (08 Mar 2014)
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +l2fprod-common-7.3-r2.ebuild,
+  -l2fprod-common-7.3-r1.ebuild:
+  Revision bump. EAPI 5.
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> l2fprod-common-7.3-r1.ebuild:
   Move EAPI assignment to top of ebuild, bug 411875.
@@ -30,4 +36,3 @@
   +files/l2fprod-common-6.9.1-nodeps.patch, +metadata.xml,
   +l2fprod-common-6.9.1.ebuild:
   Initial commit for bug #143253.
-
diff --git a/dev-java/l2fprod-common/Manifest b/dev-java/l2fprod-common/Manifest
index 5268192a57e9..8b2477cf9331 100644
--- a/dev-java/l2fprod-common/Manifest
+++ b/dev-java/l2fprod-common/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX l2fprod-common-6.9.1-nodeps.patch 1776 SHA256 e739d4784cbe28f4e6b275da141e0cdafa670c4d3a0d1bb13119e03819312a76 SHA512 636ac2851bc24b776fdcb54b2786879216cf112d400a67b032ef50b44dd3988fa0d35ba31044e74174906242aaeab1a8563900d23b0cee728d54eaace13f4086 WHIRLPOOL bbbe1c24ef058348ae52634f8bc796110c2a9b59f37ced615bb36a5b7679a84790419ea2ad0aa11c433f4f0cc41558bf37c6f18faec5b379ad252b227db79019
 DIST l2fprod-common-7.3.tar.bz2 475662 SHA256 d774fc617995b584a5d8a73a84f1f0feae45c54a462f8913a86c96846aafef0a SHA512 685dff4cd7a171fbc92d31c6ca25faa2feda2c5a10d5f646e8fa649f53c532d83bd97388518a2720a3b4b8b87c0fa54a63ced23aedbf500e19aa0f618b938a3a WHIRLPOOL c2dd0a4bbbc1b985b3627a1c9461ea5b0d004c5926c4b21e4aa7405299734c68e7fe774016093ad11ada4d832762a35b6a9f1f96ff09f6f782cc0929c826954a
-EBUILD l2fprod-common-7.3-r1.ebuild 1349 SHA256 5dfde382065e266cb7b6ce2c933e3f1fd56efd6a6991885303d6fd7120c2134e SHA512 7c18d9342f5b98cddc472aad80d8dc21a1a4515b37ab8341d9899f7399b36f47b2be1a95bcfbb7315fea3253f2f74ecf5daff5e47d8cb1b9f42e324484f47877 WHIRLPOOL 433afdf5ef65b0597580673b6e0e890cbe2e791f3082e986cf77a8993c04881deb8446c34e2592c913ed9be0170da08019edbac59808c9f517fc7ffff8c45da2
-MISC ChangeLog 1192 SHA256 ef8259a05da46b83d1786825ca32d34c7195e12780bee647b368326a44ed2140 SHA512 5ad4bc4524ee071d2648bc54c666c2964a48179dbd39c9e002f7315d4d57bc6ef4e970ed7ac217f6574189d11c33a79ad7f3d476023fc6d010e60040fd807614 WHIRLPOOL f84b035a60ddde7a9e69830750595e9a8227d2105ff26bbffa2e77d5130fe03e11c00deb3bb574fc728e1bbead92072044cfda4cbaafa91db6666fc7fe1c640b
+EBUILD l2fprod-common-7.3-r2.ebuild 1335 SHA256 6d62a2433adfaeef98834b25f24cc8a5c92de3538905ace294486a6a856737bc SHA512 dc5d10d34d991af1cdd688df1f6e3de147ebea3ad2d3ec28237fa1395447e8d9634ab3a2241c91093c48fd502b31d7d519a4dc63f2e7daeee2ec8a23ac7ac868 WHIRLPOOL e53ccfe65d025212b7ca3ecf31fe5d7ce9fd177ee53d0e7c115f253bfc9a25eef983ef580eaec93d85b51a9df8b9c4521ce6e15e6b4f2d61045ce78eb67fe0a6
+MISC ChangeLog 1369 SHA256 c99088ae4a7686cbe716dc89806f0b1fd0855f7efb19f7e21cbd92f3eee69a81 SHA512 8e712c87f9a6ed40624de8499bc586e6402a979d66a0266a2ca66dcf9ec4a5673c66c86a5b9b4c2bce94ce34c5514eed631c28b362d2eb94f9e539e49d329b56 WHIRLPOOL 045ab97514a307f17461deb6c06d784f23879b8f2dd68d6386a42cbdcf6debb4ba2dc45327ac3cfae859b49d3be6daf7b9b89f535f54b39047b8dba91d9d9bfa
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTG1HZAAoJEJWyH81tNOV9c3gH/AyOmQBcInsifKqGCu2uagtQ
++CeK2ZOVT/rCHgVh3A47+Spy1M3Au5kehEh194X1FPezxqARv5GtBa22k4UnTis4
+3iApclroi5MRIZWnSIhZ6iBQV45nKEBHBK9OwRJp6LREu7CSzLg4VE1uRArgTmI0
+gO2FeoDuTx2TSukXhdmk/mc3NTf+202INK4p6Iz0+dPVW0kJ967wCuCqf5r/m130
+f1PQ0/fR8FRcMmzMJJwh8OeUEprr4KFNICF4PR3i2zZ42WMOVxr3UL93ucoUlp7O
+wp2MfmhSZpoOec3figby9PdBAV64T8yMAFkYwKAyx5Sa3gOQdRvTLwSiEi1oizM=
+=LQVv
+-----END PGP SIGNATURE-----
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3-r1.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
index 243335f85b71..2a61799ca56d 100644
--- a/dev-java/l2fprod-common/l2fprod-common-7.3-r1.ebuild
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
@@ -1,33 +1,34 @@
-# Copyright 1999-2012 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/l2fprod-common/l2fprod-common-7.3-r1.ebuild,v 1.2 2012/04/13 18:48:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild,v 1.1 2014/03/08 17:23:06 tomwij Exp $
+
+EAPI="5"
 
-EAPI="1"
 WANT_ANT_TASKS="ant-trax"
+
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Java/Swing GUI components and libraries for building desktop applications"
 HOMEPAGE="http://common.l2fprod.com/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-COMMON_DEPEND="dev-java/nachocalendar
+COMMON_DEPEND="dev-java/nachocalendar:0
 	dev-java/jcalendar:1.2"
+
 DEPEND=">=virtual/jdk-1.4
-	dev-java/jreleaseinfo
+	dev-java/jreleaseinfo:0
 	${COMMON_DEPEND}"
+
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# do not build springrcp and sheet for now, would bloat the deps a lot
-	# potential USE flag material (spring, calendars deps)
+java_prepare() {
+	# Do not build springrcp and sheet for now, would bloat the deps a lot;
+	# potential USE flag material (spring, calendars deps).
 	epatch "${FILESDIR}/${PN}-6.9.1-nodeps.patch"
 
 	java-pkg_jar-from --build-only --into lib jreleaseinfo jreleaseinfo.jar jreleaseinfo-1.2.0.jar
@@ -35,12 +36,15 @@ src_unpack() {
 
 src_compile() {
 	eant init
+
 	java-ant_bsfix_one build/build4components.xml
 	java-ant_rewrite-classpath build/build4components.xml
+
 	eant -Dgentoo.classpath="$(java-pkg_getjar nachocalendar nachocalendar.jar):$(java-pkg_getjars jcalendar-1.2)" jar
 }
 
 src_install() {
 	java-pkg_dojar build/jars/*.jar
+
 	dodoc README.txt || die
 }
diff --git a/dev-java/skinlf/ChangeLog b/dev-java/skinlf/ChangeLog
index d8d2ac15a62f..e3b68a207c17 100644
--- a/dev-java/skinlf/ChangeLog
+++ b/dev-java/skinlf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/skinlf
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/ChangeLog,v 1.11 2012/12/30 16:53:57 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/ChangeLog,v 1.12 2014/03/08 17:23:12 tomwij Exp $
+
+*skinlf-6.7-r1 (08 Mar 2014)
+
+  08 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +skinlf-6.7-r1.ebuild,
+  -skinlf-6.7.ebuild:
+  Revision bump. EAPI 5.
 
   30 Dec 2012; Ulrich Müller <ulm@gentoo.org> skinlf-6.7.ebuild:
   Fix LICENSE, see LICENSE file, bug 447610.
@@ -51,4 +57,3 @@
   +files/skinlf-1.2.12-image-utils.patch, +metadata.xml,
   +skinlf-1.2.12.ebuild:
   Initial import of ebuild written by me
-
diff --git a/dev-java/skinlf/Manifest b/dev-java/skinlf/Manifest
index 14faacd8eee4..28f1864fc3fa 100644
--- a/dev-java/skinlf/Manifest
+++ b/dev-java/skinlf/Manifest
@@ -10,23 +10,17 @@ AUX skinlf-6.7-build.xml 10712 SHA256 85dd7092c1756b3e70e95c2c2fd36745b22634fa38
 AUX skinlf-6.7-common.xml 5452 SHA256 a6ea18e7187684e86797ca51f45c0224f44433184f0473afbb32b08cadc95732 SHA512 0703e8b463d62355aabba1705d7c05aeb8c700c3a494d3898c356f781172dd09e777d1357ddeb0225753b85242f2d15052733c73c5656f263875570a3c4d896d WHIRLPOOL 5fa41df4b12e66a0840074c50436c45dda822e2b88d9c794a3b9e81df5c4eb655586fa0132662b91c97d8292d45fb36a2b536af2ac1c29c3005d83801742738f
 AUX skinlf-6.7-image-utils-without-jimi.patch 2935 SHA256 9bf37bf2a74b04a1228cbae1741baf9ecd2df00530214e8848e73ce45c0567c0 SHA512 b05e63e4decb26e325c3a902d8f1391c0026c41114146462fa1cb87e9ff5431941a69615da96751689c8f3ff10fb31f277711b355778c621a7a3d38bfecba033 WHIRLPOOL 9b24f1e3b38d766a2ebd2d60920c96063cec968e9ca085fcda80fb95efcaab57a8faeb75a4bfb8e641410025489d6b8448ad958f99a0c17a545d9e18bb357154
 DIST skinlf-6.7-20060722.zip 827174 SHA256 3d31ffbe1fa1325049cb94e675971a2b8d89ae24558cb173e7e4e1f926dd7daa SHA512 e4df9c6a85b5bbdbd40af177595641a5ad55a5cb16e5a31217fb3f5badd25727e4b48fa78ba2374f4eb55224068807b5bd6df9fba7f2418b7b810b25cf2043b6 WHIRLPOOL f1ba8c9408fc77fd1d68a5c2b7834ed0f1c79dbaa3095e015f95464da0a852a892e3f40635b86dde14f6af314902f88be3e6218f313a9722d76037fa6a944bba
-EBUILD skinlf-6.7.ebuild 1491 SHA256 b1a47cdab22ac2f349aeca7ceef149eee73c13f2b71773a8e8136c26d4ce936f SHA512 c65d80de1b278d85f307f85c39285b6b9489a77c01be9159dfa1dd7ac8c12b6b08801a1d1c0a5787b5786f9582811cc49709686b45d0e78aab42115df7b041f3 WHIRLPOOL c382af2545c3a652c6ec6b52bf0485d04f7c69c64715a3d3b46f9a73924b86ecdd132fabf2daa5df2aafa1055ba900d0847921a7b69dd06a2fec321c428ab641
-MISC ChangeLog 1904 SHA256 a0a800f9f117544dc426b23e3e3f62de5ca232848ef83b0ffc6af0eea15fb2ac SHA512 f6c13346fb918f3534a356cf811c09e0f13fe4bba8ca3880f618e1f3004d495ca741e7df84f714d26e766bf74ca6dbf4478fe2f2ed4018fb60516b177101dda1 WHIRLPOOL d2558c247e518877694d4ff78f21bd5e10dd94d9960fb46c0a67e94295566fb06dddaca7c2cbdcf843e6c23866ca57965b3b69cb4950eb4d281da6d592724f90
+EBUILD skinlf-6.7-r1.ebuild 1496 SHA256 76ab868235e55169bf570b0a50fa86f63a1c4ae88b3358bbd07b4ab0ac4bfac9 SHA512 de6df03fd9b11572f0e86aca392c4f7a69b04e468d75eb2e3771bc5fcf14bce813ca36d146950adbfaa80343cfcc84ea1c2daa94bc61b0153c18a689cc330cfe WHIRLPOOL c6eeda54ff9430cf141e8ec81f76429fb8ac4c4677d0b8b0d0bd8b40bfba0be09826c70ce7cbf2b157002a531631184a5e6655b01456da106f800bc6357450c7
+MISC ChangeLog 2054 SHA256 e66aed332635181c535ac02d4fc59209244a076a13510d9402e4aee56dd34d88 SHA512 f437a794f1bb2b08bfcfc5c121009b5cc5e65bbd3b35751d595457784ae37f532da90d3a552ac31e3634f5581cf1ac43b0eb97005b931b368587419f5bf67f2b WHIRLPOOL feac50540b6c88253885626a61e25474c60cb57dac102b2ee06993c9e5a6d150ef0b925e1a88cec0ac791890caec1ecc73441b296de0273e2e19de9418141605
 MISC metadata.xml 296 SHA256 8e28ce8172f0873f2dbf2a82b1d0cf47873edab69aee8062eabe3818b91be0ce SHA512 f943692cc8a46793d7b58dd7cbd80626eba948d6c48e17a69913d1b03cb629f873d51aa6b9f56890234b16d342803550004e80175c3ed1aaa7d86223b0b97f29 WHIRLPOOL 57a26391b8850fafb077b5760ad9d66f9815abb09fbfbd9bb61eec1884ad9cfdbcd822f1f360f541c66bb357afbca84edd3b4d6c5ccd2bb693c567afaed210cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4HIyAAoJEDxpGckxwJCBtIcP/2E0HeHUecL55T1veUfv1hvN
-S/+aR4qoFCyBkwopKJiEyDVZfSdj+P7Zo077pW0T0lLEhlcwEPoCq3Uv9WHygori
-yu0B7KgSdH0GJGmAnEv2zD24e0n3ZvT2jwH4MTB9hOKvIHNdvLzlkFxBkyHP1n8t
-jB7HNxs+sQHpCCeraU/013PtizyY65lKZA+vxtxUMh6VOIwiDAcN/1MIJigIMS+P
-5HVX0t/otZdl1mMayo0ig6EirGXhDxPob0DI6fznqhwaJSWF3rti0CEL21GmP+k0
-GEkgsWhZ1hKjuSQoxc2dSvO5LFZmSLQkfUDNj2RRwuQeuItDcmdwsEWI/9ub4PJU
-qhzUpHphp3NAgs9OSFtAwszT/kaYJBH64Gd5BFBTiL0J8te1G68+FBbk+8Jz8L2M
-+qAdyDoFoKnBhOmANl1zPImCIOBLlkKt53O+es1tiVVNCXfFeC0PioMQtefTABAi
-UYE1NDJsnQCA1wFytiWhOQJN5AczoJiHnXZFF2GkE2sUrnlWxsUtuhdqUkW9NNLR
-hDez1UtJDY8hSTjb0T+Y/JLnsGCYo8kGkWKExkzVsw473i/59+JiU36Ct1myXZTg
-0q/PxJebl9k34IucGeSvvM5FsOBzRXnIOAAsrA4TqAPnS3J+t3AVoXATHqwHiiSJ
-Sw65P9TdyhMKKVPkFSRM
-=2mA7
+iQEcBAEBCAAGBQJTG1HfAAoJEJWyH81tNOV9p5IH/jxMTaEjb2B0VTtaEC1VB1VS
+eKzBhX+YeSGfdoIpHZwUVr7GxyiX+n4cgSvzVb53HJMUJt+kyR+dOWdfOSoEI28T
+M7d6o/SIkhi9gQ9RcnpVs/vEr9mCwPCKgMp5VNaHdXaWuU3T3/mCDtS8G19ehZS9
+jtaMFg00m+trdQHxmsERQ8rsjWL/4pjLsIVKxhiwrv5NiE63IuJQOlAOmThCJka7
+80qnptuXEroM1Q1sc2K3dNuFew7RhggGaNKWAk5xQBP8Vv0ZrR0eHZTkxwNLB42j
+KpmsEqRA2S8AEwjUXlvDuxjDmexIliSpUVgbmfMImtYFzeGJ1NlxAOTN2RQ3iDI=
+=Pzzl
 -----END PGP SIGNATURE-----
diff --git a/dev-java/skinlf/skinlf-6.7.ebuild b/dev-java/skinlf/skinlf-6.7-r1.ebuild
index 527b5856fc6d..167e4a6ba45a 100644
--- a/dev-java/skinlf/skinlf-6.7.ebuild
+++ b/dev-java/skinlf/skinlf-6.7-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2012 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/skinlf/skinlf-6.7.ebuild,v 1.4 2012/12/30 16:53:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/skinlf/skinlf-6.7-r1.ebuild,v 1.1 2014/03/08 17:23:12 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 
 JAVA_PKG_IUSE="examples source"
 WANT_ANT_TASKS="ant-nodeps"
+
 inherit eutils java-pkg-2 java-ant-2
 
 MY_P="${P}-20060722"
@@ -17,35 +18,35 @@ SRC_URI="https://${PN}.dev.java.net/files/documents/66/37801/${MY_P}.zip"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 CDEPEND="dev-java/laf-plugin:0
-	dev-java/xalan"
+	dev-java/xalan:0"
+
 RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
+
 DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
+	app-arch/unzip:0
 	${CDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+java_prepare() {
 	epatch "${FILESDIR}/${P}-image-utils-without-jimi.patch"
 
-	cp "${FILESDIR}/${P}-build.xml" build.xml
-	cp "${FILESDIR}/${P}-common.xml" common.xml
+	cp "${FILESDIR}/${P}-build.xml" build.xml || die
+	cp "${FILESDIR}/${P}-common.xml" common.xml || die
+
+	cd lib || die
 
-	cd lib
 	# assert_built_jar_equals is your friend, upstream your enemy
 	unzip ${PN}.jar '*.gif' '*.template' -d ../src || die
-	rm -v *.jar
+	rm -v *.jar || die
 
 	java-pkg_jar-from xalan,laf-plugin
 }
 
 src_install() {
 	java-pkg_dojar build/${PN}.jar
+
 	# laf-plugin.jar is referenced in manifest's Class-Path
 	# doesn't work without it due to class loader trickery
 	# upstream solved this by absorbing laf-plugin in own jar...
@@ -54,5 +55,5 @@ src_install() {
 	use examples && java-pkg_doexamples src/examples
 	use source && java-pkg_dosrc src/com src/*.java
 
-	dodoc CHANGES README || die
+	dodoc CHANGES README
 }