EAPI 1 -> 5. Make use of java_prepare.

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

7 files changed, 47 insertions, 39 deletions

diff --git a/dev-db/apgdiff/ChangeLog b/dev-db/apgdiff/ChangeLog
index e3b0d4c722df..4228fb8bb671 100644
--- a/dev-db/apgdiff/ChangeLog
+++ b/dev-db/apgdiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/apgdiff
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/ChangeLog,v 1.14 2012/09/21 17:43:00 fordfrog Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/ChangeLog,v 1.15 2014/05/14 16:46:47 tomwij Exp $
+
+  14 May 2014; Tom Wijsman <TomWij@gentoo.org> apgdiff-1.4.ebuild,
+  apgdiff-2.2.1.ebuild, apgdiff-2.2.2.ebuild, apgdiff-2.3.ebuild,
+  apgdiff-2.4.ebuild:
+  EAPI 1 -> 5. Make use of java_prepare.
 
 *apgdiff-2.4 (21 Sep 2012)
 
@@ -77,4 +82,3 @@
   22 Oct 2008; Miroslav Šulc <fordfrog@gentoo.org> +metadata.xml,
   +apgdiff-1.3.ebuild:
   New ebuild (moved from java-overlay)
-
diff --git a/dev-db/apgdiff/Manifest b/dev-db/apgdiff/Manifest
index c098a16ea8c8..3ec44bc4d168 100644
--- a/dev-db/apgdiff/Manifest
+++ b/dev-db/apgdiff/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST apgdiff-1.4-src.zip 178608 SHA256 aa341a627e2087eb9fb66c1bc0a785e5e9953459395b60e1b447ed30947f52f9 SHA512 c1dcd3f39e931f90e65a439a610d5b264b790419a59b2c90f6d9107c1b5151c602887588f378110a2e9420428414fc333c7919e2137e2dc35168654ceb3ae8d0 WHIRLPOOL 2e05303fef00b999aa07dce0b59df7d805b486cced61ac50a40c3b8aefcdd37aec649feb4f5fc96111d388029198def0aada0d33c6421e672a652d19b55f94a1
 DIST apgdiff-2.2.1-src.zip 194305 SHA256 844c92499f80b52d290fa89edf19c955e056eb6d92ee7fb3ad01acfcc04b4d04 SHA512 cab6b2349d5822ca579c1e021ea7f02f5ddf39d56559f841d0cadfdccc1c1c61399c494302ea5909984b9a8a6d91cf08868f012dd3487a8633f65e3bbd28f19c WHIRLPOOL 364f78e22c136e10acd3337db7d7b85ef16e33042d7d6fae990824fda583d94189ebd737c6268fb1264f7b9d2fa11c3c4852fd8fab89cfbca6cd42c7bfb97397
 DIST apgdiff-2.2.2-src.zip 198814 SHA256 cd4c4a5315fdf311e3dd18c1368a50fead91bb17198e984b0d4ace15755a55ae SHA512 273ba473b5b4ccfe2ae1b3f34ce2c2b825e446fad166f28a4575528190c20922e6794563ae3e5b2918ade5a3292a792ea363e9e5ec0900e924332d8771548c0b WHIRLPOOL ee6af8b7444676e4eb887f716dee3514f9d5a5d54bf0efa859c20c817424a5dbcf4059dc6641c1fa19c53441c25e002e812d5eea13d3c4aecce6fee76a46dd9e
 DIST apgdiff-2.3-src.zip 215881 SHA256 bbae469988ca321b76a4d2d8717477261c823ac9608282998cec28ed8933c8b2 SHA512 e716143ff4378fc27c4781076c51826583c2ad9dab17f4364acbfed0f9a0958dca0de9a72171816bbce41653ad33834158cb9277dd8790649da4bd24e013bbb5 WHIRLPOOL e404000074fee973b49ace8f6223072eb4aca95283d9a3ffd9b4dec1f242de263546e0894b8242828368926a45ba3ac5388b59cb4be73a1b0421a9e1703f2685
 DIST apgdiff-2.4-src.zip 227714 SHA256 8551a3e10c7aae3a04efc5dad655575484b63a3323f07db5e81c50b42d88129c SHA512 f37e0f86ff8a8bc53a43cac1748ab3a2c96ab6c972b37ee63f281ee397b31a7b48986cbc963d89ea773f1bb7b10b798de74a4c88a03f2db7672501b93355261b WHIRLPOOL 61a8a605508564188f16fc306abd710e3895079a53a2f311e3cbb8b1943146f7f4039b31f5f5653b1ea30447a2e35328201d7aec7b91952483c1a5a18704d3b7
-EBUILD apgdiff-1.4.ebuild 1239 SHA256 911d161e683646822785891f0d0ae3d5821c3be4674ea8f95ebf0c665fcf4ddc SHA512 bf5ad610c9f0c789ac976e353d74817eb10dd62748343fba774ace9ea40cdfb5c3b060ca7e0f8ae049eb193365208b68f0ce56acd5c6b5e82ce723a22924a4bc WHIRLPOOL 5782c36960a555081b9ed8f5104da2129e3b17041b2d90fe5269d68c6ab509c6fea2d5dc63656e22a43ddf189fc2a2780c5b2767b75eb963069236054b5796be
-EBUILD apgdiff-2.2.1.ebuild 1238 SHA256 6f0c76ceb900019cfd0768f34281a8101081b8eb28f96dfd0826ca1d20f1804e SHA512 90c60a7ca6098a6fb9967307d06d33d1a81239931519ee548f1d75e1377bb45dee626c58f855b2cb8dc755452ebc8aaac25c97e21cd5f32f1e839697a6d0a390 WHIRLPOOL 65951d93635902710c882a0da02511bfd0c69b0566a1b1cf0db1512da641bbb8af7657a7ca338b53f56638de269e58ebce05a7413cb4211bc21ef52b0953eb47
-EBUILD apgdiff-2.2.2.ebuild 1238 SHA256 076a6778d806148633eedf6dfd8e732d42164e68d674d3c24461283fbb90877e SHA512 d581790e67effd711310c8e4635ce913fa65873677100836b93fc0b2c6c620e70d865655c96a611be675a820b80c5106aa683649206ec77bb7986862ab7e6cb7 WHIRLPOOL e809115cd0b1ee6fffa57c3d3e0d146a7104fc29bdd33b5ef2f684b5bac72582f0fa956a108a027bc128076b76140b0f9d364eb671546f4ef3301376ee8c2c00
-EBUILD apgdiff-2.3.ebuild 1246 SHA256 ecb20c2413b66950af4aff17ea6f55e090f2f5e4770bcdf37717cfe591b95b26 SHA512 6d831fc3024a6a4d33d2c59a27dc17af642eeb9b4c72d0c9f1e15a96144408b708de2807c45066f37dccf9dbba2e9e4091e52b052d912148301c764b3b82b8e4 WHIRLPOOL 6c4b6becb86a0bcbdd50fed25ac5159f1ecfd3a4e2272fb857fce4800e9c0837b1589b6c0526a6d3fda67ce7836cb80937c81970afe4e91782731e61c1a8afa9
-EBUILD apgdiff-2.4.ebuild 1246 SHA256 021d98b842886bcb744f286bc2eb9bc157ce8e61787e2def123860b23e7e3393 SHA512 2d58ed145699b78f9809dfb3397fa120dd53238711b8ca6e3fe09ec2980eea05f41fff72d3fb5218aa0559b5226ff634b0c919bce5648efa3e31150de8a1be2d WHIRLPOOL 79f4794c9bb38d85ef9ea93892ef3a7be4ccbd3d7de77c6d0fe7715771949a16dbf70c4ff24194290fb32b2801bd52951cb6cb3066190c0abc45d12c561410ea
-MISC ChangeLog 2170 SHA256 5d68cfa9e7856bee9ebb4794037d32bd2e210ba6b5897150df94f3a52a571e54 SHA512 1954882bbc498e5db081150d265866c2e1f8f878f3579ae8f31f51d51c516b9bcc1ffd4a89db8be47b381d231eeeed5b232a5fa36a1fbb35528ebbdc6bec0a8c WHIRLPOOL 9c4c7af6bbb8674d799bd3367f270fdf50a70868a9d43b996513b59aad66f3b63b4303d3e4f9a16079780f67bcce64e8dbe22c2ff8d467a082adee6fd8be39b4
+EBUILD apgdiff-1.4.ebuild 1225 SHA256 d9f92338346247ed3168437cd1e7c951332dc0951f85ee8da2c52def5152319e SHA512 2f69508d123ba966a1c8ff1e431e8f48e687d20da7230b395200176b37aeabab1dcaf9bee05397b549689a9196207c624424a8da42bdc87cfef2cfb3c005244b WHIRLPOOL c43158608dd9536abc11af461409a7918f0b8b2c531cf5f9c4aaff1c00e075696b4af846e91d743b5faf1d44411b7e627e421269b6e8a8d3daff174f50534c02
+EBUILD apgdiff-2.2.1.ebuild 1224 SHA256 384e3ae2eb637d3c24c895863715180b169a505365c4bd0ae4cd70ad2e148a34 SHA512 c9dbca817e7c0238102cdadbe077f846838e41012e5477eacdf4e22cb67fc045c8c59a14854de3b3589e079f9fa21d9b82539692b11081a92cc2c8d09a0a23c1 WHIRLPOOL 3cbb011927a5b285a352a089bd2bb293a3fd4ad6e40c78bd7a0bbc0ac563865915ed5b1b0fc0a1ce861152958b7402526697df62b402bef30550ef26fc8ad05a
+EBUILD apgdiff-2.2.2.ebuild 1224 SHA256 35af36432f67b0260c7525ef6e969335bf16ec323df51e35d5d31740fcb69326 SHA512 e0acc5b18b15a7796a3c180705dedda07792ba8487e6742ee534064e27fb27cf22009033d5bb7ee3e30a141e77730e2e74c5a4aaebe94e9fde4538b13a5258c6 WHIRLPOOL 1000934061071e1ff564f05a5b9bd95c266bec092e5e2811d81cfe096f0d134901126167a1a129b22671038c072a11f2e15bb5687b88b4621707966d76958fed
+EBUILD apgdiff-2.3.ebuild 1232 SHA256 56f1f6b769285e146d8dc796e20f5fe448a5a5382088e6f5f883227e03f293a8 SHA512 efc61a811540bf7523ede450202e758d603891fd52a55cf5e004ed75715e8f8972921de47797c76ebec892dc33b39d96d053e436e36243d83ac8fcc64c88f076 WHIRLPOOL a3c1c5a46197b64921cb9beadefc9cbd52fe38fcf8b8e16b438135a87f6c2ef4f40ced66be347a7c2bfe15190c9b5f572985654e18c9932d94a61cd567dce17c
+EBUILD apgdiff-2.4.ebuild 1232 SHA256 3f05bdfaf895b6ee8bf9e916fed855b2d67572f2ed4899f9ed0cfa5d6e0f69c3 SHA512 7932d2f7e1ab62c670b42463f168cb407c740a896051f97a0774f767d8425790ffb22be6d8ce6d6ce6cfcbc405ff14381d1d0f2bee98afb2e799b2a9253ba568 WHIRLPOOL 7a1096091e55ff54e408a06b3c6f6d261851b381ad6de56375688077cc3c8269f235ac00007e8e6375602a127e6c3a696617d42b3983cfacc2293c7062eb4023
+MISC ChangeLog 2364 SHA256 f4696b8578d6e0b72ceba3e2687ee89ca81001683cab7b4fbb332b0646e5934e SHA512 b656087d1049032a9ca91b4c57b860ee883719395e1e71887f9cd1c466cecbdcdedde1b24b39c269e576514fdb71468c9b9bd7341296cca67c91234c4ee2cf35 WHIRLPOOL 69b536a391d44ca7911e6db69c39f04fa2223238f34dabbdfb82e79b4997219df5127d46c425b6b59671c5ce5dec9dc06771d3b25bb040fea2c9addebc992423
 MISC metadata.xml 217 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 SHA512 c831b55f48fe5072b2af6e2e4731462838edc100a568248719a12de95fe7716198d12e159aa3025294040c26841607e04ccc87451be220e667fdc1146f4656f8 WHIRLPOOL 0d6782469b5a96acc07542adcdc15ac99674231aa8f6384bad12fd50cfd7994afeebef4cae6269599588193aa8bbcbd9d986579baa5a33581d89edad6de8634c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTc53vAAoJEJWyH81tNOV9P7wH/R9mA8zg85MAHQlwyhABnygC
+3gKqqNNf53a6OikxBKzlWJEuk+zaVDBU0e+oYgUJymyY6uVhe+nzfdABpbm+jh2P
+PLdhFprC5iquca+K1jVW0SxMVQbc2OpzaDUJgQX5iEt34Z2EFw3/KCY6RbAipvkv
+5XNuMXByPJeF58Uupts43/ku69cH9YapvmDKl6fD0DnSBMoKG0RsnkTZmeAkDVOK
+Bfc2d2CycsVWMSPTI5YLpEjHaHtWNgKnaxte3TWXeokjDAUt/KSGL8NlCNkIDd/0
+bw7sVMdXzndT6FGtMvAJzc1y5lmiQt3WLhScvlzn7UXeqvA+4kCiTdM7UX3pm9c=
+=6lDg
+-----END PGP SIGNATURE-----
diff --git a/dev-db/apgdiff/apgdiff-1.4.ebuild b/dev-db/apgdiff/apgdiff-1.4.ebuild
index eae6bd1146ec..1beed7f86f91 100644
--- a/dev-db/apgdiff/apgdiff-1.4.ebuild
+++ b/dev-db/apgdiff/apgdiff-1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-1.4.ebuild,v 1.1 2009/11/22 09:50:38 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-1.4.ebuild,v 1.2 2014/05/14 16:46:47 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-ant-2
 
@@ -25,9 +25,7 @@ DEPEND=">=virtual/jdk-1.5
 
 RDEPEND=">=virtual/jre-1.5"
 
-src_unpack() {
-	unpack ${A}
-
+java_prepare() {
 	mkdir "${S}"/lib
 	cd "${S}"/lib
 	if use test ; then
diff --git a/dev-db/apgdiff/apgdiff-2.2.1.ebuild b/dev-db/apgdiff/apgdiff-2.2.1.ebuild
index 88791bb96f93..35e2a59f5e2a 100644
--- a/dev-db/apgdiff/apgdiff-2.2.1.ebuild
+++ b/dev-db/apgdiff/apgdiff-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-2.2.1.ebuild,v 1.1 2010/10/03 15:47:17 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-2.2.1.ebuild,v 1.2 2014/05/14 16:46:47 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-ant-2
 
@@ -25,9 +25,7 @@ DEPEND=">=virtual/jdk-1.6
 
 RDEPEND=">=virtual/jre-1.6"
 
-src_unpack() {
-	unpack ${A}
-
+java_prepare() {
 	mkdir "${S}"/lib
 	cd "${S}"/lib
 	if use test ; then
diff --git a/dev-db/apgdiff/apgdiff-2.2.2.ebuild b/dev-db/apgdiff/apgdiff-2.2.2.ebuild
index 252861d9e738..e4679e654903 100644
--- a/dev-db/apgdiff/apgdiff-2.2.2.ebuild
+++ b/dev-db/apgdiff/apgdiff-2.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-2.2.2.ebuild,v 1.1 2010/10/09 00:41:47 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-2.2.2.ebuild,v 1.2 2014/05/14 16:46:47 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-ant-2
 
@@ -25,9 +25,7 @@ DEPEND=">=virtual/jdk-1.6
 
 RDEPEND=">=virtual/jre-1.6"
 
-src_unpack() {
-	unpack ${A}
-
+java_prepare() {
 	mkdir "${S}"/lib
 	cd "${S}"/lib
 	if use test ; then
diff --git a/dev-db/apgdiff/apgdiff-2.3.ebuild b/dev-db/apgdiff/apgdiff-2.3.ebuild
index e7db1a73e310..0c5660b70db4 100644
--- a/dev-db/apgdiff/apgdiff-2.3.ebuild
+++ b/dev-db/apgdiff/apgdiff-2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-2.3.ebuild,v 1.1 2010/10/22 18:27:24 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-2.3.ebuild,v 1.2 2014/05/14 16:46:47 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-ant-2
 
@@ -25,9 +25,7 @@ DEPEND=">=virtual/jdk-1.6
 
 RDEPEND=">=virtual/jre-1.6"
 
-src_unpack() {
-	unpack ${A}
-
+java_prepare() {
 	mkdir "${S}"/lib
 	cd "${S}"/lib
 	if use test ; then
diff --git a/dev-db/apgdiff/apgdiff-2.4.ebuild b/dev-db/apgdiff/apgdiff-2.4.ebuild
index 2bdc153eb115..9196dc50929e 100644
--- a/dev-db/apgdiff/apgdiff-2.4.ebuild
+++ b/dev-db/apgdiff/apgdiff-2.4.ebuild
@@ -1,8 +1,8 @@
-# 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-db/apgdiff/apgdiff-2.4.ebuild,v 1.1 2012/09/21 17:43:00 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/apgdiff/apgdiff-2.4.ebuild,v 1.2 2014/05/14 16:46:47 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-ant-2
 
@@ -25,9 +25,7 @@ DEPEND=">=virtual/jdk-1.6
 
 RDEPEND=">=virtual/jre-1.6"
 
-src_unpack() {
-	unpack ${A}
-
+java_prepare() {
 	mkdir "${S}"/lib
 	cd "${S}"/lib
 	if use test ; then