dev-java/netbeans-platform: version bump

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

4 files changed, 145 insertions, 4 deletions

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index d8d4a13884d6..b87e3ed912dd 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -2,6 +2,9 @@ DIST 418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar 1695373 RMD160 f
 DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 RMD160 4033e5b1d3508c6bbf43c03476967e665b9cbe79 SHA1 a806d99716c5e9441bfd8b401176fddefc673022 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94
 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.1-201112071828-src.zip 171732619 RMD160 8dcfac6a6f19edded24526c327e77b17d0a4bf0a SHA1 7438ff91225683f47bc4c0a3faee437989f03e5b SHA256 245c95fc9d78a1b38dd60fb52d256ca933efd043e2a96f26089f8a80d043d53c
+DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 EBUILD netbeans-harness-7.0.1.ebuild 3698 RMD160 6679234d7f6ddb50fac215e54df9b6ee467d44ce SHA1 2e53f0767b608e37e1eb01c5987d69b63119bbf4 SHA256 0d52557b7d3089dc8f4020051a690a14b138d9bd65e3e6bd09d9906cf527e821
-MISC ChangeLog 1297 RMD160 7e0593c6a7a0cf7ca1317cd12c81e776e2c8f3fb SHA1 e465a89cc4317a5a439aca919de3c81a24a89293 SHA256 03be1073cc69ddbc849f095b33b7be43985e9eaeb65cfdbef0ea861c55fba870
+EBUILD netbeans-harness-7.1.ebuild 3700 RMD160 df1cb4f5858fe377b791b231f393085f0b76a570 SHA1 e6ae771569869a2307d839ee287bb99d67490c45 SHA256 c8d4830f6af0abaf93958086f98855cb80601e9fbc4ece3480c88bd57ad732f2
+MISC ChangeLog 1434 RMD160 e894a4a3acad382bed45640d81fdabb7e7ee2cdb SHA1 64da803a4c48a1b55973ffeb5692fe880bf939de SHA256 0dc84f02dbe93278e179c9a38f48d75a7a9aefe92adafa25cd64d595601ffe40
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index c8b58eb4b602..464999efa902 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/netbeans-platform
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.9 2011/10/25 00:29:42 fordfrog Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/ChangeLog,v 1.10 2012/01/06 10:45:26 fordfrog Exp $
+
+*netbeans-platform-7.1 (06 Jan 2012)
+
+  06 Jan 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-7.1.ebuild:
+  Version bump
 
   25 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org>
   netbeans-platform-7.0.1.ebuild:
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index d73047faee56..4c8c1226a159 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -1,10 +1,15 @@
 DIST 08676C719D33D26DF4F3988E210A04D7F11183B7-felix-2.0.3.jar 284924 RMD160 80d5ed18d6b3fb5e755db364298b0480aad4ddda SHA1 08676c719d33d26df4f3988e210a04d7f11183b7 SHA256 654e4e24680cffaca17ccf43b0028978741fdc25abc7c1cf82a23ae11b160077
 DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 RMD160 477ae7cf30bc7f10e5cc631f6485b3e7f588bf69 SHA1 1c7fe319052ef49126cf07d0db6953cb7007229e SHA256 1503657e36d02befc5433a57f1134209f98f3d193ea30c9ac0553814a8590a21
+DIST 1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar 1147220 RMD160 ff4793c01065d24e07d6105e8b8df2cd6a5a1535 SHA1 1d63b972926d053dfa427ca03841f67d4eac6db2 SHA256 0f7bb96eceea79416c46048f43745cfb937cfaab20619c02d57be022c7468339
 DIST 972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar 234898 RMD160 fb93acac390c2a4b2cc680d3073085f6fcd6e526 SHA1 972e6455724dc6adb1c1912f53b5e3d7df20c5fd SHA256 d80c97da091ccc495479980aca82bb9ade3c3239fbc60b5f3840440ed3fe785d
 DIST 986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar 101276 RMD160 887f80145dde360aa24df4cd9ac8cff16c95e5da SHA1 986195a7e31034ee73f7a896a36b24169692f142 SHA256 f352484ea4d982793637f9c6978ebb283b2b026ec4c5add78b776084f420b8d8
 DIST BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar 23434 RMD160 83c333240433200ff319157d89ea88e1774c1061 SHA1 bd5615c6a15497b60a0aaa9a04d4f05e2bc42d07 SHA256 73bb137228039e9aef458d1ee6272f3c0adcac2d0565d3ad307c60c941d33abf
+DIST F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar 416668 RMD160 de31d5e7d732da26015589c920fe2c0fb79813b9 SHA1 f1c19117b73a6819fa91eb646ecba7f41073dc2a SHA256 292d7dd3f88d0b692a6cf15d1299dc0126d751be0f8e32114a6c94bf3d041bf4
 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.1-201112071828-src.zip 171732619 RMD160 8dcfac6a6f19edded24526c327e77b17d0a4bf0a SHA1 7438ff91225683f47bc4c0a3faee437989f03e5b SHA256 245c95fc9d78a1b38dd60fb52d256ca933efd043e2a96f26089f8a80d043d53c
+DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 EBUILD netbeans-platform-7.0.1.ebuild 5170 RMD160 15fcbe8e1c05515b860b84808b377e7ffa23735c SHA1 aeb755912ea079a82ddeea3d7e53a96a88ea9dcc SHA256 0d1c717b7205100217af9a0dd49cde936567ab0fbf8de929c476f6e79031c941
-MISC ChangeLog 1604 RMD160 edb13a40ea89ba327ed97a2ab7b8955950892847 SHA1 9a1e344191f61046e2bfce3df3984b6f1ef837e7 SHA256 8df2a75e46ac09dc44352d9d9e5bb427bdc946a1c01a10d23ae05ddaeb67fc0b
+EBUILD netbeans-platform-7.1.ebuild 5149 RMD160 a99b1d83ddeb6182d813d2017ffd8403c21f3ac8 SHA1 8d4ab5e14202109919a70c16ed634f844c1f2fee SHA256 84c3f4bdd65c706475975fde87b64fe149437c1880b1962bfd8769f356dd15bd
+MISC ChangeLog 1744 RMD160 70f384dde7a45df7df1f1db9cc205f0dfcfe4710 SHA1 3c2dda0e026a9406d0b327ef7b2caf7bf36c1793 SHA256 a0b4ee0ac43f625d97593aa2b16e3b24804a8c5936b967a72d4a6773701403f5
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-platform/netbeans-platform-7.1.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.1.ebuild
new file mode 100644
index 000000000000..4638ae4f5547
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-7.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-platform/netbeans-platform-7.1.ebuild,v 1.1 2012/01/06 10:45:26 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/final/zip/netbeans-7.1-201112071828-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar
+	http://hg.netbeans.org/binaries/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.2.7:0
+	dev-java/swing-layout:1[source]"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/F1C19117B73A6819FA91EB646ECBA7F41073DC2A-felix-3.2.2.jar libs.felix/external/felix-3.2.2.jar || die
+	ln -s "${DISTDIR}"/1D63B972926D053DFA427CA03841F67D4EAC6DB2-org.eclipse.osgi_3.6.0.v20100517.jar netbinox/external/org.eclipse.osgi_3.6.0.v20100517.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar libs.osgi/external/osgi.core-4.2.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_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 --into core.nativeaccess/external jna platform.jar platform-3.2.7.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.2.7.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# felix-main-2.0.2.jar
+	# felix-2.0.3.jar
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-3.2.7.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.2.7.jar || die
+	# osgi.cmpn-4.2.jar
+	# osgi.core-4.2.jar
+	rm platform-3.2.7.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.2.7.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	# updater.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}