diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
| commit | 12bb627384ddfd47382b9f1b6464481a58d01ebb (patch) | |
| tree | f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /dev-java/proguard | |
| parent | 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff) | |
gentoo resync : 29.08.2018
Diffstat (limited to 'dev-java/proguard')
| -rw-r--r-- | dev-java/proguard/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/proguard/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-java/proguard/proguard-4.5.ebuild | 14 | ||||
| -rw-r--r-- | dev-java/proguard/proguard-4.8.ebuild | 14 |
4 files changed, 13 insertions, 22 deletions
diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest index fe546c722fc7..776aa6098169 100644 --- a/dev-java/proguard/Manifest +++ b/dev-java/proguard/Manifest @@ -1,7 +1,7 @@ DIST proguard4.5.tar.gz 1827325 BLAKE2B a8bc7f8527f98094c08d178b0544e44e09b3ee03b8a100bba7a978b70ca60b655a12fbca822bd0bb60c1d81c9b83cfb61ebe7bbde6b2f854de962ede23c75d82 SHA512 bf1d9c29a4b3e1ba8062632b0f7f97e8f8d3dd2fbfbdc4bbbe98fa76151721fa45b22a1d99890654c557f3a1b87b45038d4882c0cb192b907ec2c65f4e7429fa DIST proguard4.8.tar.gz 1914047 BLAKE2B e32b9eab0b9d91fb7e565c881659582c3c90ebe3b068e79aecd62b7e5200420ef61ae4f303e654329e46627d8c746747019347baae74cf23ed791dc89e8a0197 SHA512 f06c98c784a71fa9e2c137c6bc4c062dfcf2eeaa28653b909b475226cf133fb67821128a3fb6ab0702807cd229330da8b64e810d9078d0b7510083453feffa10 DIST proguard5.2.1.tar.gz 2160584 BLAKE2B 35cedaee26a8f8fb3ae28843f55867277817bdde28603c615ce4bea0b5fb8babf35b49ae494cde0b0496117077aa2984197bb06915f50699b5a5dc66197f2601 SHA512 7c2735860d689f9002e40e7a5304eb61f8fb8abc1da36ea62fa32541cdf2e655bb2d27814e2b8137d29a1ab02a57c57961491612ea8e735788fdea719e6239be -EBUILD proguard-4.5.ebuild 1589 BLAKE2B 2e7c870d216ac7b4fc099c229c8afd0830a1efc9347917bb7f5ea0baca0224a4e35a5c11afd433cb99b3986b617e85f4ae5d7b67391afaa904e6739499088431 SHA512 62c71f50e764ffc6658d2652d8adc5022ca872206e764fba09eb5bf33b8007366c5c7a0f47de19c6fbf5941f3cebb4be29f216ff5b78889fea3bfb2695d0e0a7 -EBUILD proguard-4.8.ebuild 1585 BLAKE2B 0143f0ffec6ec400c01893cdf7c1539d83fb89bf3bad99a38124c442d0c530f8a52f047f03e4bd615ec125262d4ea11e8369d36b875ab5a65c911b85f6e3c7d1 SHA512 00feb16820b8676eb02f0876e516cb7d7ee17878ef16d561ff77e4c7c8a8adbce87fcee9d75def8c55261dbf457f96c90d3ef1e28aceb71cab98a36d4d871666 +EBUILD proguard-4.5.ebuild 1373 BLAKE2B 26d8f3e57bc3ec9de4ea55405bf2debbeac7c936a2746ec2b563936569b333488181f96677db1a855f5325cd224c44b7380fff596071ea331e349fb39232b3d1 SHA512 e1bd489456b0e92984b720dc9dbe75a473d2c4b7e5be6386e2bdebe2fa576da71f8cad4130fc4610bd88e163dce545e231cbb0d187f45ce3ff656bd0075fe558 +EBUILD proguard-4.8.ebuild 1369 BLAKE2B d6ab343bcda2e49dc203ce490af88dd1ff9bd7c0f47ba4a86fcee8c1455d3d636cba2d401639e3bc262b2ae3b3270fb12af710426fa064bba6e60fd7431775ce SHA512 67464340d8d54cd48937af8c8bb3cf6d74528e1017993f9e952d5aabd0fa4437222f9816331d270f3a1facacdec7be5cd56f20ad7bd4d3a043541753adf59ea3 EBUILD proguard-5.2.1.ebuild 1582 BLAKE2B f5858a345acb37507e56cc9af29ac9d4efeea6bbf61f1f7a59b4ee8205fd8b54a6790ea395efa8614ab15953ba550972030ea040e4da565ba53fe13f229cad48 SHA512 3eb6154de15044062f182a1a0b0a3d58cb2f356e4d811ce4631ebcad81b1b22f671e75fcaa2badab43dd146e23db1d5ccaffbfeb1beef5a307e9fec023cb1b09 -MISC metadata.xml 470 BLAKE2B 038b609842f58b18fded44a04304459fdbb90f1eaa90e784e8e0aa8bb22c6725a240388cc12fef4dc9dd89bb87d2b963fa8c98d09c645e76341a5357cedcf5c9 SHA512 41a6f95762fe034432e6c02a20bf37a25f27e8a3edfc8b07d4506115526865e22a594582ca1d7ddc2f22ccc8b1fea59f66edb5209cab5f0c38553dc0f70a96f9 +MISC metadata.xml 404 BLAKE2B 93773f7c921b25ff141a8696b04ca82b4b88db47b1bfc186f34b06a4990f6db0eb6c50cdd435621cdc36b44edbb63dcdc8f063c7f52cdb4a42356bbde4076215 SHA512 526e2a3438bf9c71febee16baf33d3c05dc2680e5c54bf6290292cf7f6e09c979e318883e053f582fce55c28ab1b1654cffcdfb98b74b3f414f05ce0d061e887 diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml index e626ba121626..033beb86046d 100644 --- a/dev-java/proguard/metadata.xml +++ b/dev-java/proguard/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <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> <upstream> <remote-id type="sourceforge">proguard</remote-id> diff --git a/dev-java/proguard/proguard-4.5.ebuild b/dev-java/proguard/proguard-4.5.ebuild index 37a87d483852..d2cf182ea8e4 100644 --- a/dev-java/proguard/proguard-4.5.ebuild +++ b/dev-java/proguard/proguard-4.5.ebuild @@ -15,13 +15,11 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz" LICENSE="GPL-2-with-linking-exception" SLOT="0" KEYWORDS="amd64 x86" -IUSE="ant j2me" +IUSE="ant" -DEPEND=">=virtual/jdk-1.4 - j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )" +DEPEND=">=virtual/jdk-1.4" RDEPEND=">=virtual/jre-1.4 - >=dev-java/ant-core-1.7:0 - j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )" + >=dev-java/ant-core-1.7:0" S=${WORKDIR}/${MY_P} @@ -34,14 +32,12 @@ EANT_BUILD_TARGET="basic" EANT_DOC_TARGET="" src_compile() { - local j2mearg antarg + local 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}) + $(use ant && echo anttask ${antarg}) if use doc; then mkdir javadoc || die diff --git a/dev-java/proguard/proguard-4.8.ebuild b/dev-java/proguard/proguard-4.8.ebuild index c10cdecaa146..cf8bbd6043ec 100644 --- a/dev-java/proguard/proguard-4.8.ebuild +++ b/dev-java/proguard/proguard-4.8.ebuild @@ -15,13 +15,11 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz" LICENSE="GPL-2-with-linking-exception" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="ant j2me" +IUSE="ant" -DEPEND=">=virtual/jdk-1.4 - j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )" +DEPEND=">=virtual/jdk-1.4" RDEPEND=">=virtual/jre-1.4 - >=dev-java/ant-core-1.7:0 - j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )" + >=dev-java/ant-core-1.7:0" S=${WORKDIR}/${MY_P} @@ -34,14 +32,12 @@ EANT_BUILD_TARGET="basic" EANT_DOC_TARGET="" src_compile() { - local j2mearg antarg + local 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}) + $(use ant && echo anttask ${antarg}) if use doc; then mkdir javadoc || die |