Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/annogen/
Date: Thu, 18 Feb 2016 22:11:34
Message-Id: 1455833332.913abde5997fd06e4f6666770624c3bb09f9b3c5.chewi@gentoo
1 commit: 913abde5997fd06e4f6666770624c3bb09f9b3c5
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 18 22:07:50 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 18 22:08:52 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913abde5
7
8 dev-java/annogen: Drop jdk-with-com-sun dep, fix jdk/jre reversal
9
10 Straight to stable as it shouldn't affect the build and
11 jdk-with-com-sun really needs to go. It still can't just yet but at
12 least ppc64 is clear now.
13
14 Package-Manager: portage-2.2.27
15
16 .../annogen/{annogen-0.1.0-r2.ebuild => annogen-0.1.0-r3.ebuild} | 7 +++----
17 1 file changed, 3 insertions(+), 4 deletions(-)
18
19 diff --git a/dev-java/annogen/annogen-0.1.0-r2.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild
20 similarity index 95%
21 rename from dev-java/annogen/annogen-0.1.0-r2.ebuild
22 rename to dev-java/annogen/annogen-0.1.0-r3.ebuild
23 index e37bbd6..96d70fd 100644
24 --- a/dev-java/annogen/annogen-0.1.0-r2.ebuild
25 +++ b/dev-java/annogen/annogen-0.1.0-r3.ebuild
26 @@ -17,17 +17,16 @@ KEYWORDS="amd64 ~ppc64 ~x86"
27
28 CDEPEND="
29 dev-java/qdox:1.6
30 - dev-java/ant-core:0
31 - java-virtuals/jdk-with-com-sun:0"
32 + dev-java/ant-core:0"
33
34 RDEPEND="
35 ${CDEPEND}
36 - >=virtual/jdk-1.6"
37 + >=virtual/jre-1.6"
38
39 DEPEND="
40 ${CDEPEND}
41 app-arch/unzip
42 - >=virtual/jre-1.6"
43 + >=virtual/jdk-1.6"
44
45 # com.sun.mirror.declaration was removed from JDK 7 onwards.
46 # These two files are just interfaces anyway.