From 913abde5997fd06e4f6666770624c3bb09f9b3c5 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 18 Feb 2016 22:07:50 +0000 Subject: [PATCH] dev-java/annogen: Drop jdk-with-com-sun dep, fix jdk/jre reversal Straight to stable as it shouldn't affect the build and jdk-with-com-sun really needs to go. It still can't just yet but at least ppc64 is clear now. Package-Manager: portage-2.2.27 --- .../{annogen-0.1.0-r2.ebuild => annogen-0.1.0-r3.ebuild} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename dev-java/annogen/{annogen-0.1.0-r2.ebuild => annogen-0.1.0-r3.ebuild} (95%) diff --git a/dev-java/annogen/annogen-0.1.0-r2.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild similarity index 95% rename from dev-java/annogen/annogen-0.1.0-r2.ebuild rename to dev-java/annogen/annogen-0.1.0-r3.ebuild index e37bbd6acdabf..96d70fd8e2e32 100644 --- a/dev-java/annogen/annogen-0.1.0-r2.ebuild +++ b/dev-java/annogen/annogen-0.1.0-r3.ebuild @@ -17,17 +17,16 @@ KEYWORDS="amd64 ~ppc64 ~x86" CDEPEND=" dev-java/qdox:1.6 - dev-java/ant-core:0 - java-virtuals/jdk-with-com-sun:0" + dev-java/ant-core:0" RDEPEND=" ${CDEPEND} - >=virtual/jdk-1.6" + >=virtual/jre-1.6" DEPEND=" ${CDEPEND} app-arch/unzip - >=virtual/jre-1.6" + >=virtual/jdk-1.6" # com.sun.mirror.declaration was removed from JDK 7 onwards. # These two files are just interfaces anyway.