Updated ChangeLog.

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/proguard/ChangeLog b/dev-java/proguard/ChangeLog
index 529022db1686c82e3745afaa0e5cb8ec04b9b8d4..03e1d1779c01088873ab09eac9678210fd79eeab 100644 (file)
--- 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/Manifest b/dev-java/proguard/Manifest
index 78a0548db80c38140b3dcb382bc3516dc392c949..fc73e792db563246c32f93180248e57ffb06eecc 100644 (file)
--- a/dev-java/proguard/Manifest
+++ b/dev-java/proguard/Manifest
@@ -1,20 +1,20 @@
-AUX build.xml 1177 RMD160 aa02727041289d855f72a9fbb5b51a27ddd71e99 SHA1 1c86bea6c42859ec66223f4eb4fd1ae3ee2c220f SHA256 2b2991364a8c87d08de4b61575ab3afdbabc988878d8e68718a9d37adcb5e7cf
-MD5 fa68868e4c92b8660d73816ea59f7b4a files/build.xml 1177
-RMD160 aa02727041289d855f72a9fbb5b51a27ddd71e99 files/build.xml 1177
-SHA256 2b2991364a8c87d08de4b61575ab3afdbabc988878d8e68718a9d37adcb5e7cf files/build.xml 1177
-DIST proguard3.6.tar.gz 1266792 RMD160 e243b717dadfd3d0da5d87079f0abdfb66a1bcac SHA1 b17cb766dbbd7321f45e1c7549434506620c0304 SHA256 b630053ad91a55cfce8a7e11f66fcab7bb8e7e7240d46826952d32d2f80f1a01
-EBUILD proguard-3.6.ebuild 1088 RMD160 7e08910ed2cebeaecad0904cc779ab7d6c14eb03 SHA1 e42568be89b37fbae7b42c5ee58ca85a27d21a51 SHA256 dc9925a88610dba949d88b85b26fa4f0cc014f20cdddc5e94794fcefba535b1c
-MD5 884d5e71d4e0545217457cc5514581a3 proguard-3.6.ebuild 1088
-RMD160 7e08910ed2cebeaecad0904cc779ab7d6c14eb03 proguard-3.6.ebuild 1088
-SHA256 dc9925a88610dba949d88b85b26fa4f0cc014f20cdddc5e94794fcefba535b1c proguard-3.6.ebuild 1088
-MISC ChangeLog 912 RMD160 4f1c78f1a7f9a535692e510231dfaf1b93c5e5e9 SHA1 affa820cb19c057584997d74907aa99521c505a2 SHA256 c04a105d6480434419017ba076b47904275386e67e3937a1996b631bfbb5e425
-MD5 2a776aea03dc4c359a882e5b62e67933 ChangeLog 912
-RMD160 4f1c78f1a7f9a535692e510231dfaf1b93c5e5e9 ChangeLog 912
-SHA256 c04a105d6480434419017ba076b47904275386e67e3937a1996b631bfbb5e425 ChangeLog 912
+AUX build.xml 1018 RMD160 2d99298bd2b737a33601984baaaafc230546e469 SHA1 005dcd093e0dc57f0d94b5480b6f5effc1650be4 SHA256 2ff78260db48aba082012630cb496cf4060dcdf88dde7e8dd2be5bf4cd8da242
+MD5 fa7142044ae1746c1babe6916ec198fa files/build.xml 1018
+RMD160 2d99298bd2b737a33601984baaaafc230546e469 files/build.xml 1018
+SHA256 2ff78260db48aba082012630cb496cf4060dcdf88dde7e8dd2be5bf4cd8da242 files/build.xml 1018
+DIST proguard3.8.tar.gz 1260073 RMD160 369827a9c60ddce261d31496d1fcc7f5b66f5408 SHA1 1e158fc90ce7edbf74dd773a3a1316d573a94239 SHA256 8983b2d7f2d1dc28f584c539fde430cd6cb9634f4e8fe0113c6daaed826504ac
+EBUILD proguard-3.8.ebuild 1348 RMD160 e9f65c5aa498461bf0ce4e3f9df273de1fa4225e SHA1 4c88887c49b5883799d1a1067782f177f5b0ab9c SHA256 5880a32d9364b6aba071fdc77349a61bc5034f087dea18b15a8a02fc5de3ad07
+MD5 5ee897799ac3cea51be96c06148a2afa proguard-3.8.ebuild 1348
+RMD160 e9f65c5aa498461bf0ce4e3f9df273de1fa4225e proguard-3.8.ebuild 1348
+SHA256 5880a32d9364b6aba071fdc77349a61bc5034f087dea18b15a8a02fc5de3ad07 proguard-3.8.ebuild 1348
+MISC ChangeLog 1096 RMD160 3aa50c4692820f10eff8112559433396d2b61e1e SHA1 d46108274fc1c83503a62e44c61b5b2b54594a5b SHA256 7f4617fd1830819e616f124967e6cb3e51771f61acea85582826a315a2445f94
+MD5 2d871a5968f4195c1a094fb5fae5ac3e ChangeLog 1096
+RMD160 3aa50c4692820f10eff8112559433396d2b61e1e ChangeLog 1096
+SHA256 7f4617fd1830819e616f124967e6cb3e51771f61acea85582826a315a2445f94 ChangeLog 1096
 MISC metadata.xml 158 RMD160 94cf6dcaf672d8ae3f8958288e448ab2d7da1c80 SHA1 023da9fae1586e478d196e34edf238b7747bb84f SHA256 1432f3cd35ba44f6867c38d841ce078e018172e75cc47bad2c59aa8336c48fc8
 MD5 3a4f4bd9d423197ee42af50cf23690d7 metadata.xml 158
 RMD160 94cf6dcaf672d8ae3f8958288e448ab2d7da1c80 metadata.xml 158
 SHA256 1432f3cd35ba44f6867c38d841ce078e018172e75cc47bad2c59aa8336c48fc8 metadata.xml 158
-MD5 f8471344f4036c5a58fe78ede404f0b8 files/digest-proguard-3.6 238
-RMD160 e87e9d95054130486695f7e20ed7e45749e30d52 files/digest-proguard-3.6 238
-SHA256 66377648cf24b973acbed70c2bc13edfa4d4caebebb120b6b9adb84b6b68a5cd files/digest-proguard-3.6 238
+MD5 0b757663f57ff3029b0e5091cfe9fbdd files/digest-proguard-3.8 238
+RMD160 7ac29596239ace2ecbbb61b3fd6b696125f0aeb6 files/digest-proguard-3.8 238
+SHA256 aa3853fc479e77e3ea42b6e13bd5890d87be9e06cef57891bc3af3a419939834 files/digest-proguard-3.8 238

diff --git a/dev-java/proguard/files/build.xml b/dev-java/proguard/files/build.xml
index 011815eea7afa6755d51dc5217344460814580e8..7eff4bc8eb19b6c0e184347cbde70440659e2f93 100644 (file)
--- 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 (file)
index a813748..0000000
--- 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 (file)
index 0000000..92a5618
--- /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
similarity index 70%
rename from dev-java/proguard/proguard-3.6.ebuild
rename to dev-java/proguard/proguard-3.8.ebuild
index 5d6be2ced2502003e3811d079df66c6fc5151d43..28507c3201819d121c8082953414f02ddec663d6 100644 (file)
--- 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