summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-08-26 10:52:50 +0200
committerMichał Górny <mgorny@gentoo.org>2018-08-26 10:59:21 +0200
commit3e536d5f17aeb8431f90f0ac72c71af60fc2f628 (patch)
tree685c0eaf0ec212621a31ba4270c966a42c5da054 /dev-java
parentdev-java/icedtea: Remove support for non-existent deps (diff)
downloadgentoo-3e536d5f17aeb8431f90f0ac72c71af60fc2f628.tar.gz
gentoo-3e536d5f17aeb8431f90f0ac72c71af60fc2f628.tar.bz2
gentoo-3e536d5f17aeb8431f90f0ac72c71af60fc2f628.zip
dev-java/proguard: Remove support for non-existent deps
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/proguard/metadata.xml1
-rw-r--r--dev-java/proguard/proguard-4.5.ebuild14
-rw-r--r--dev-java/proguard/proguard-4.8.ebuild14
3 files changed, 10 insertions, 19 deletions
diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml
index e626ba12162..033beb86046 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 37a87d48385..d2cf182ea8e 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 c10cdecaa14..cf8bbd6043e 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