Shortened DESCRIPTION. Revision bump: EAPI 5, changed src_prepare to java_prepare.

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

3 files changed, 29 insertions, 17 deletions

diff --git a/dev-java/metadata-extractor/ChangeLog b/dev-java/metadata-extractor/ChangeLog
index b59085d4dcf7..9a253e464a3e 100644
--- a/dev-java/metadata-extractor/ChangeLog
+++ b/dev-java/metadata-extractor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/metadata-extractor
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/ChangeLog,v 1.14 2009/11/17 16:59:45 caster Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/ChangeLog,v 1.15 2014/01/02 15:22:51 tomwij Exp $
+
+*metadata-extractor-2.2.2-r4 (02 Jan 2014)
+
+  02 Jan 2014; Tom Wijsman <TomWij@gentoo.org>
+  +metadata-extractor-2.2.2-r4.ebuild, -metadata-extractor-2.2.2-r3.ebuild,
+  metadata-extractor-2.2.2-r2.ebuild:
+  Shortened DESCRIPTION. Revision bump: EAPI 5, changed src_prepare to
+  java_prepare.
 
   17 Nov 2009; Vlastimil Babka <caster@gentoo.org>
   metadata-extractor-2.2.2-r2.ebuild:
@@ -66,4 +74,3 @@
   30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
   +metadata-extractor-2.2.2.ebuild:
   initial import, dependency of gallery-remote
-
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
index fa60ce4c4079..5fd4c60e899e 100644
--- a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
+++ b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild
@@ -1,10 +1,10 @@
-# 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-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild,v 1.5 2009/11/17 16:59:45 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/metadata-extractor-2.2.2-r2.ebuild,v 1.6 2014/01/02 15:22:51 tomwij Exp $
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A general metadata extraction framework. Support currently exists for Exif and Iptc metadata segments. Extraction of these segments is provided for Jpeg files"
+DESCRIPTION="Metadata extraction framework for Exif and IPTC metadata segments, extraction support for JPEG files"
 HOMEPAGE="http://www.drewnoakes.com/code/exif/"
 SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar"
 LICENSE="GPL-2"
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r3.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild
index 2a13a3e12c9d..7ddb70590faf 100644
--- a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r3.ebuild
+++ b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild
@@ -1,28 +1,32 @@
-# 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-java/metadata-extractor/metadata-extractor-2.2.2-r3.ebuild,v 1.1 2009/01/31 13:46:36 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild,v 1.1 2014/01/02 15:22:51 tomwij Exp $
+
+EAPI="5"
 
-EAPI=1
 inherit java-pkg-2 java-ant-2 eutils
 
-DESCRIPTION="A general metadata extraction framework. Support currently exists for Exif and Iptc metadata segments. Extraction of these segments is provided for Jpeg files"
+DESCRIPTION="Metadata extraction framework for Exif and IPTC metadata segments, extraction support for JPEG files"
 HOMEPAGE="http://www.drewnoakes.com/code/exif/"
 SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+
 IUSE="test"
 
 DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
 	test? ( dev-java/junit:0 )
-	app-arch/unzip"
+	app-arch/unzip:0"
+
 RDEPEND=">=virtual/jre-1.4"
-S=${WORKDIR}/
+S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
+java_prepare() {
 	epatch "${FILESDIR}"/${P}-buildfix.patch
-	mv metadata-extractor.build build.xml
+
+	mv metadata-extractor.build build.xml || die
 
 	use test && java-pkg_jar-from --build-only --into lib/ junit junit.jar
 }
@@ -31,8 +35,9 @@ EANT_DOC_TARGET=""
 EANT_BUILD_TARGET="dist-binaries"
 
 src_install() {
-	dodoc ReleaseNotes.txt || die "dodoc failed"
-	java-pkg_newjar dist/*.jar "${PN}.jar"
+	java-pkg_newjar dist/*.jar ${PN}.jar
+
+	dodoc ReleaseNotes.txt
 }
 
 src_test() {