--- /usr/portage/dev-util/netbeans/netbeans-5.5-r1.ebuild	2007-01-16 15:37:57.000000000 +0300
+++ netbeans-5.5-r1.ebuild	2007-01-20 16:54:27.000000000 +0300
@@ -36,17 +36,24 @@
 MY_PV=${PV/_/-}
 MY_PV=${MY_PV/./_}
 
-BASELOCATION="http://us1.mirror.netbeans.org/download/${MY_PV/-//}/fcs/200610171010"
+
+BASEURL="http://us1.mirror.netbeans.org/download"
+BASELOCATION="${BASEURL}/${MY_PV/-//}/fcs/200610171010"
 MAINTARBALL="netbeans-${MY_PV}-ide_sources.tar.bz2"
 JAVADOCTARBALL="netbeans-${MY_PV}-javadoc.tar.bz2"
 
+CND_PACKAGE="netbeans-cnd-${MY_PV}-linux.bin"
+CND_PACKAGE_LOCATION="${MY_PV}/cpp/fcs/061123/${CND_PACKAGE}"
+
+
 SRC_URI="${BASELOCATION}/${MAINTARBALL}
-	 doc? ( ${BASELOCATION}/${JAVADOCTARBALL} )"
+	cnd? ( ${BASEURL}/${CND_PACKAGE_LOCATION} )
+	doc? ( ${BASELOCATION}/${JAVADOCTARBALL} )"
 
 LICENSE="Apache-1.1 Apache-2.0 SPL W3C sun-bcla-j2eeeditor sun-bcla-javac sun-javac as-is docbook sun-resolver"
 SLOT="5.5"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="debug doc"
+IUSE="cnd debug doc"
 
 RDEPEND=">=virtual/jre-1.5
 		dev-java/antlr
@@ -147,7 +154,6 @@
 	# fail.
 	#
 	export ANT_OPTS="${ANT_OPTS} -Xmx1g -Djava.awt.headless=true"
-
 }
 
 src_unpack () {
@@ -162,12 +168,26 @@
 		rm -f *.zip
 	fi
 
+	#unpacking netbeans-cnd package (using InstallShield option -is:extract)
+	if use cnd; then
+		einfo "Unpacking ${CND_PACKAGE}..."
+		cp ../distdir/${CND_PACKAGE} ${T}
+		chmod u+x ${T}/${CND_PACKAGE}
+		local dir="istemp`sh ${T}/${CND_PACKAGE} -is:tempdir ${WORKDIR} -is:extract | \
+					sed s,istemp,\|,g | \
+					cut --delimiter=\| --field=2`" || \
+					die "Unpack netbeans-cnd failed"
+		rm ${T}/${CND_PACKAGE}
+		mv "${WORKDIR}/${dir}" "${WORKDIR}/${CND_PACKAGE}"
+	fi
+
 	cd ${S}/nbbuild
 	# Disable the bundled Tomcat in favor of Portage installed version
 	sed -i -e "s%tomcatint/tomcat5/bundled,%%g" *.properties
 
 	set_env
 	place_symlinks
+
 }
 
 src_compile() {
@@ -262,6 +282,16 @@
 	done
 
 	make_desktop_entry netbeans-${SLOT} "Netbeans ${SLOT}" netbeans Development
+
+	#installing netbeans-cnd (using InstallShield setup.jar)
+	if use cnd; then
+		einfo Installing ${CND_PACKAGE}...
+		java "-Duser.home=${T}" -cp "${WORKDIR}/${CND_PACKAGE}/setup.jar" run \
+			-silent \
+			-W "license.selection=1" \
+			-W "beanNbSelectionPanel.nbHome=${D}/${DESTINATION}" || \
+			die "Install ${CND_PACKAGE} failed"
+	fi
 }
 
 pkg_postinst () {