Updated ChangeLog.

(Portage version: 2.1.2.2)

5 files changed, 23 insertions, 18 deletions

diff --git a/dev-java/proguard/ChangeLog b/dev-java/proguard/ChangeLog
index 529022db1686..03e1d1779c01 100644
--- a/dev-java/proguard/ChangeLog
+++ b/dev-java/proguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/proguard
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/ChangeLog,v 1.6 2007/02/03 04:59:04 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/ChangeLog,v 1.7 2007/03/11 23:50:34 fordfrog Exp $
+
+*proguard-3.8 (11 Mar 2007)
+
+  11 Mar 2007; Miroslav Šulc <fordfrog@gentoo.org> files/build.xml,
+  -proguard-3.6.ebuild, +proguard-3.8.ebuild:
+  Version bump. Also added launchers.
 
   03 Feb 2007; Steve Dibb <beandog@gentoo.org> proguard-3.6.ebuild:
   add ~amd64, bug 149432
diff --git a/dev-java/proguard/files/build.xml b/dev-java/proguard/files/build.xml
index 011815eea7af..7eff4bc8eb19 100644
--- a/dev-java/proguard/files/build.xml
+++ b/dev-java/proguard/files/build.xml
@@ -7,6 +7,10 @@
 		<javac srcdir="src" debug="false" destdir="classes">
 			<include name="**/*.java" />
 		</javac>
+
+	        <copy todir="classes">
+        	    <fileset dir="src" excludes="**/*.java"/>
+	        </copy>
 		
 		<mkdir dir="dist" />
 
@@ -20,12 +24,7 @@
 		<delete file="dist/proguardgui.jar"/>
 		<jar jarfile="dist/proguardgui.jar" compress="true">
 			<fileset dir="classes">
-				<include name="proguard/gui/**/*.class" />
-			</fileset>
-
-			<fileset dir="src">
-				<include name="proguard/gui/*.gif" />
-				<include name="proguard/gui/*.pro" />
+				<include name="proguard/gui/**/*.*" />
 			</fileset>
 		</jar>
 
@@ -35,11 +34,6 @@
 				<exclude name="proguard/gui**" />
 				<exclude name="proguard/retrace**" />
 			</fileset>
-
-			<fileset dir="src">
-				<include name="proguard/ant/task.properties" />
-				<include name="proguard/wtk/default.pro" />
-			</fileset>
 		</jar>
 
 		<delete dir="classes" />
diff --git a/dev-java/proguard/files/digest-proguard-3.6 b/dev-java/proguard/files/digest-proguard-3.6
deleted file mode 100644
index a81374878c35..000000000000
--- a/dev-java/proguard/files/digest-proguard-3.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 289565d4532f11c521de4554ebd50459 proguard3.6.tar.gz 1266792
-RMD160 e243b717dadfd3d0da5d87079f0abdfb66a1bcac proguard3.6.tar.gz 1266792
-SHA256 b630053ad91a55cfce8a7e11f66fcab7bb8e7e7240d46826952d32d2f80f1a01 proguard3.6.tar.gz 1266792
diff --git a/dev-java/proguard/files/digest-proguard-3.8 b/dev-java/proguard/files/digest-proguard-3.8
new file mode 100644
index 000000000000..92a561870e6f
--- /dev/null
+++ b/dev-java/proguard/files/digest-proguard-3.8
@@ -0,0 +1,3 @@
+MD5 30a62b705d67794f3523d0a1fd8fd1e2 proguard3.8.tar.gz 1260073
+RMD160 369827a9c60ddce261d31496d1fcc7f5b66f5408 proguard3.8.tar.gz 1260073
+SHA256 8983b2d7f2d1dc28f584c539fde430cd6cb9634f4e8fe0113c6daaed826504ac proguard3.8.tar.gz 1260073
diff --git a/dev-java/proguard/proguard-3.6.ebuild b/dev-java/proguard/proguard-3.8.ebuild
index 5d6be2ced250..28507c320181 100644
--- a/dev-java/proguard/proguard-3.6.ebuild
+++ b/dev-java/proguard/proguard-3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/proguard-3.6.ebuild,v 1.5 2007/02/03 04:59:04 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/proguard-3.8.ebuild,v 1.1 2007/03/11 23:50:34 fordfrog Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -23,18 +23,23 @@ S=${WORKDIR}/${PN}${PV}
 src_unpack() {
 	unpack ${A}
 	cp ${FILESDIR}/build.xml "${S}"
+	rm ${S}/lib/*.jar
+	cd "${S}" && java-ant_rewrite-classpath
 }
 
 src_compile() {
-	eant -lib `java-config -p sun-j2me-bin,ant-core` proguard
+	eant -Dgentoo.classpath=$(java-pkg_getjars sun-j2me-bin,ant-core) proguard
 }
 
 src_install() {
 	cd "${S}"
 	java-pkg_dojar dist/*
+	java-pkg_dolauncher ${PN} --main proguard.ProGuard
+	java-pkg_dolauncher ${PN}gui --main proguard.gui.ProGuardGUI
+	java-pkg_dolauncher ${PN}_retrace --main proguard.retrace.ReTrace
 
 	if use doc; then
-		java-pkg_dohtml docs/*
+		java-pkg_dojavadoc docs
 	fi
 
 	if use examples; then