| 1 |
commit: 3e536d5f17aeb8431f90f0ac72c71af60fc2f628 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 26 08:52:50 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 26 08:59:21 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e536d5f |
| 7 |
|
| 8 |
dev-java/proguard: Remove support for non-existent deps |
| 9 |
|
| 10 |
dev-java/proguard/metadata.xml | 1 - |
| 11 |
dev-java/proguard/proguard-4.5.ebuild | 14 +++++--------- |
| 12 |
dev-java/proguard/proguard-4.8.ebuild | 14 +++++--------- |
| 13 |
profiles/base/package.use.mask | 4 ---- |
| 14 |
4 files changed, 10 insertions(+), 23 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml |
| 17 |
index e626ba12162..033beb86046 100644 |
| 18 |
--- a/dev-java/proguard/metadata.xml |
| 19 |
+++ b/dev-java/proguard/metadata.xml |
| 20 |
@@ -7,7 +7,6 @@ |
| 21 |
</maintainer> |
| 22 |
<use> |
| 23 |
<flag name="ant">Ant task for using ProGuard in build.xml scripts</flag> |
| 24 |
- <flag name="j2me">Adds support for J2ME Wireless Toolkit</flag> |
| 25 |
</use> |
| 26 |
<upstream> |
| 27 |
<remote-id type="sourceforge">proguard</remote-id> |
| 28 |
|
| 29 |
diff --git a/dev-java/proguard/proguard-4.5.ebuild b/dev-java/proguard/proguard-4.5.ebuild |
| 30 |
index 37a87d48385..d2cf182ea8e 100644 |
| 31 |
--- a/dev-java/proguard/proguard-4.5.ebuild |
| 32 |
+++ b/dev-java/proguard/proguard-4.5.ebuild |
| 33 |
@@ -15,13 +15,11 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz" |
| 34 |
LICENSE="GPL-2-with-linking-exception" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="amd64 x86" |
| 37 |
-IUSE="ant j2me" |
| 38 |
+IUSE="ant" |
| 39 |
|
| 40 |
-DEPEND=">=virtual/jdk-1.4 |
| 41 |
- j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )" |
| 42 |
+DEPEND=">=virtual/jdk-1.4" |
| 43 |
RDEPEND=">=virtual/jre-1.4 |
| 44 |
- >=dev-java/ant-core-1.7:0 |
| 45 |
- j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )" |
| 46 |
+ >=dev-java/ant-core-1.7:0" |
| 47 |
|
| 48 |
S=${WORKDIR}/${MY_P} |
| 49 |
|
| 50 |
@@ -34,14 +32,12 @@ EANT_BUILD_TARGET="basic" |
| 51 |
EANT_DOC_TARGET="" |
| 52 |
|
| 53 |
src_compile() { |
| 54 |
- local j2mearg antarg |
| 55 |
+ local antarg |
| 56 |
|
| 57 |
use ant && antarg="-Dant.jar=$(java-pkg_getjar ant-core ant.jar)" |
| 58 |
- use j2me && j2mearg="-Dwtk.jar=$(java-pkg_getjar sun-j2me-bin kenv.zip)" |
| 59 |
|
| 60 |
java-pkg-2_src_compile \ |
| 61 |
- $(use ant && echo anttask ${antarg}) \ |
| 62 |
- $(use j2me && echo wtkplugin ${j2mearg}) |
| 63 |
+ $(use ant && echo anttask ${antarg}) |
| 64 |
|
| 65 |
if use doc; then |
| 66 |
mkdir javadoc || die |
| 67 |
|
| 68 |
diff --git a/dev-java/proguard/proguard-4.8.ebuild b/dev-java/proguard/proguard-4.8.ebuild |
| 69 |
index c10cdecaa14..cf8bbd6043e 100644 |
| 70 |
--- a/dev-java/proguard/proguard-4.8.ebuild |
| 71 |
+++ b/dev-java/proguard/proguard-4.8.ebuild |
| 72 |
@@ -15,13 +15,11 @@ SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz" |
| 73 |
LICENSE="GPL-2-with-linking-exception" |
| 74 |
SLOT="0" |
| 75 |
KEYWORDS="~amd64 ~x86" |
| 76 |
-IUSE="ant j2me" |
| 77 |
+IUSE="ant" |
| 78 |
|
| 79 |
-DEPEND=">=virtual/jdk-1.4 |
| 80 |
- j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )" |
| 81 |
+DEPEND=">=virtual/jdk-1.4" |
| 82 |
RDEPEND=">=virtual/jre-1.4 |
| 83 |
- >=dev-java/ant-core-1.7:0 |
| 84 |
- j2me? ( >=dev-java/sun-j2me-bin-2.2:0 )" |
| 85 |
+ >=dev-java/ant-core-1.7:0" |
| 86 |
|
| 87 |
S=${WORKDIR}/${MY_P} |
| 88 |
|
| 89 |
@@ -34,14 +32,12 @@ EANT_BUILD_TARGET="basic" |
| 90 |
EANT_DOC_TARGET="" |
| 91 |
|
| 92 |
src_compile() { |
| 93 |
- local j2mearg antarg |
| 94 |
+ local antarg |
| 95 |
|
| 96 |
use ant && antarg="-Dant.jar=$(java-pkg_getjar ant-core ant.jar)" |
| 97 |
- use j2me && j2mearg="-Dwtk.jar=$(java-pkg_getjar sun-j2me-bin kenv.zip)" |
| 98 |
|
| 99 |
java-pkg-2_src_compile \ |
| 100 |
- $(use ant && echo anttask ${antarg}) \ |
| 101 |
- $(use j2me && echo wtkplugin ${j2mearg}) |
| 102 |
+ $(use ant && echo anttask ${antarg}) |
| 103 |
|
| 104 |
if use doc; then |
| 105 |
mkdir javadoc || die |
| 106 |
|
| 107 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 108 |
index 594eb13eebe..f933a7491fb 100644 |
| 109 |
--- a/profiles/base/package.use.mask |
| 110 |
+++ b/profiles/base/package.use.mask |
| 111 |
@@ -443,10 +443,6 @@ net-nds/nsscache nssdb |
| 112 |
# java wrappers fail to build (bug #548858) |
| 113 |
=app-admin/setools-3.3.8-r7 java |
| 114 |
|
| 115 |
-# James Le Cuirot <chewi@g.o> (05 Apr 2015) |
| 116 |
-# dev-java/sun-j2me-bin is going away. |
| 117 |
-dev-java/proguard j2me |
| 118 |
- |
| 119 |
# Lars Wendler <polynomial-c@g.o> (19 Mar 2015) |
| 120 |
# >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2 |
| 121 |
games-strategy/freeciv system-lua |
Archives