Replace java-ant_remove-taskdefs by a patch, see bug #479838.

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

4 files changed, 69 insertions, 9 deletions

diff --git a/dev-java/jspeex/ChangeLog b/dev-java/jspeex/ChangeLog
index f98d0526e861..1ede03290298 100644
--- a/dev-java/jspeex/ChangeLog
+++ b/dev-java/jspeex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jspeex
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jspeex/ChangeLog,v 1.1 2013/06/29 21:40:04 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jspeex/ChangeLog,v 1.2 2014/02/18 22:37:56 tomwij Exp $
+
+*jspeex-0.9.7-r1 (18 Feb 2014)
+
+  18 Feb 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/jspeex-0.9.7-remove-proguard-taskdef.patch, +jspeex-0.9.7-r1.ebuild,
+  -jspeex-0.9.7.ebuild, files/jspeex-0.9.7-remove-junit-report.patch:
+  Replace java-ant_remove-taskdefs by a patch, see bug #479838.
 
 *jspeex-0.9.7 (29 Jun 2013)
 
diff --git a/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch b/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
index 40ddfd6fe981..d3446420f720 100644
--- a/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
+++ b/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
@@ -1,6 +1,7 @@
---- a/build.xml

-+++ b/build.xml

-@@ -218,12 +218,6 @@

+diff -Naur a/build.xml b/build.xml
+--- a/build.xml	2014-02-18 23:32:25.440819710 +0100
++++ b/build.xml	2014-02-18 23:32:43.017053558 +0100
+@@ -218,12 +218,6 @@
          </fileset>

        </batchtest>

      </junit>

diff --git a/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch b/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch
new file mode 100644
index 000000000000..eb9e6fc24af2
--- /dev/null
+++ b/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch
@@ -0,0 +1,53 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml	2014-02-18 23:32:25.440819710 +0100
++++ b/build.xml	2014-02-18 23:33:26.308555686 +0100
+@@ -57,10 +57,6 @@
+ 

+   <property name="version" value="0.9.7"/>

+ 

+-  <!-- Define additional tasks -->

+-  <taskdef name="proguard" classname="proguard.ant.ProGuardTask"

+-           classpath="${lib}/proguard3.2.jar" />

+-

+   <target name="init" description="Initialise ant" depends="clean">

+     <tstamp>

+       <format property="NOW" pattern="dd/MM/yyyy HH:mm" locale="en"/>

+@@ -138,19 +134,6 @@
+   <target name="compress" depends="package"

+           description="Package obfuscated JSpeex library" >

+     <mkdir dir="${log}"/>

+-    <proguard>

+--libraryjars ${java.home}/lib/rt.jar

+--injars      ${dist}/jspeex.jar

+--outjar      ${dist}/jspeex-obf.jar

+--renamesourcefileattribute SourceFile

+--keepattributes InnerClasses,SourceFile

+--printmapping ${log}/jspeex-obf.map

+--overloadaggressively

+-

+--keep public class * {

+-    public protected *;

+-}

+-    </proguard>

+   </target>

+ 

+   <target name="compress-dec-nb" depends="compile-nb"

+@@ -161,18 +144,6 @@
+         <attribute name="Main-Class" value="JSpeexDec"/>

+       </manifest>

+     </jar>

+-    <proguard>

+--libraryjars ${java.home}/lib/rt.jar

+--injars      ${dist}/jspeex-dec-nb.jar

+--outjar      ${dist}/jspeex-dec-nb-obf.jar

+--printmapping ${log}/jspeex-dec-nb-obf.map

+--overloadaggressively

+--defaultpackage ''

+-

+--keep public class JSpeexDec {

+-    public static void main(java.lang.String[]);

+-}

+-    </proguard>

+   </target>

+ 

+   <!-- ******************************************************************** -->

diff --git a/dev-java/jspeex/jspeex-0.9.7.ebuild b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
index 20df340844ad..07e90e075e6d 100644
--- a/dev-java/jspeex/jspeex-0.9.7.ebuild
+++ b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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/jspeex/jspeex-0.9.7.ebuild,v 1.1 2013/06/29 21:40:04 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jspeex/jspeex-0.9.7-r1.ebuild,v 1.1 2014/02/18 22:37:56 tomwij Exp $
 
 EAPI="5"
 
@@ -36,9 +36,8 @@ EANT_BUILD_TARGET="package"
 S="${WORKDIR}/${PN}"
 
 java_prepare() {
-	java-ant_remove-taskdefs --name proguard
-
 	epatch "${FILESDIR}"/${P}-remove-junit-report.patch
+	epatch "${FILESDIR}"/${P}-remove-proguard-taskdef.patch
 
 	find . -name "*.jar" -delete || die "Failed to remove bundled libraries."