entagged-tageditor version bump

svn path=/java-overlay/; revision=6126

5 files changed, 96 insertions, 3 deletions

diff --git a/media-sound/entagged-tageditor/Manifest b/media-sound/entagged-tageditor/Manifest
index 7d6f1850..e12fba2a 100644
--- a/media-sound/entagged-tageditor/Manifest
+++ b/media-sound/entagged-tageditor/Manifest
@@ -1,3 +1,6 @@
-AUX buildfixes.patch 1861 RMD160 cc743712e5052594c64b656c04a092102b189150 SHA1 7d411521e9de7aa10f27f01588c89ff311d2853c SHA256 4c4d626358b66652ccec4a25981c301958bdb80dc7e8fcd6ee2ad6cefcb3f8f3
+AUX entagged-tageditor-0.31-buildfixes.patch 1861 RMD160 cc743712e5052594c64b656c04a092102b189150 SHA1 7d411521e9de7aa10f27f01588c89ff311d2853c SHA256 4c4d626358b66652ccec4a25981c301958bdb80dc7e8fcd6ee2ad6cefcb3f8f3
+AUX entagged-tageditor-0.35-buildfixes.patch 1861 RMD160 6e683095f469f1c4c6e71b621730596c9e0e2929 SHA1 5b6e50014fc71dc1f6966ad888a7836878963826 SHA256 54e2bbbe1b735a25af09d1da2f990b1b147086a38f3c7a225238b516256c902a
 DIST entagged-tageditor-0.31.tar.gz 4612526 RMD160 b0baf1545ff2d4e4ce3e5824b4e4cb2293a5537c SHA1 d485899114208ce6ce0752fb346b347fd7f4a3cf SHA256 faa2f9d485e7abd2f6eb047cd8aba980de12c089b04ac32495356285c49c60e7
-EBUILD entagged-tageditor-0.31.ebuild 1590 RMD160 a8f0da3b074c1c924995b5925e12ac16ffd71453 SHA1 94db0b3dec3003d9f840e11e87d25a0dd48addf0 SHA256 be050711fd09121c03cf8648ddde9f3aeab3c3c00929a2a91a81e6353b0b78d2
+DIST entagged-tageditor-0.35.tar.gz 4606721 RMD160 24dbf8631a128a3ffd1eccaecdc6fe5d148bd281 SHA1 0ed0437bc938f2060d0793723f3ec22b7ee4d0df SHA256 c9e9b69a49bdf6646cc21dc3cc0734e6c54ac91e99774b1d87a6765b365611ac
+EBUILD entagged-tageditor-0.31.ebuild 1615 RMD160 9ea8931f43c87b627c6fca8baffae321872f5e91 SHA1 c13c89a51dbff2d27acdebf172373af13af252d8 SHA256 8cb76b3a52555083c7e84a2b8f331c15658b7b536230c78564514b7ab4052342
+EBUILD entagged-tageditor-0.35.ebuild 1615 RMD160 9ea8931f43c87b627c6fca8baffae321872f5e91 SHA1 c13c89a51dbff2d27acdebf172373af13af252d8 SHA256 8cb76b3a52555083c7e84a2b8f331c15658b7b536230c78564514b7ab4052342
diff --git a/media-sound/entagged-tageditor/entagged-tageditor-0.31.ebuild b/media-sound/entagged-tageditor/entagged-tageditor-0.31.ebuild
index 0916a798..444203f5 100644
--- a/media-sound/entagged-tageditor/entagged-tageditor-0.31.ebuild
+++ b/media-sound/entagged-tageditor/entagged-tageditor-0.31.ebuild
@@ -29,11 +29,12 @@ src_unpack() {
 	mv entagged/entagged/junit test/entagged || die
 	rm entagged/*.jar || die
 	java-pkg_jarfrom hsqldb hsqldb.jar entagged/hsqldb.jar
+	cd entagged || die
+	epatch "${FILESDIR}"/${P}-buildfixes.patch
 }
 
 src_compile() {
 	cd "${S}/entagged" || die
-	epatch "${FILESDIR}"/buildfixes.patch
 	cd "${S}" || die
 	eant -f entagged/build.xml build
 }
diff --git a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
new file mode 100644
index 00000000..0916a798
--- /dev/null
+++ b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+JAVA_PKG_IUSE="test"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Open-source audiofile tagger"
+HOMEPAGE="http://entagged.sourceforge.net/"
+SRC_URI="mirror://sourceforge/entagged/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-1.5
+	dev-java/squareness-jlf
+	dev-db/hsqldb"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-db/hsqldb
+	test? ( dev-java/junit )"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p test/entagged/junit || die
+	mv entagged/entagged/junit test/entagged || die
+	rm entagged/*.jar || die
+	java-pkg_jarfrom hsqldb hsqldb.jar entagged/hsqldb.jar
+}
+
+src_compile() {
+	cd "${S}/entagged" || die
+	epatch "${FILESDIR}"/buildfixes.patch
+	cd "${S}" || die
+	eant -f entagged/build.xml build
+}
+
+src_install() {
+	cd entagged || die
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	java-pkg_register-dependency squareness-jlf
+	java-pkg_dolauncher ${PN} --main entagged.tageditor.TagEditorFrameSplash
+	newicon entagged/tageditor/resources/icons/entagged-icon.png ${PN}.png
+	make_desktop_entry ${PN} "Entagged Tag Editor" ${PN}.png
+}
+
+src_test() {
+	cd "${S}/test" || die
+	sed -i -e "s:/home/kikidonk/java/dev-mus:${T}:g" entagged/junit/resource/config.properties
+	local cp=".:../entagged/${P}.jar:$(java-pkg_getjar hsqldb hsqldb.jar)"
+	cp="${cp}:$(java-pkg_getjars --build-only junit)"
+	find . -name '*.java'  -print > sources.list
+	ejavac -cp ${cp} @sources.list
+	ejunit -cp ${cp} entagged.junit.WholeApplication
+}
diff --git a/media-sound/entagged-tageditor/files/buildfixes.patch b/media-sound/entagged-tageditor/files/entagged-tageditor-0.31-buildfixes.patch
index 9222d27e..9222d27e 100644
--- a/media-sound/entagged-tageditor/files/buildfixes.patch
+++ b/media-sound/entagged-tageditor/files/entagged-tageditor-0.31-buildfixes.patch
diff --git a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
new file mode 100644
index 00000000..7b470e2d
--- /dev/null
+++ b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
@@ -0,0 +1,31 @@
+--- build.xml	2007-03-23 16:25:25.000000000 +0200
++++ build.xml.fixed	2007-09-01 09:20:44.000000000 +0300
+@@ -30,7 +30,7 @@
+ 	<property name="entagged_dir" location="."/>

+ 	<property name="entagged_base_dir" location=".."/>

+ 	<property name="tageditor_dir" location="tageditor"/>

+-	<property name="tageditor_version" value="0.21"/>

++	<property name="tageditor_version" value="0.35"/>

+ 	<property name="tageditor_jar" value="entagged-tageditor-${tageditor_version}.jar"/>

+ 	<property name="tageditor_zip" value="entagged-tageditor-${tageditor_version}.zip"/>

+ 	<property name="tageditor_tar" value="entagged-tageditor-${tageditor_version}.tar"/>

+@@ -52,7 +52,7 @@
+ 	

+ 	<!-- Compile the sources -->

+     <target name="compile" depends="clean">

+-		<javac srcdir="${entagged_dir}" classpath="${entagged_base_dir}" excludes="entagged/junit/*" source="1.4"/>

++		<javac srcdir="${entagged_dir}" classpath="hsqldb.jar" excludes="entagged/junit/*"/>

+ <echo>

+ Entagged Tag editor is now fully compiled.

+ You can use either:

+@@ -71,9 +71,8 @@
+ 	<!-- Prepares the classes to be packaged -->

+ 	<target name="build" depends="compile">

+ 		<!-- Jar the classes files  -->

+-		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/*" excludes="**/*.java" >

++		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}/entagged" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/* miage/**/*.class" excludes="**/*.java" >

+ 			<manifest>

+-				<attribute name="Class-Path" value="${tageditor_jar_classpath}"/>

+ 				<attribute name="Main-Class" value="${tageditor_jar_mainclass}"/>

+ 			</manifest>

+ 		</jar>