Version bump. Remove j2me support because we're going to remove

sun-j2me-bin. Also remove unused build.xml file.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

diff --git a/dev-java/proguard/ChangeLog b/dev-java/proguard/ChangeLog
index 16338dfccbb942291da2f59e8994874091118d4b..2713093b4fd1448434a3364030b12cd75aff8669 100644 (file)
--- a/dev-java/proguard/ChangeLog
+++ b/dev-java/proguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/proguard
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/ChangeLog,v 1.28 2014/08/10 20:22:30 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/ChangeLog,v 1.29 2015/04/04 21:20:52 chewi Exp $
+
+*proguard-5.2.1 (04 Apr 2015)
+
+  04 Apr 2015; James Le Cuirot <chewi@gentoo.org> +proguard-5.2.1.ebuild,
+  -files/build.xml:
+  Version bump. Remove j2me support because we're going to remove sun-j2me-bin.
+  Also remove unused build.xml file.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> proguard-4.5.ebuild,
   proguard-4.7.ebuild, proguard-4.8.ebuild:

diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest
index 6b6dd6d6f8306d6305c12fbcd16de00b44e3e465..d273e334ea02282382191fd102c3bca1c57b9a96 100644 (file)
--- a/dev-java/proguard/Manifest
+++ b/dev-java/proguard/Manifest
@@ -1,19 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX build.xml 1018 SHA256 2ff78260db48aba082012630cb496cf4060dcdf88dde7e8dd2be5bf4cd8da242 SHA512 c47ff7666eb1b53e1fd9a816a9587a00bd2f908d390eb5fda7fe68a7a24055a979739a032c5017ca7b5a49da2486f3a0dc5ab736964337e55b0dc367e6ee0c10 WHIRLPOOL f2bf9e32a803860b0cc7252998fe02c405e5f04d24209a5d0870b6da2cd48602249e141a1bb30e86252cba8ef04b87e2cef5ee4b68a6e1e41fbe1520f2514593
 DIST proguard4.5.tar.gz 1827325 SHA256 ccd621c0560817c252d999c66e1c975f307758e928104c14be02ec311e107e4e SHA512 bf1d9c29a4b3e1ba8062632b0f7f97e8f8d3dd2fbfbdc4bbbe98fa76151721fa45b22a1d99890654c557f3a1b87b45038d4882c0cb192b907ec2c65f4e7429fa WHIRLPOOL 0783643bd69f8d972d7a469300fb61f1e06868ee434d1eaf4769bd71d0b9f4d56ef348906857cfdc8b5e20deae6596bb1c7ba9c10cd593b40715e49381fce61d
 DIST proguard4.7.tar.gz 1902321 SHA256 ea2c245257d59957ce8dee9476b9595ac99c0a9c5194d739a3a800af5fac99e7 SHA512 cbf3e5ddb11a37af169cd563ffc04e554b925e99ff4f3797626e286ac40554577f2715050b46f5d1a9599de97cb62090b39798ea0aa006273d91cf8217e9e60b WHIRLPOOL 55723ae601ea02ffa27644977499c3c81b3491534a90506884b3eb68ccab87e8e1191d15fd3729871e4276b65f0f8e24a54a05b2527e27f5f906fef00227dba1
 DIST proguard4.8.tar.gz 1914047 SHA256 84db4aef4235ad312e221ae95485d7848fc468db66699f1b155d89c5036374f6 SHA512 f06c98c784a71fa9e2c137c6bc4c062dfcf2eeaa28653b909b475226cf133fb67821128a3fb6ab0702807cd229330da8b64e810d9078d0b7510083453feffa10 WHIRLPOOL 5372e1100a90a28dd195ae3893adbbf2222e686fead0a8f032777795cb3f0c39c3e4f407bdc8176ac9c42d70c85fade0bae23351595849204cc2753f04a15bb4
+DIST proguard5.2.1.tar.gz 2160584 SHA256 162fb2816212c6a7a195884a01ff826920919e97f57914a5b00bdf7641fc00f6 SHA512 7c2735860d689f9002e40e7a5304eb61f8fb8abc1da36ea62fa32541cdf2e655bb2d27814e2b8137d29a1ab02a57c57961491612ea8e735788fdea719e6239be WHIRLPOOL 841a3a35a47b0252734270ed1da0c5d046a18ca159a446ebbe18405c4508d4bca1c245e1ec89c475aa62f0adc646ee1f99583b2e7943db6ec70568328f5f53f8
 EBUILD proguard-4.5.ebuild 1711 SHA256 892a4c8782d7e2832f3c5efb272b9077557022760c19928c8a838237816e77d7 SHA512 0dc46267a0ea7aa2c3347e8c5bcf35aa90de0264db2f56a09b0031431124a967fa6d4a5a18feeaec1a3379eaf780dbaa07b1ab255d8e6a14167e571ee7e7a775 WHIRLPOOL 4186219305e6cbc0ddb43e157d0d9da34e0f892a7e4f47c37800ce6746c1209c170e50b068fb1c27f620d17ddd7be362b3cedfc08a20240af9375d55b605195d
 EBUILD proguard-4.7.ebuild 1713 SHA256 4a52ccb2157a0dfcaebb3cb0a6222926ef2f5ab413b17d0658ce278d0ce31a78 SHA512 2b69bf84af26221f76d5ce649d233bc71f8b9d4504abea7b2a76cec82a0e17cb224a2776864e023ef1cf42a98d28c60ccdd2990a25b6b1d79d7cca109e6bdb79 WHIRLPOOL 3ebf2dd948a538ddec46cd624bb6fbc8bd92fe9046f1eddb5a32703027fc5f3d792788ca9a8a9279372c43767d866116b1daacb66a687390dc2a842b2367fe07
 EBUILD proguard-4.8.ebuild 1707 SHA256 bdc160ec1940f25197928494a4ed9c32257ef47498a5f5bfb87b43e6003b96a1 SHA512 f14a48f53d51c4cc2ee5794ca713f188df0f4f9cc3f37424e9ab04c32422cb31cd974a2f83906263c4e30c987f92cf37931df7975df729a79da05e2858b5ea48 WHIRLPOOL 2aac4706812617c960b3d588334d8c21275f8138817c04a3e3495d3b0f1bd89bd7c5a7b9e21fd641b641aa872c02412d8cc4f922ba6ac4e9a47e901dbdf74f9c
-MISC ChangeLog 3827 SHA256 4bf7618390867d0724026d480d6f7428d4815d13bf1ec51b2d31b2dcede98bed SHA512 da56f5343f730855e791c3fc623f9b7fb02a3fb3abed0f45972dd617cd13591db1755030eca792a7461eba1833a25b1c2e805ef84428b5c76119dac949027947 WHIRLPOOL d730a4bcb43ba0693ed1c9c2dd9018b4805051857891644efb6c36d34a6980e662e0bcfd0062b29c28c92e224ca270abec800f94e2caf8ec4f436e896c4f05e4
+EBUILD proguard-5.2.1.ebuild 1705 SHA256 ceb5a680555ec42fa26c086e24d1fddec50edb74671617baec44f336d4d6fc3f SHA512 04b70cd3ddf6cbefd7401756c0acded6b88153ac47fb4e18e246fa82f0f686091cb78aca81db94ccaff630ac46abb2fe46c9c0c6d00c0896e4b0f2c36464c1e4 WHIRLPOOL d755091be212f64c6bd0d0070917299252cbbd57fd11540561e6220b37acb85525562c4846c3b2da6a3119f9f205a478817fc2fdbdd62b2da14ef22be624ca51
+MISC ChangeLog 4069 SHA256 ab46811ab996997495c9a3f83a14162d22043e0c82a6d5cd6cc57975af66e82b SHA512 71e62a3089a131161f85b0d8d89794be4d920c2db0f3252146af40208ad8baef1acf8711f3aaf6a65c0150443d7be1cfac58b2e5c0f626d83b2ccb5905baede0 WHIRLPOOL 32832a40671660c83d64a65f3b619ec90113ee9dd11f216249ee9afaaf45d03484554c25937b5f2da05630cf5779e53bdb235a83d92f3f14bd504e6010cf6f4a
 MISC metadata.xml 321 SHA256 54a8ab20271a859093e023d0b1ccfa55cb712577d69111362544d613c1f341ed SHA512 1f4a1d064deabd6422a47a65e555884832c3646875354e3638157106618a9b6cd29114449a46d0cb349c7584a66678efc32a79e0ae8f03ecdaebec5f0a64eb08 WHIRLPOOL 0188342284a842ed2140b89da41b3a57fad8bb072712275a727656d2095ac5aefe608bea7995001c5f98a4091697c44f86306be6af3413a423bacfaeba3e9b76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEUEAREIAAYFAlPn1IcACgkQcaHudmEf86ruFgCYhsylHS8B9XAEdyLgs755WS06
-RQCfZ5QC8OxFmbT+KtfD+4YcueoMHAY=
-=AcfU
+iQJ8BAEBCABmBQJVIFW6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kMCIQAIi6XGaYgR9QJX6u4LtLpFxy
+yd/JTWxi/NCZjrZ5m6KZ3OEMHP7Ek5gtYyfvKchDVS6DlTUywwT1+tzoY772Dl5E
+YgmzYVfULTUCL3GlPuUdODr+sjoDi16fpevHryMwSSLAXBvv3lBWLItTua+rJ0k4
+0Psr42LW+HyffaXu7FuAFh6sjqehedecGxJL1A37x9mHRAvtX9GBJLHeBC6q5oJo
+Vv6/3ffvhNVLUg93lPg4xScALHDXXTEdLVG4/44AM4aQDHHBP1dpGK/3iqmmTNwK
+dnh9BaxhKSlMp50uvWCG253Ri6E80+ynpdL7qH7Dz4sRuw+oOrlQKg/cFpnkE0cf
+DAKMA6b1d6fclvaRSv6RofbdvZ0x8Yj2hXyNg8K82eOxLHftOAdYZ0YHyxy9VkN4
+zY7NShAAcZ00UTvty8nc8GZ7j510K9/zcMIASDSFzcDMDu4y4r9Fribikp0ylZy6
+DcFAmKYAON5tuLqDev+wBBBpMdQKgUHNAiHBYc76/zZ0IpwBXFzbqI7ESLxN1Qzy
+gz+4ldtG/cbJ5pZHC3bFHFIFpFjLdexQDrIBRBzsMd3l1diORLmef3p5vpehfGT8
+9VBoZGeW00bqLZy37VxEvWENCvqVPVBBgFuKSdh44g/fdm1B9G88+232hUbO7bcX
+jY7xryIvMQABu54PTO3h
+=0Wkx
 -----END PGP SIGNATURE-----

diff --git a/dev-java/proguard/files/build.xml b/dev-java/proguard/files/build.xml
deleted file mode 100644 (file)
index 7eff4bc..0000000
--- a/dev-java/proguard/files/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project name="proguard" basedir="." default="proguard">
-       <target name="proguard">
-               <tstamp />
-
-               <mkdir dir="classes" />
-               <javac srcdir="src" debug="false" destdir="classes">
-                       <include name="**/*.java" />
-               </javac>
-
-               <copy todir="classes">
-                   <fileset dir="src" excludes="**/*.java"/>
-               </copy>
-               
-               <mkdir dir="dist" />
-
-               <delete file="dist/retrace.jar"/>
-               <jar jarfile="dist/retrace.jar" compress="true">
-                       <fileset dir="classes">
-                               <include name="proguard/retrace/**/*.*" />
-                       </fileset>
-               </jar>
-
-               <delete file="dist/proguardgui.jar"/>
-               <jar jarfile="dist/proguardgui.jar" compress="true">
-                       <fileset dir="classes">
-                               <include name="proguard/gui/**/*.*" />
-                       </fileset>
-               </jar>
-
-               <delete file="dist/proguard.jar"/>
-               <jar jarfile="dist/proguard.jar" compress="true">
-                       <fileset dir="classes">
-                               <exclude name="proguard/gui**" />
-                               <exclude name="proguard/retrace**" />
-                       </fileset>
-               </jar>
-
-               <delete dir="classes" />
-       </target>
-</project>

diff --git a/dev-java/proguard/proguard-5.2.1.ebuild b/dev-java/proguard/proguard-5.2.1.ebuild
new file mode 100644 (file)
index 0000000..a569fdc
--- /dev/null
+++ b/dev-java/proguard/proguard-5.2.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/proguard/proguard-5.2.1.ebuild,v 1.1 2015/04/04 21:20:52 chewi Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc 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 ~x86-fbsd"
+IUSE="ant examples"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5
+       >=dev-java/ant-core-1.7:0"
+
+S=${WORKDIR}/${MY_P}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_XML="buildscripts/build.xml"
+EANT_BUILD_TARGET="basic"
+EANT_DOC_TARGET=""
+
+java_prepare() {
+       find -name "*.jar" -delete || die
+}
+
+src_compile() {
+       local anttask=""
+
+       if use ant; then
+               anttask="anttask"
+               EANT_GENTOO_CLASSPATH="ant-core"
+       fi
+
+       java-pkg-2_src_compile ${anttask}
+
+       if use doc; then
+               local EXCLUDE="proguard.gradle:proguard.wtk"
+               use ant || EXCLUDE+=":proguard.ant"
+
+               local CP="$([[ -n ${EANT_GENTOO_CLASSPATH} ]] && java-pkg_getjars ${EANT_GENTOO_CLASSPATH})"
+               ejavadoc -d javadoc -sourcepath src -classpath "${CP}" -subpackages proguard -exclude "${EXCLUDE}"
+       fi
+}
+
+src_install() {
+       java-pkg_dojar lib/*.jar
+       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
+       use source && java-pkg_dosrc src/*
+}