--- netscape-flash-9.0.31.0.ebuild.old	2007-01-20 18:18:51.000000000 -0800
+++ netscape-flash-9.0.31.0.ebuild	2007-01-21 01:05:33.000000000 -0800
@@ -11,12 +11,11 @@
 SRC_URI="!debug? ( http://fpdownload.macromedia.com/get/flashplayer/current/${MY_P}.tar.gz )
 	http://fpdownload.macromedia.com/pub/flashplayer/updaters/9/${MY_PD}.tar.gz"
 HOMEPAGE="http://www.adobe.com/"
-IUSE="debug"
+IUSE="debug nsplugin"
 SLOT="0"
 
 KEYWORDS="-* ~amd64 ~x86"
 LICENSE="AdobeFlash-9.0.31.0"
-S=${WORKDIR}/install_flash_player_9_linux
 RESTRICT="strip mirror"
 
 S=${WORKDIR}
@@ -54,17 +53,24 @@
 }
 
 src_install() {
-	dobin flashplayer
+	dodir /opt/bin
+	exeinto /opt/bin
+	doexe flashplayer
 
+	# this is the readme for the standalone player with or without debugging
+	# and the plugin *with* debugging
 	dodoc ${MY_PD}/README
-	use debug || dodoc ${MY_P}/Readme.txt
-	
-	cd ${MY_P}
-	exeinto /opt/netscape/plugins
-	doexe libflashplayer.so
-	insinto /opt/netscape/plugins
-	doins flashplayer.xpt
+	# this is the readme for the plugin *without* debugging
+	use debug || use nsplugin && dodoc ${MY_P}/Readme.txt
 
-	inst_plugin /opt/netscape/plugins/libflashplayer.so
-	inst_plugin /opt/netscape/plugins/flashplayer.xpt
+	if use nsplugin; then
+		cd ${MY_P}
+		exeinto /opt/netscape/plugins
+		doexe libflashplayer.so
+		insinto /opt/netscape/plugins
+		doins flashplayer.xpt
+
+		inst_plugin /opt/netscape/plugins/libflashplayer.so
+		inst_plugin /opt/netscape/plugins/flashplayer.xpt
+	fi
 }