Only install demo and samples when examples use flag in on

Package-Manager: portage-2.0.53_rc7

4 files changed, 27 insertions, 25 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 94aa60045781..3c1eab4f149c 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.125 2005/10/18 20:22:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.126 2005/11/11 11:21:07 axxo Exp $
+
+  11 Nov 2005; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.4.2.09.ebuild,
+  sun-jdk-1.5.0.05.ebuild:
+  Only install demo and samples when examples use flag in on
 
   18 Oct 2005; Aron Griffis <agriffis@gentoo.org> sun-jdk-1.3.1.13.ebuild,
   sun-jdk-1.3.1.16.ebuild, sun-jdk-1.4.2.08.ebuild,
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index e5181157bc28..216efea97890 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,4 +1,4 @@
-MD5 c38703a43c8922ee47c211218d0db452 ChangeLog 25952
+MD5 3e087930b4b577480831dd5aa23cd95c ChangeLog 26111
 MD5 92fc551c12c9a260dd9ced69d15cf0f3 files/digest-sun-jdk-1.2.2.017 78
 MD5 7339eea38c2cfdfdc4cd777a02c4cbc1 files/digest-sun-jdk-1.3.1.16 76
 MD5 ce8f1c0c94a74aadae5d58b68c254161 files/digest-sun-jdk-1.4.2.09 140
@@ -11,5 +11,5 @@ MD5 50d600429785f626eef0bb4048cbc009 files/sun-jdk-1.5.0.05 613
 MD5 16c9e337522b7e477aece60ff98dde54 metadata.xml 239
 MD5 6e6334f4e89e27aca419bc2dea752336 sun-jdk-1.2.2.017.ebuild 2898
 MD5 89ea449d6a1117e1995a2d7bf53a3d0d sun-jdk-1.3.1.16.ebuild 4149
-MD5 9132c74d8b1734f76b00efbe52a8d642 sun-jdk-1.4.2.09.ebuild 7000
-MD5 5e5cce296140f16860a6ac429ae0d442 sun-jdk-1.5.0.05.ebuild 7486
+MD5 6cd767082a01281468d7ba4a640c79ad sun-jdk-1.4.2.09.ebuild 6868
+MD5 881e1d3c90a77528a35f1953302c7450 sun-jdk-1.5.0.05.ebuild 7350
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild
index 99309085cebb..80098f2098cd 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.09.ebuild,v 1.8 2005/10/18 20:22:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild,v 1.9 2005/11/11 11:21:07 axxo Exp $
 
 inherit java eutils
 
@@ -20,7 +20,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* x86"
 RESTRICT="fetch"
-IUSE="doc browserplugin nsplugin jce mozilla"
+IUSE="doc browserplugin nsplugin jce mozilla examples"
 
 #glibc dep: #102423
 DEPEND=">=dev-java/java-config-1.1.5
@@ -31,8 +31,7 @@ DEPEND=">=dev-java/java-config-1.1.5
 
 RDEPEND="sys-libs/lib-compat"
 
-PROVIDE="virtual/jre
-	virtual/jdk"
+PROVIDE="virtual/jre virtual/jdk"
 
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
 jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
@@ -107,7 +106,10 @@ src_install() {
 	dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
 	dohtml README.html
 	dodir /opt/${P}/share/
-	cp -pPR demo src.zip ${D}/opt/${P}/share/
+	if use examples; then
+		cp -pPR demo ${D}/opt/${P}/share/
+	fi
+	cp -pPR src.zip ${D}/opt/${P}/share/
 
 	if use jce ; then
 		# Using unlimited jce while still retaining the strong jce
@@ -146,10 +148,6 @@ src_install() {
 	domenu ${T}/sun_java.desktop
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
 }
 
 pkg_postinst() {
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild
index 0eaf7148a010..af5f107a8f7d 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.05.ebuild,v 1.4 2005/10/18 20:22:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild,v 1.5 2005/11/11 11:21:07 axxo Exp $
 
 inherit java eutils
 
@@ -27,7 +27,7 @@ SLOT="1.5"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~amd64 -*"
 RESTRICT="fetch nostrip"
-IUSE="doc browserplugin nsplugin jce mozilla"
+IUSE="doc browserplugin nsplugin jce mozilla examples"
 
 #
 DEPEND=">=dev-java/java-config-1.2
@@ -112,18 +112,22 @@ src_unpack() {
 }
 
 src_install() {
-	local dirs="bin include jre lib man"
 	dodir /opt/${P}
 
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
+	for i in bin include jre lib man; do
+		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy ${i}"
 	done
 	dodoc COPYRIGHT LICENSE README.html
 	dohtml README.html
 	dodir /opt/${P}/share/
-	cp -pPR demo src.zip ${D}/opt/${P}/share/
-	if ( use x86 || use amd64 ); then
-		cp -pPR sample ${D}/opt/${P}/share/
+
+	cp -pPR src.zip ${D}/opt/${P}/share/
+
+	if use examples; then
+		cp -pPR demo ${D}/opt/${P}/share/
+		if ( use x86 || use amd64 ); then
+			cp -pPR sample ${D}/opt/${P}/share/
+		fi
 	fi
 
 	if use jce ; then
@@ -164,10 +168,6 @@ src_install() {
 	domenu ${T}/sun_java.desktop
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#	  creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#	  is a directory and will not be gzipped ;)
 }
 
 pkg_postinst() {