From 09277b3af22dd9c550b9a4bab677bebef2fbbb60 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 11 Sep 2015 07:35:38 +0000
Subject: [PATCH] OpenJDK: break into two packages

---
 dev-lang/openjdk/openjdk-1.8.u40_b27.recipe | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
index d6fe544fb..3323e71b4 100644
--- a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
+++ b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
@@ -9,7 +9,7 @@ OpenJDK is the official Java SE 7 reference implementation."
 HOMEPAGE="http://openjdk.java.net/"
 COPYRIGHT="2015 Oracle and/or its affiliates."
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="hg+http://bitbucket.org/hamishm/haiku-jdk8u#6e3a7c2"
 SOURCE_URI_2="hg+http://bitbucket.org/hamishm/haiku-jdk8u-hotspot#e5ab6f7"
 SOURCE_URI_3="hg+http://bitbucket.org/hamishm/haiku-jdk8u-jdk#9b3967c"
@@ -21,7 +21,7 @@ SOURCE_URI_8="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn#jdk8u40-b27"
 SOURCE_DIR="jdk"
 
 ARCHITECTURES="!x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 DISABLE_SOURCE_PACKAGE=yes
 	# at least as long as Ant and a complete SDK image are part of the sources
@@ -175,4 +175,17 @@ INSTALL()
 	mkdir -p $(dirname $jdkProfile)
 	echo "JAVA_HOME=$jdkDir" > $jdkProfile
 	echo "export JAVA_HOME" >> $jdkProfile
+
+	packageEntries sources \
+		$libDir/openjdk/src.zip \
+		$libDir/openjdk/sample \
+		$libDir/openjdk/demo
 }
+
+SUMMARY_sources="OpenJDK Development Kit (JDK) source files, demos and examples"
+PROVIDES_sources="
+	openjdk$secondaryArchSuffix_sources = $portVersion compat >= 1.8
+	"
+REQUIRES_sources="
+	openjdk$secondaryArchSuffix
+	"