--- /usr/portage/local/layman/java-overlay/dev-java/icedtea6/icedtea6-1.6.2.ebuild	2009-11-11 15:20:26.821675501 +0100
+++ icedtea6-1.6.2.ebuild	2009-11-22 21:38:37.014055241 +0100
@@ -22,7 +22,8 @@
 # Missing options:
 # shark - still experimental, requires llvm which is not yet packaged
 # visualvm - requries netbeans which would cause major bootstrap issues
-IUSE="cacao debug doc examples javascript nio2 nsplugin pulseaudio systemtap xrender zero"
+IUSE="cacao debug doc examples javascript nio2 nsplugin pulseaudio systemtap
+xrender zero shark"
 
 # JTReg doesn't pass at present
 RESTRICT="test"
@@ -52,6 +53,7 @@
 	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
 	 javascript? ( dev-java/rhino:1.6 )
 	 zero? ( sys-devel/gcc[libffi] )
+	 shark? ( sys-devel/llvm )
 	 xrender? ( >=x11-libs/libXrender-0.9.4 )
 	 systemtap? ( >=dev-util/systemtap-0.9.5 ) "
 
@@ -95,17 +97,17 @@
 
 pkg_setup() {
 # Shark support disabled for now - still experimental and needs sys-devel/llvm
-#	if use shark ; then
+	if use shark ; then
 #	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
 #		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
 #		errror "without the shark USE flag turned on."
 #		die "Rebuild without the shark USE flag on."
 #	  fi
-#	  if ( ! use zero ) ; then
-#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-#	  fi
-#	fi
+	  if ( ! use zero ) ; then
+		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
+		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
+	  fi
+	fi
 
 	# quite a hack since java-config does not provide a way for a package
 	# to limit supported VM's for building and their preferred order
@@ -199,6 +201,7 @@
 		$(use_enable nsplugin plugin) \
 		$(use_with javascript rhino ${rhino_jar}) \
 		$(use_enable zero) \
+		$(use_enable shark) \
 		$(use_enable pulseaudio pulse-java) \
 		$(use_enable xrender) \
 		$(use_enable systemtap) \