diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-08-26 10:52:50 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-08-26 10:59:21 +0200 |
| commit | 3e536d5f17aeb8431f90f0ac72c71af60fc2f628 (patch) | |
| tree | 685c0eaf0ec212621a31ba4270c966a42c5da054 | |
| parent | dev-java/icedtea: Remove support for non-existent deps (diff) | |
| download | gentoo-3e536d5f17aeb8431f90f0ac72c71af60fc2f628.tar.gz gentoo-3e536d5f17aeb8431f90f0ac72c71af60fc2f628.tar.bz2 gentoo-3e536d5f17aeb8431f90f0ac72c71af60fc2f628.zip | |
dev-java/proguard: Remove support for non-existent deps
| -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 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 4 |
4 files changed, 10 insertions, 23 deletions
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 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 594eb13eebe4..f933a7491fb4 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -443,10 +443,6 @@ net-nds/nsscache nssdb # java wrappers fail to build (bug #548858) =app-admin/setools-3.3.8-r7 java -# James Le Cuirot <chewi@gentoo.org> (05 Apr 2015) -# dev-java/sun-j2me-bin is going away. -dev-java/proguard j2me - # Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015) # >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2 games-strategy/freeciv system-lua |