dev-java/netbeans-java: version bump

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

5 files changed, 53 insertions, 31 deletions

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index d325fbf4c098..9b7bca79be0f 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/netbeans-java
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/ChangeLog,v 1.10 2012/02/19 12:32:23 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/ChangeLog,v 1.11 2012/03/05 14:15:47 fordfrog Exp $
+
+*netbeans-java-7.1.1 (05 Mar 2012)
+
+  05 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  -netbeans-java-7.1-r1.ebuild, +netbeans-java-7.1.1.ebuild:
+  Version bump
 
 *netbeans-java-7.1-r1 (19 Feb 2012)
 
diff --git a/dev-java/netbeans-java/netbeans-java-7.1-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.1.ebuild
index 0f575c85f505..99dee063c3c0 100644
--- a/dev-java/netbeans-java/netbeans-java-7.1-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1-r1.ebuild,v 1.1 2012/02/19 12:32:24 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.1.ebuild,v 1.1 2012/03/05 14:15:47 fordfrog Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -9,11 +9,11 @@ inherit eutils java-pkg-2 java-ant-2
 DESCRIPTION="Netbeans Java Cluster"
 HOMEPAGE="http://netbeans.org/projects/java"
 SLOT="7.1"
-SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1/final/zip/netbeans-7.1-201112071828-src.zip"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.1/final/zip/netbeans-7.1.1-201203012225-src.zip"
 SRC_URI="${SOURCE_URL}
 	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
 	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
+	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
 	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
 	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
 	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
@@ -65,7 +65,6 @@ RDEPEND=">=virtual/jdk-1.6
 	dev-java/jsr250:0
 	dev-java/jta:0
 	dev-java/jtidy:0
-	>=dev-java/maven-bin-3.0.3:3.0
 	dev-java/saaj:0
 	dev-java/stax-ex:0
 	dev-java/xmlstreambuffer:0"
@@ -78,6 +77,29 @@ EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloade
 EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
 JAVA_PKG_BSFIX="off"
 
+pkg_pretend() {
+	local die_now=""
+
+	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+		eerror "Please remove following symlinks and run emerge again:"
+		find /usr/share/netbeans-java-${SLOT}/ant -type l
+		die_now="1"
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
 src_unpack() {
 	unpack $(basename ${SOURCE_URL})
 
@@ -88,7 +110,7 @@ src_unpack() {
 
 	pushd "${S}" >/dev/null || die
 	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
-	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-bin.zip || die
+	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
 	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
 	ln -s "${DISTDIR}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
 	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
@@ -168,21 +190,21 @@ src_install() {
 	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
 
 	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
+	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
 	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
 	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
 	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
 	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
 
-	insinto ${INSTALL_DIR}/ant
-	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	doins -r ant/extra
-	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	doins -r ant/nblib
-	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+	#insinto ${INSTALL_DIR}/ant
+	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
+	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
+	#doins -r ant/extra
+	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
+	#doins -r ant/nblib
+	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
+	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
+	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
 
 	popd >/dev/null || die
 
@@ -294,9 +316,3 @@ src_install() {
 
 	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
 }
-
-pkg_postinst() {
-	elog "Note that if you change your version of ant, you have to re-emerge"
-	elog "this package to get updated the link to ant tasks of that specific"
-	elog "version."
-}
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 6a402b829ea8..da8b9ecff00d 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -3,9 +3,9 @@ AUX 7.1/keychain-support.patch 872 RMD160 8063d4dc226f04c6fda72fd9b8837757eb3f32
 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
-DIST netbeans-7.1-201112071828-src.zip 171732619 RMD160 8dcfac6a6f19edded24526c327e77b17d0a4bf0a SHA1 7438ff91225683f47bc4c0a3faee437989f03e5b SHA256 245c95fc9d78a1b38dd60fb52d256ca933efd043e2a96f26089f8a80d043d53c
+DIST netbeans-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 EBUILD netbeans-nb-7.0.1.ebuild 5225 RMD160 e52b5c5d7a7f5bda1e106fcd34820c89bfd4a288 SHA1 20694202bd558d893003a2c278f3a270976371c8 SHA256 1a21df7cc55b4dd8d97a3106c41f65b61a916f30138b8cdac32f03648d03071e
-EBUILD netbeans-nb-7.1.ebuild 5090 RMD160 9e4e60aa0f255b3135ce4e5ab99b94ae0400520b SHA1 ec94d35a23d96f887c6f2d270fcc98d99cab63e7 SHA256 6751f3e054f5719633d1c58771e8dbf1f6acfc3cec84bc0beac0ffbf77f95eda
-MISC ChangeLog 1458 RMD160 0f797be7140789436574811bc43ef14d7effdf13 SHA1 bd46f567ef6ed95080e080ed453f296532f600fe SHA256 442d2d5e32edbdf0b4a6beb1751bcc19731986cd6389a134e042e84ba18e3b65
+EBUILD netbeans-nb-7.1.1.ebuild 5096 RMD160 1219b382c9678a6c79668ba42b8a034c2bb72b10 SHA1 9637b00e5355511081279094b3d2267d1a3cb02b SHA256 24174b3bec274f00ce5c8f8bfa8a7c38be28347a98fb7182665f9c5893a50dd2
+MISC ChangeLog 1614 RMD160 2b95233378853ec0418f84375d7633d89185158d SHA1 7360740cd42568cdd84da0936fc95f373dc0c966 SHA256 977577065ee5a78138434c5abb27d0f82ae4a6cb7d5c2d087a3d2d307978dddb
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 6febc73753eb..5835ba63579d 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -5,9 +5,9 @@ DIST BB8CBBD70CCD7ABF40943487C48512D82FB01AE9-phpsigfiles.zip 498740 RMD160 aa0e
 DIST C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip 421035 RMD160 8a739c44280b1f239a1ef645ca2a8d43d1cc4ad8 SHA1 c3e8fc2f69123f598f29f930dc39f5b55a08824c SHA256 0622147048e07b8ca59c2674d28327880264d05b775964d032e91f5101f7abd4
 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-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 EBUILD netbeans-php-7.0.1.ebuild 4262 RMD160 c16cb42c8c8921171d38dceba3482c293abed8f9 SHA1 3cf9439d47e062b318ec198ae2d913bbd4452367 SHA256 e6fa9381a005de8e00cbb37634372427fbea1ae5b004a29db0595b9f17e990d1
-EBUILD netbeans-php-7.1.ebuild 4045 RMD160 c2bde84f168696d1cf3fcd661adf3e4f7f196c7b SHA1 5fcd8a1c4b0b25ced0a070708f867b041fa64a03 SHA256 f7ca25e898f415a262dba6e7a562d05ca14fc218f6797860d96fb6b7811391b7
-MISC ChangeLog 1356 RMD160 48982e24cba4073bb845215d980723f87e4d6aa3 SHA1 66137e3c3f36244051e37a29f3829799ab18049b SHA256 95ef32e2a35ccf49cf72bd53e8def281f5fa6be3ba48fe9370fadc7551874123
+EBUILD netbeans-php-7.1.1.ebuild 4051 RMD160 dbbb733a7f6cd4e0135ae6710f8d1585eb2eaac4 SHA1 76514f7a0a6570ac060c086e8bb22ac99237afba SHA256 3bd6fa9438b7d249becab05c2b1de5e353571df48ae096116a689fe7b02864ab
+MISC ChangeLog 1515 RMD160 47690458305a5c236f8da85e6c9ee367bca6c007 SHA1 279e7188bfe8aeceb25611fc5a63c170aac1ab60 SHA256 352aef85ca171b2859135ebd9371f58c86cdd53595884a9ffe8728a168063664
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index d48ff5ac6a23..ab44b8d65cb3 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,8 +1,8 @@
 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-7.1.1-201203012225-src.zip 172146133 RMD160 2c8f5798bab20b2f219cbe07931776191470a5e0 SHA1 a2d1b0fa5550d0071cd45f79998851fdd4516f79 SHA256 a8ff48a5837f7952cf305d70b511c4abb77d6f1639fc7de1578aac75274450d4
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 EBUILD netbeans-profiler-7.0.1.ebuild 3234 RMD160 1bab3fda7565e8429f670c5da0d604ec7cfb28a2 SHA1 0184f5a27d50a95e3fbedab43b8e248cd999a7f4 SHA256 e6d283bf01225547790f843221a2bde5b66e3edce822e7c6adf7096658903d29
-EBUILD netbeans-profiler-7.1.ebuild 3237 RMD160 9e15191b623b67ee3a198f84897ae68754bb8f00 SHA1 bf0434958f9072e55689de952678009b1a151b87 SHA256 cb3ebacbad9c6cf33bd48cb78725436d16a2438ae938272b7cce6d7594700511
-MISC ChangeLog 1313 RMD160 4c29d02772cfa5115e669971aa1bf7a7ef8860aa SHA1 e90bcf22c8adb1a00b8d110e0efd7c4bd8e355f4 SHA256 2df01a3d88ebee8753b1b75c1a3949546d20da1da34a6da50aa50c321c673583
+EBUILD netbeans-profiler-7.1.1.ebuild 3243 RMD160 e8214242d716e44ef716656a0fbe5346a1a932a3 SHA1 a9696a2a2bf2d3348a2e9d5d7f94094d313c2fa5 SHA256 987ff9e93c165ccb965999b36cc93e1920b220add058da5e9d3e7349671878a6
+MISC ChangeLog 1487 RMD160 ac77609a7dd1193d09734b1e741b4b3c234cf686 SHA1 932322cc1797a3278a05a2b8afe2d236d8be040e SHA256 b87c0d66d47325c89c1a188246ed9e1c396380ef041aeb223850f4401297c9c6
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003