--- branches/magellan-next/core/openjdk/openjdk-6.1.10.4-r1.smage2	2012/01/05 17:03:15	9709
+++ branches/magellan-next/core/openjdk/openjdk-6.1.10.4-r1.smage2	2012/01/05 19:48:49	9714
@@ -34,15 +34,6 @@
 	>= dev-java/rhino-1.7
 	>= sys-dev/java-gcj-compat-1.0.80"
 
-## icedtea-web
-#WEB_DEPEND=">= x11-libs/gtk2+-2.24"
-#JRE_DEPEND="${JRE_DEPEND}
-#	${WEB_DEPEND}"
-#SDEPEND="${SDEPEND}
-#	${WEB_DEPEND}
-#	>= dev-java/junit-4.8.2
-#	>= net-www/npapi-sdk-0.27"
-
 # provided java version
 JAVA_PVER="1.6.0-${PNAME}-${PVER}"
 
@@ -51,22 +42,18 @@
 ICEDTEA_PVER="${PVER/6.}"
 ICEDTEA_SRCFILE="icedtea6-${ICEDTEA_PVER}.tar.gz"
 ICEDTEA_SRCDIR="${BUILDDIR}/icedtea6-${ICEDTEA_PVER}"
-## icedtea6-web (webstart and plugin)
-#ICEDTEA_WEB_PVER="1.1.4"
-#ICEDTEA_WEB_SRCFILE="icedtea-web-${ICEDTEA_WEB_PVER}.tar.gz"
-#ICEDTEA_WEB_SRCDIR="${BUILDDIR}/icedtea-web-${ICEDTEA_WEB_PVER}"
 
 # hardcoded openjdk-pver in icedtea!
 OPENJDK_PVER="b22-28_feb_2011"
 OPENJDK_SRCFILE="openjdk-${PVER:0:1}-src-${OPENJDK_PVER}.tar.gz"
 
 # hardcoded jaxws pver
-JAXWS_PVER="144_01"
-JAXWS_SRCFILE="jaxp${JAXWS_PVER}.zip"
+JAXP_PVER="144_01"
+JAXP_SRCFILE="jaxp${JAXP_PVER}.zip"
 
 # hardcoded jaxp pver
-JAXP_PVER="b20"
-JAXP_SRCFILE="jdk6-jaxp-${JAXP_PVER}.zip"
+JAXWS_PVER="b20"
+JAXWS_SRCFILE="jdk6-jaxws-${JAXWS_PVER}.zip"
 
 # hardcoded jaf pver
 JAF_PVER="b20"
@@ -77,25 +64,22 @@
 SRC_URI=(
 	http://download.java.net/openjdk/jdk6/promoted/${OPENJDK_PVER%-*}/${OPENJDK_SRCFILE}
 	http://icedtea.classpath.org/download/source/${ICEDTEA_SRCFILE}
-	#http://icedtea.classpath.org/download/source/${ICEDTEA_WEB_SRCFILE}
 	http://icedtea.classpath.org/download/drops/${JAXP_SRCFILE}
 	http://icedtea.classpath.org/download/drops/${JAXWS_SRCFILE}
 	http://icedtea.classpath.org/download/drops/${JAF_SRCFILE}
 	mirror://${PNAME}/${OPENJDK_SRCFILE}
 	mirror://${PNAME}/${ICEDTEA_SRCFILE}
-	#mirror://${PNAME}/${ICEDTEA_WEB_SRCFILE}
 	mirror://${PNAME}/${JAXP_SRCFILE}
 	mirror://${PNAME}/${JAXWS_SRCFILE}
 	mirror://${PNAME}/${JAF_SRCFILE}
 	mirror://${PNAME}/${PNAME}-${PVER}-xerces211.patch
 	mirror://${PNAME}/${PNAME}-${PVER}-fix-cmds.patch
+	mirror://${PNAME}/${PNAME}-${PVER}-hardcoded-test-cmds.patch
 	#mirror://${PNAME}/${PNAME}-${PVER}-nonreparenting-wm.patch
 	mirror://${PNAME}/${PNAME}-${PVER}-fontconfig.patch
 )
 
-# upstream pver is something like 6b6
-UP2PVER="${PVER:2:1}b$(echo ${PVER:6} | sed 's/0\([0-9]\)/\1/')"
-UP2DATE="updatecmd -listonly http://download.java.net/openjdk/jdk6/ | grep tar.gz | sed 's:.*/${PNAME}-\(.*\).tar.gz:\1:' | sed 's:\(.*\)-src-\(.*\)-.*:\1\2:'"
+UP2DATE="updatecmd 'http://icedtea.classpath.org/download/source/?C=M;O=A' | grep icedtea6-[0-9] | lasttarball gz | sed 's:\(.*\):6.\1:'"
 
 split_info_openjdk-jre()
 {
@@ -126,13 +110,16 @@
 src_prepare()
 {
 	munpack ${ICEDTEA_SRCFILE} || die
-	#munpack ${ICEDTEA_WEB_SRCFILE} || die
 	cd ${ICEDTEA_SRCDIR}
 
 	# fix build against >=xerces-2.11 which has a xml-api.jar which must be included
 	mpatch ${PNAME}-${PVER}-xerces211.patch || die
 
 	ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die
+	install -d ${ICEDTEA_SRCDIR}/drops || die
+	cp ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
+	cp ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
+	cp ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
 	mautoreconf || die
 }
 
@@ -155,9 +142,6 @@
 		--with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
 		--with-ant-home=${ANT_HOME} \
 		--with-jdk-home=${JDK_HOME} \
-		--with-jaxp-drop-zip=${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} \
-		--with-jaxws-drop-zip=${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} \
-		--with-jaf-drop-zip=${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} \
 		--disable-docs \
 		--disable-zero \
 		--disable-cacao \
@@ -174,20 +158,12 @@
 	# apply our patches here
 	cd ${ICEDTEA_SRCDIR}/openjdk
 	mpatch ${PNAME}-${PVER}-fix-cmds.patch || die
+	mpatch ${PNAME}-${PVER}-hardcoded-test-cmds.patch || die
 	#mpatch ${PNAME}-${PVER}-nonreparenting-wm.patch || die
 	mpatch ${PNAME}-${PVER}-fontconfig.patch || die
 	cd ${ICEDTEA_SRCDIR}
 
 	mmake || die
-
-#	# build iceteaweb
-#	cd ${ICEDTEA_WEB_SRCDIR}
-#	local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"
-#	./configure \
-#		--prefix=${JAVA_DIR}/jre \
-#		--datarootdir=/usr/share \
-#		--with-jdk-home=${ICEDTEA_SRCDIR}/openjdk.build/j2sdk-image \
-#		|| die
 }
 
 src_install_openjdk-jre()
@@ -208,26 +184,11 @@
 	minstallfile openjdk.build/j2sdk-image/jre/lib/fontconfig.Ubuntu.properties.src \
 		${JAVA_DIR}/jre/lib/fontconfig.properties.src || die
 
-	# install desktop-icons
-	minstall_desktop_icon \
-		--name "OpenJDK Monitoring & Management Console" \
-		--file "jconsole.desktop" \
-		--icon "java-openjdk" \
-		--exec "${JAVA_DIR}/bin/jconsole" \
-		
-
 	# get the right platform, needed plugin and env.d script install
 	local PLATFORM="${ARCH}"
 	[[ ${ARCH} = i*86 ]] && export PLATFORM="i386"
 	[[ ${ARCH} = x86_64 ]] && export PLATFORM="amd64"
 
-#	# mozilla-plugin and webstart
-#	# test it here: http://www.java.com/en/download/help/testvm.xml
-#	cd ${ICEDTEA_WEB_SRCDIR}
-#	mmake DESTDIR=${BINDIR} install || die
-#	minstalldir /usr/$(mlibdir)/nsbrowser/plugins || die
-#	mlink ${JAVA_DIR}/jre/lib/IcedTeaPlugin.so /usr/$(mlibdir)/nsbrowser/plugins || die
-
 	# install java environment into /etc/env.d
 	minstalldir /etc/env.d/ || die
 	MCONFIG="/etc/env.d/21java"
@@ -258,7 +219,7 @@
 
 	local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"
 
-	minstalldir /etc/$(mlibdir)/jvm || die
+	minstalldir /usr/$(mlibdir)/jvm || die
 	mcopy -R openjdk.build/j2sdk-image ${JAVA_DIR} || die
 	mchown -R root:root ${JAVA_DIR} || die
 
@@ -272,8 +233,6 @@
 			mlink ../jre/bin/${i} ${JAVA_DIR}/bin/${i} || die
 		fi
 	done
-	# add missing webstart symlink too
-	#mlink ../jre/bin/javaws ${JAVA_DIR}/bin/javaws || die
 
 	# now remove the jre
 	if [[ -d ${BINDIR}/${JAVA_DIR}/jre ]]