Version bump. Rename 2008.04.28 version to allow upgrade. Remove old.

(Portage version: 2.2_rc33/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 31 insertions, 37 deletions

diff --git a/media-sound/jtagger/ChangeLog b/media-sound/jtagger/ChangeLog
index 02e22ffaaa83..9d83a368256f 100644
--- a/media-sound/jtagger/ChangeLog
+++ b/media-sound/jtagger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/jtagger
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/ChangeLog,v 1.12 2008/07/18 08:00:42 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/ChangeLog,v 1.13 2009/05/16 23:06:11 serkan Exp $
+
+*jtagger-1.0 (16 May 2009)
+*jtagger-1.0_pre20080428 (16 May 2009)
+
+  16 May 2009; Serkan Kaba <serkan@gentoo.org>
+  +jtagger-1.0_pre20080428.ebuild, +jtagger-1.0.ebuild,
+  -jtagger-2008.01.ebuild, -jtagger-2008.04.28.ebuild:
+  Version bump. Rename 2008.04.28 version to allow upgrade. Remove old.
 
   18 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
   jtagger-2008.04.28.ebuild:
diff --git a/media-sound/jtagger/jtagger-2008.01.ebuild b/media-sound/jtagger/jtagger-1.0.ebuild
index 10aa898b043a..224be00aeea0 100644
--- a/media-sound/jtagger/jtagger-2008.01.ebuild
+++ b/media-sound/jtagger/jtagger-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-2008.01.ebuild,v 1.4 2008/06/10 16:49:46 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-1.0.ebuild,v 1.1 2009/05/16 23:06:11 serkan Exp $
 
-EAPI="1"
+EAPI="2"
 
 JAVA_PKG_IUSE="source test"
 
@@ -10,39 +10,35 @@ inherit eutils java-pkg-2
 
 DESCRIPTION="Powerful MP3 tag and filename editor"
 HOMEPAGE="http://dronten.googlepages.com/jtagger"
-SRC_URI="http://dronten.googlepages.com/${P}.jar.zip"
+SRC_URI="http://dronten.googlepages.com/${PN}.zip -> ${P}.zip"
 
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 SLOT="0"
 
 COMMON_DEP="
 	dev-java/jlayer
-	dev-java/jid3"
+	>=dev-java/jid3-0.46-r1"
 RDEPEND=">=virtual/jre-1.5
-	dev-java/jgoodies-looks:2.0
 	${COMMON_DEP}"
 
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.5
-	app-arch/unzip
-	test? ( dev-java/junit:0 )"
+	app-arch/unzip"
 
 src_unpack() {
 	mkdir -p "${S}/src" || die
 	cd "${S}/src" || die
 
 	unpack ${A}
-	unzip -q ${P}.jar || die
+	unzip -q ${PN}.jar || die
 
-	rm -vr ${P}.jar com/jgoodies javazoom  org META-INF || die
-	find . -name '*.class' -delete || die
+	# Fix for bug #231571 comment #2. This removes real @Override annotations but safer.
+	sed -i -e "s/@Override//g" $(find . -name "*.java") || die "failed fixing for Java 5."
 
-	# Move the tests away
-	mkdir -p ../test/com/googlepages/dronten/jtagger || die
-	mv com/googlepages/dronten/jtagger/test \
-		../test/com/googlepages/dronten/jtagger/test || die
+	rm -vr ${PN}.jar javazoom  org META-INF || die
+	find . -name '*.class' -delete || die
 }
 
 src_compile() {
@@ -57,23 +53,8 @@ src_compile() {
 	jar cmf myManifest ${PN}.jar @classes.list || die "jar failed"
 }
 
-src_test() {
-	cd "${S}/test"
-
-	local cp=".:${S}/src/${PN}.jar:$(java-pkg_getjars jid3,jlayer)"
-	cp="${cp}:$(java-pkg_getjars --build-only junit)"
-
-	find . -name '*.java' > sources.list
-	ejavac -cp "${cp}" @sources.list
-	ejunit -cp "${cp}" \
-		com.googlepages.dronten.jtagger.test.TestRenameAlbum \
-		com.googlepages.dronten.jtagger.test.TestRenameFile \
-		com.googlepages.dronten.jtagger.test.TestRenameTitle
-}
-
 src_install() {
 	java-pkg_dojar src/${PN}.jar
-	java-pkg_register-dependency jgoodies-looks-2.0
 	java-pkg_dolauncher jtagger --main com.googlepages.dronten.jtagger.JTagger
 
 	use source && java-pkg_dosrc src/com
diff --git a/media-sound/jtagger/jtagger-2008.04.28.ebuild b/media-sound/jtagger/jtagger-1.0_pre20080428.ebuild
index 1c7b2f84efd7..bd174cbcb1a9 100644
--- a/media-sound/jtagger/jtagger-2008.04.28.ebuild
+++ b/media-sound/jtagger/jtagger-1.0_pre20080428.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-2008.04.28.ebuild,v 1.6 2008/07/18 08:00:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jtagger/jtagger-1.0_pre20080428.ebuild,v 1.1 2009/05/16 23:06:11 serkan Exp $
 
 EAPI="1"
 
@@ -8,9 +8,12 @@ JAVA_PKG_IUSE="source test"
 
 inherit eutils java-pkg-2
 
+MY_PV="2008.04.28"
+MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="Powerful MP3 tag and filename editor"
 HOMEPAGE="http://dronten.googlepages.com/jtagger"
-SRC_URI="http://dronten.googlepages.com/${P}.zip"
+SRC_URI="http://dronten.googlepages.com/${MY_P}.zip"
 
 LICENSE="GPL-3"
 KEYWORDS="amd64 x86"
@@ -28,6 +31,8 @@ DEPEND="${COMMON_DEP}
 	app-arch/unzip
 	test? ( dev-java/junit:0 )"
 
+S="${WORKDIR}/${MY_P}"
+
 src_unpack() {
 	mkdir -p "${S}/src" || die
 	cd "${S}/src" || die