EAPI 1 -> 5. Make use of java_prepare.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

6 files changed, 27 insertions, 33 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/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