[gentoo-commits] repo/gentoo:master commit in: dev-java/proguard/, profiles/base/

[gentoo-commits] repo/gentoo:master commit in: dev-java/proguard/, profiles/base/

[Michał Górny]

commit:     3e536d5f17aeb8431f90f0ac72c71af60fc2f628
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 08:52:50 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 08:59:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e536d5f

dev-java/proguard: Remove support for non-existent deps

 dev-java/proguard/metadata.xml        |  1 -
 dev-java/proguard/proguard-4.5.ebuild | 14 +++++---------
 dev-java/proguard/proguard-4.8.ebuild | 14 +++++---------
 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 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

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 594eb13eebe..f933a7491fb 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