Version bump. Fixes bug #290821 and bug #276985.

Package-Manager: portage-2.2_rc46/cvs/Linux i686

4 files changed, 80 insertions, 6 deletions

diff --git a/dev-java/proguard/ChangeLog b/dev-java/proguard/ChangeLog
index 0244dc585459..a5feeabe6827 100644
--- a/dev-java/proguard/ChangeLog
+++ b/dev-java/proguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/proguard
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/ChangeLog,v 1.17 2009/11/04 14:42:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/ChangeLog,v 1.18 2009/11/04 15:28:19 betelgeuse Exp $
+
+*proguard-4.4 (04 Nov 2009)
+
+  04 Nov 2009; Petteri Räty <betelgeuse@gentoo.org> +proguard-4.4.ebuild,
+  metadata.xml:
+  Version bump. Fixes bug #290821 and bug #276985.
 
   04 Nov 2009; Petteri Räty <betelgeuse@gentoo.org> -proguard-3.10.ebuild,
   -proguard-4.1.ebuild, -proguard-4.2-r1.ebuild:
diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest
index 5c0988d42f0e..50df3a86ee40 100644
--- a/dev-java/proguard/Manifest
+++ b/dev-java/proguard/Manifest
@@ -3,13 +3,15 @@ Hash: SHA1
 
 AUX build.xml 1018 RMD160 2d99298bd2b737a33601984baaaafc230546e469 SHA1 005dcd093e0dc57f0d94b5480b6f5effc1650be4 SHA256 2ff78260db48aba082012630cb496cf4060dcdf88dde7e8dd2be5bf4cd8da242
 DIST proguard4.3.tar.gz 1779783 RMD160 dbae3144880d2f84f4c730375b83ca2a441e37ed SHA1 9dc4b7f4eba6c3e2cc5df34d3d4394a38f2146e5 SHA256 8d97e7acf5a2c8827fdd622439852efdedd897d2e9786efd92aff51f5bd07d86
+DIST proguard4.4.tar.gz 1821537 RMD160 e69291ae1423bc3bb30e1073d9920f4499be6696 SHA1 4454e29e849eae82de29ff5af444e65801ea0953 SHA256 a15ee7abd3b67f1c2df162e4c1b7ad6dab51163225f5714b7fb80adfcaa1a3e1
 EBUILD proguard-4.3.ebuild 3387 RMD160 0343656271248285f27b49c444887be69b3a1da6 SHA1 cf534fd9c01bebdbf37684ec258622928213b532 SHA256 3812361840af84a880d9554c5fc29aca1ee4d5edf3085d2a8b85892585ac0c69
-MISC ChangeLog 2474 RMD160 1e521dddddd018481a6ec64bfcb97fe70845ded5 SHA1 c3e02f8ba2fc94f1479146cb38ae015aa6408070 SHA256 3a39b501c477586a5334fa3fa1e130ed815974a058b3b4d1826bdee9122d311b
-MISC metadata.xml 244 RMD160 32cbf2cff95ba2a1981c39ff021876b0b551bd76 SHA1 6550e088970906787193c71458ba75a675d30714 SHA256 c932c6aca0afed464f6ba38a387a7ea3f9d67283a65ae0b552486f4207934130
+EBUILD proguard-4.4.ebuild 1708 RMD160 2c1af57c5ea7a536aed1b2d55672a933a7268bfc SHA1 99ca2c6d70044e6433aa33d8f6c088eae39d58f0 SHA256 a6e25a6432e3beeb75da31d7981626a69ccacc027c8db149a183a50fc0e20b3c
+MISC ChangeLog 2646 RMD160 6530e9f15ebde0c86ff49260e2b02349eec7c6b7 SHA1 314968402f6c40368fd5a61febd9d1e7cfbd4cdb SHA256 912258a0782091e11113172e3e3293050c54d55d9b442d03a470d22b036ee653
+MISC metadata.xml 321 RMD160 4fede1943ae410e05c4fd59cb53d0b4dbdab156a SHA1 953686bdb4846c95816009390413d664bcf6e903 SHA256 54a8ab20271a859093e023d0b1ccfa55cb712577d69111362544d613c1f341ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrxktUACgkQcxLzpIGCsLRBsACfXmkQI26VQ2Tf7FnHTHqY1+6b
-N7MAnijWt3OSNcpf0kHV8jujgzEFjMmy
-=eFng
+iEYEARECAAYFAkrxnZEACgkQcxLzpIGCsLSyqgCffp9kJJL9Msv28d5/iCk046/T
+n4gAn1FCRsP+bsEdw8tWnqaT9Kvk47Eu
+=5qW6
 -----END PGP SIGNATURE-----
diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml
index b8b1a030633f..4f4f18795e29 100644
--- a/dev-java/proguard/metadata.xml
+++ b/dev-java/proguard/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>java</herd>
   <use>
+    <flag name="ant">Ant task for using ProGuard in build.xml scripts</flag>
     <flag name="j2me">Adds support for J2ME Wireless Toolkit</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-java/proguard/proguard-4.4.ebuild b/dev-java/proguard/proguard-4.4.ebuild
new file mode 100644
index 000000000000..b8d9497f1b08
--- /dev/null
+++ b/dev-java/proguard/proguard-4.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/proguard-4.4.ebuild,v 1.1 2009/11/04 15:28:19 betelgeuse Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Free Java class file shrinker, optimizer, and obfuscator."
+HOMEPAGE="http://proguard.sourceforge.net/"
+MY_P=${P/-/}
+MY_P=${MY_P/_/}
+SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ant j2me"
+
+DEPEND=">=virtual/jdk-1.4
+		j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )"
+RDEPEND=">=virtual/jre-1.4
+		>=dev-java/ant-core-1.7:0
+		j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+	find "${S}" -name "*.jar" | xargs rm -v
+}
+
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="basic"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	local j2mearg antarg
+
+	use ant && antarg="-Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
+	use j2me && j2mearg="-Dwtk.jar=$(java-pkg_getjar sun-j2me-bin kenv.zip)"
+
+	java-pkg-2_src_compile \
+		$(use ant && echo anttask ${antarg}) \
+		$(use j2me && echo wtkplugin ${j2mearg})
+
+	if use doc; then
+		mkdir javadoc || die
+		javadoc -d javadoc -sourcepath src -classpath $${cp} -subpackages proguard || die "Cannot compile javadoc"
+	fi
+}
+
+src_install() {
+	java-pkg_dojar lib/*
+	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
+		dohtml -r docs/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+}