dev-java/netbeans-nb: version bump

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

6 files changed, 167 insertions, 5 deletions

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 63de1bdd0239..846c176794d3 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,5 +1,7 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
+EBUILD netbeans-ergonomics-7.0.1.ebuild 2948 RMD160 815b7b80a29558ba89ac6c66513069122e668b76 SHA1 db91c374239b5120702c1aa5c4bd2af5f8af7780 SHA256 7adfb8a3b71b4ae904eb899b480394a99368d93b7539ea1b7caff6006bbbf717
 EBUILD netbeans-ergonomics-7.0.ebuild 2942 RMD160 b27df08964dc0952c005d26d56076940b050749a SHA1 820df680367bf679b27a6be9ef3d1431936a699a SHA256 991167ad1fedb91263a58efd17271d4a0cf42fb72060467ff59ddde6c33f274b
-MISC ChangeLog 782 RMD160 cf7646d800ebc4c7d99bb98c4a30a9e34390cd42 SHA1 37f37ed4fb7531ddf3d430f2bf3dea6f8d484f9c SHA256 5340d3fcf41b716a353d915bfe77e5ef378328c809ab99cdd507b9696b7bc066
+MISC ChangeLog 929 RMD160 717f7a3f0dd72b09d5a4a3446ea75b2c07ba7389 SHA1 1dd2b84a4bf94315b5b409e80c80d3749694575d SHA256 b7505d821f0db4c518be293339fb9ff7a82181deaff49eb40ca342080136297e
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index a5ac8c50e9d7..d38c1332a9a7 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -1,6 +1,8 @@
 DIST 559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar 4503584 RMD160 0886cf2b601464a436613854925c5be74b86ec83 SHA1 559c961a6ce793fac94c8040253ea1fbd32b668b SHA256 4e1c36766e9af21519c6f6ee1a6ea21cfc020b253c27aa6d12d58f09c78602f9
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
+EBUILD netbeans-groovy-7.0.1.ebuild 3352 RMD160 30e8f22e4ad2970a7affbb65d9fd6df4f7d23090 SHA1 5c6696fc30d33460a577dca9c6ea978ea3599fc9 SHA256 4089355b6dc589875a38447c3722b7a93d079998cc4c380f6c481773d64d3030
 EBUILD netbeans-groovy-7.0.ebuild 3346 RMD160 6f06cf3511dd546326c3040d5b3a226e6e1146fd SHA1 a365d338b2ba1fb93c180f5262928f63b2ffc124 SHA256 0701092fddd3007d4577ac1edd422bf5324e83b3062bcc409ca11aebb33d34dd
-MISC ChangeLog 742 RMD160 8c7a774df43d5576964f7be7660b262c85a23f5b SHA1 780fb08673242db64f41a9c23c0e0aecd5ecce53 SHA256 1b94713221dcd026838dbbf0a503b3d9354d68d61128429ef99ee6e164c38d12
+MISC ChangeLog 881 RMD160 12f4ce4b56c5c196edad0bc06134fd5d18ffd6f6 SHA1 65d2ea6a51f6eb497ad7b371297120d6a75c1894 SHA256 86428d04c9360db4118e31098c3df481c822258ec0feba92b08bd73d4247352c
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index d6dfb59164e0..a84cd09f1d2c 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -3,6 +3,8 @@ DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 RMD160 b85
 DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 RMD160 e7ad1dd08f29db894e5af4a6fb5455226be36530 SHA1 9c1a8bc9d3270d184f1d1bcc5f60aa81d46e1adf SHA256 d2379466134f239b9dd723f021976e3d2ade9624296d3d4a6d3241beeecfc6ba
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
+EBUILD netbeans-javacard-7.0.1.ebuild 5021 RMD160 af6b563583aca1574f218b1380730cce4f67f2e7 SHA1 26d5ab21e46bac036933315f898f05c7992c9861 SHA256 4892e6d65a730854e906381bd7ab0831ef250d7af72a381e0a3424af118deb86
 EBUILD netbeans-javacard-7.0.ebuild 5015 RMD160 ec1bd812b2d98e12333ae1b299a2507c3aa32e66 SHA1 a18a7e087f3fcc3cce23d6e1f418079dc2655e29 SHA256 11f40d2c57a315c5c0016867e911914dcd26fed4670707d8538867b1ff6041e1
-MISC ChangeLog 762 RMD160 279d3fdae956cf76cf28fc7d542a8ca34a0b6763 SHA1 7798dd6bfd74678eb3d96f23713381bedfdab239 SHA256 6e9f75e323f2f64be900212caa324150ca10e0f49e7f5c5259509cb9aa8e95c4
+MISC ChangeLog 905 RMD160 ef0dd9bee84608ffa516c18368662a4d922c5d65 SHA1 53a394bd3cd51537610e2ee085ebae12f8a9b046 SHA256 bde3a298a8d803f5cbad936e8799b3b56ddb5883dadaf5ed8c0cc6ab9a243d83
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index 18dba97fea8c..53a7da242b8b 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/netbeans-nb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.3 2011/04/21 10:34:34 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.4 2011/08/05 10:25:03 fordfrog Exp $
+
+*netbeans-nb-7.0.1 (05 Aug 2011)
+
+  05 Aug 2011; Miroslav Šulc <fordfrog@gentoo.org> +netbeans-nb-7.0.1.ebuild:
+  Version bump
 
 *netbeans-nb-7.0 (21 Apr 2011)
 
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 6fe7bd2993a8..2baf5ab32003 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -1,7 +1,9 @@
 AUX 7.0/keychain-support.patch 872 RMD160 8063d4dc226f04c6fda72fd9b8837757eb3f3276 SHA1 fd22c305e56cde92cb943cf3bca975ebde7781c4 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-7.0.1-201107282000-src.zip 175987235 RMD160 0104cfeb656f76a7e8041e725c98cff3cc0734cf SHA1 3c5c47b60a4265a8a89d5ab688f6609a613ab1ec SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa
 DIST netbeans-7.0.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a
+EBUILD netbeans-nb-7.0.1.ebuild 5150 RMD160 46640380993621a67d98cbd22965df228140ae8d SHA1 6527cec2d5225c9511fcb547cc6ab2b897cc30f2 SHA256 2f4e2adb4497866de3fef556a6f7e3f8cb5cf7e931e1a862a889a4739a2502fd
 EBUILD netbeans-nb-7.0.ebuild 5144 RMD160 8cfcf1ef1bfc94ecbd024deb9a8497a3f5d5dd26 SHA1 832eb33401e8cde56f51b3fa027b2857ce63015e SHA256 c81863cc47f4488a4e572dea3e3c6ee987dbfdb30e92d6f1ba0f4042df1521e2
-MISC ChangeLog 739 RMD160 0566c7a275eb2fd4bd216eeeb9d9553976e1b5f3 SHA1 ed64780adf95b278a6308816e4786f8d27e3f93d SHA256 f45c10ac9462b60c4144bb32ceee94157f941e98dd3bbc66578aaa1f352dd516
+MISC ChangeLog 868 RMD160 ec1e887e94cf15f6df4a70702d24500f0b056223 SHA1 1f84ebdbec6fc08745ed5aa4dcddd3cee8a83063 SHA256 4a8d120f3a6d5d79fdbd0c171041cb12f5bbbe5c78aeee43e9f7811248c179ba
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49
diff --git a/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild
new file mode 100644
index 000000000000..76343f4c0290
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/netbeans-nb-7.0.1.ebuild,v 1.1 2011/08/05 10:25:03 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE="keychain"
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+	sed -i "s%#netbeans_jdkhome=\"/path/to/jdk\"%netbeans_jdkhome=\"\$(java-config -O)\"%" "${D}"/etc/netbeans-${SLOT}/netbeans.conf || die
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-${SLOT}.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at http://www.gentoo.org/doc/en/keychain-guide.xml"
+	fi
+}