commit: 06ec99bd74a6283388d78d4494ee507906a7be6b Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Wed Aug 5 20:25:25 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Aug 5 21:31:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=06ec99bd
[dev-java] Drop unavailable dependency on dev-java/java-sdk-docs dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r17.ebuild | 9 ++++----- dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild | 9 ++++----- dev-java/sun-jdk/metadata.xml | 1 - dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild | 7 +++---- dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild | 7 +++---- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r17.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r17.ebuild index 3c13de4..ad51a58 100644 --- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r17.ebuild +++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r17.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r16.ebuild,v 1.3 2008/12/21 16:12:48 serkan Exp $ +# $Header: $ JAVA_SUPPORTS_GENERATION_1="true" JAVA_VM_BUILD_ONLY="TRUE" @@ -19,7 +19,7 @@ HOMEPAGE="http://www.blackdown.org"; SLOT="1.4.2" LICENSE="sun-bcla-java-vm" KEYWORDS="-* ~amd64 ~x86" -IUSE="X alsa doc examples nsplugin odbc" +IUSE="X alsa examples nsplugin odbc" DEPEND="" RDEPEND="odbc? ( dev-db/unixODBC ) @@ -35,8 +35,7 @@ RDEPEND="odbc? ( dev-db/unixODBC ) x11-libs/libXtst x11-libs/libXt x11-libs/libX11 - ) - doc? ( =dev-java/java-sdk-docs-1.4.2* )" + )" JAVA_PROVIDE="jdbc-stdext" diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild index 8c03b91..056f150 100644 --- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild +++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild,v 1.4 2009/05/29 20:37:25 caster Exp $ +# $Header: $ JAVA_SUPPORTS_GENERATION_1="true" JAVA_VM_BUILD_ONLY="TRUE" @@ -70,7 +70,7 @@ SRC_URI="x86? ( ${X86_JDK_DIST} ) LICENSE="IBM-J1.4" SLOT="1.4" KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86" -IUSE="X alsa doc examples javacomm nsplugin" +IUSE="X alsa examples javacomm nsplugin" RDEPEND="=virtual/libstdc++-3.3 alsa? ( media-libs/alsa-lib ) @@ -82,8 +82,7 @@ RDEPEND="=virtual/libstdc++-3.3 x11-libs/libXtst x11-libs/libXt x11-libs/libX11 - ) - doc? ( =dev-java/java-sdk-docs-1.4.2* )" + )" RESTRICT="fetch" diff --git a/dev-java/sun-jdk/metadata.xml b/dev-java/sun-jdk/metadata.xml index c4cf64b..bc6721b 100644 --- a/dev-java/sun-jdk/metadata.xml +++ b/dev-java/sun-jdk/metadata.xml @@ -4,7 +4,6 @@ <herd>java</herd> <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription> <use> - <flag name="derby">Enable Installation of Bundled Derby (Java DB)</flag> <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag> </use> </pkgmetadata> diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild index 72fd07a..393cc1e 100644 --- a/dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.4.2.19-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.19.ebuild,v 1.4 2009/05/29 20:30:58 caster Exp $ +# $Header: $ JAVA_SUPPORTS_GENERATION_1="true" JAVA_VM_BUILD_ONLY="TRUE" @@ -24,14 +24,13 @@ LICENSE="sun-bcla-java-vm" KEYWORDS="~x86" # files are prestripped RESTRICT="fetch strip" -IUSE="X alsa doc examples jce nsplugin odbc" +IUSE="X alsa examples jce nsplugin odbc" DEPEND="sys-apps/sed app-arch/unzip" RDEPEND=" alsa? ( media-libs/alsa-lib ) - doc? ( =dev-java/java-sdk-docs-1.4.2* ) X? ( x11-libs/libXext x11-libs/libXi diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild index ef77ca1..499033f 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.22-r1.ebuild,v 1.1 2010/03/31 16:11:10 caster Exp $ +# $Header: $ JAVA_VM_BUILD_ONLY="TRUE" @@ -21,7 +21,7 @@ SLOT="1.5" LICENSE="dlj-1.1" KEYWORDS="~amd64 ~x86" RESTRICT="strip" -IUSE="X alsa doc examples jce nsplugin odbc" +IUSE="X alsa examples jce nsplugin odbc" QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so" QA_DT_HASH="opt/${P}/.*" @@ -29,7 +29,6 @@ QA_DT_HASH="opt/${P}/.*" DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )" RDEPEND="sys-libs/glibc alsa? ( media-libs/alsa-lib ) - doc? ( =dev-java/java-sdk-docs-1.5.0* ) X? ( x11-libs/libXext x11-libs/libXi
