dev-java/netbeans-java: fixed check for link in ant directory (bug #443622)

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

6 files changed, 19 insertions, 14 deletions

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 7e7bb32602d6..6765ff3caf8e 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2012/07/25 16:08:19 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/ChangeLog,v 1.21 2012/12/06 13:02:31 fordfrog Exp $
+
+  06 Dec 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-java-7.1.1-r1.ebuild, netbeans-java-7.1.2.ebuild,
+  netbeans-java-7.1.2-r1.ebuild, netbeans-java-7.2.ebuild:
+  fixed check for link in ant directory (bug #443622)
 
 *netbeans-java-7.2 (25 Jul 2012)
 
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 15d3268f5234..e55da220f8a7 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -48,9 +48,9 @@ DIST netbeans-7.2-r1-build.xml.patch.bz2 2476 SHA256 ba0812d86c8d77cc69c75899d5b
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e SHA512 7f28a0b2536ea84ebaba26df072411f62db01873e7803f2e28400b55bd61f0857b5508668bd03894364333edf6b8cf9901b823980a8f51f8d6a711bd3a47cb59 WHIRLPOOL 74dcc47859101722f9879bf0cf2dadd210555560b2fcd036e43ac099c71fe0c712b360aadad8e88092a324c93ff42fc2e467e89e3227f23a24d55b9c9e2c27b6
 EBUILD netbeans-java-7.0.1-r1.ebuild 15026 SHA256 612252dbf2d60a930a8ba68223fcf05ee6adb471adb4a5924b8e965e5832153c SHA512 0136d00acc8a2034584d4194b88704a7b015aa1a1779cc13bba2cc1231ee3fcfb069f287fb779436f95c460f455a46904b9837cd2bf2e38938f7bc68f82219fb WHIRLPOOL 6da11e46d97702b36b1ec6ba731cb8e6692417e23f5a6fe7adb0fada7fbd444249ef70571019da0a8bf0447299b432159f6157f27cc9eaeee043ff41bc2e94b2
 EBUILD netbeans-java-7.0.1-r2.ebuild 15048 SHA256 24360116a64a118eb5e23d7fa14ba59c85a63e0c09326e39d84c6d7a83b00aac SHA512 9ed68c5f02a98dbfa650bb15784c4529389867dfc660174e093dea7947b70a27a1a8cfcadf81ccaf04d07688d7b33cc5fe9ed4a0047e831ef0423ad967a03d8b WHIRLPOOL ac376a28aa3b9560c4cf6630afb889885456b977183c78ca7a48150c173a58813106a1efbad0bb8370ae308086db0585d9185b3f735c1f0b3a4316e376880881
-EBUILD netbeans-java-7.1.1-r1.ebuild 14987 SHA256 030b23babbe705100f68c73d16fb355259b39f564d9162e81112a50ab462b83a SHA512 7c6ca013f8103c07610fbe307c61f66a1b3364034422c4f6ff3a5d6502641cd92bb2e6d72936deadb5e7eb17fdc02e3eb834c6eda5b061840d0b7a623b800f68 WHIRLPOOL 5ce10ac460b165364610847acfe715d651d8abf3fa11e04a60ad3bff3dd69eb5e3882af10ca59e62d11cbae06b890f365a512748497f9e6c3fa25fbb3b22c09f
-EBUILD netbeans-java-7.1.2-r1.ebuild 15003 SHA256 4c8763e62ab18f87ee50cfeba14f9c0cb3f1da2bd96836531cb39aa58a79597d SHA512 98c568fd9a8a29dfaac466a6ce20e9066158e1bb350a11da270690ecbe51069edc6ee4d0cac52c40ab2d9f796ba0e5ff79428fd7a0205382f59e00c01914fc63 WHIRLPOOL 40204e10cabc9acc45ff4b84642b78c9b1d3f26cc8d5b2326c22f1f2c0530202c1074466f98fbacc0f09dbd8e6a5951a199b0894b74ff83a09348d446951a6fa
-EBUILD netbeans-java-7.1.2.ebuild 14984 SHA256 0684de4597601887e19c0fb7554e9a7c093e514c687008c36ec2b708fda28c97 SHA512 3f6a02241294d08f828772b7c5941d579bc53efb8ff281cc0afc97a64d25d398b61b0a5ed94e990e175fb2e7d9f6ecdc033380ace226daa0dfa3171e7c28668a WHIRLPOOL 5cff048fd67c40c65cc4a0afd323c83f6d695cf221d61e4b7bc36a4e03fb36b210ac1d9511a214f03aaf501b05d236214da472e255aa3be86dec0e5f52564b6b
-EBUILD netbeans-java-7.2.ebuild 12274 SHA256 5dbcfb48a05f3650e89977049cd3b12ef2587330207e277944981404052faf96 SHA512 f244be65cd10f8ffeef334404a0dec5ad0f078a3346a84e8214619f2b3674d2f21a4ed2c6009c11d791bbc163a8cf5afcb07a0d636f509b58f13c5eefbd33854 WHIRLPOOL 7dcb8acb13998104a003fc842da1d7925d46166c357578d01e0bd78655ee75669e9bc439bf3f8247c9e32fd0c45d0f8932973a0f7d26cc10c05d2e747ae2fdd3
-MISC ChangeLog 3320 SHA256 2aa46040fc4d9c669163346a804ab8dfc911a65381ab6fc7f230c802c814fb35 SHA512 2073c63b3111f7495d843274bea190961b622f8b33b0576242933a271f9f36c4500622cc9b750ff22e6a03d5e74abe295c28d3d1cef8d798eb194c600088f5b9 WHIRLPOOL fce079fb93415662b6a4e2adefe7c4acd18d66efb068cd27f539b90b01c4bf33c469950480a7acaabafbf5b17a7d235568f11566d93e08e762328358b29ec7f1
+EBUILD netbeans-java-7.1.1-r1.ebuild 15028 SHA256 644f85c7eb4021630706f86c6aeea5fd5228fabf26d1e82fca0e52ea36c83a08 SHA512 9a5603fa2beff17f585f041ae782f234058ea125fbec5bb7dd4c7e24476da91193a5dee307fe4a79001eeb7539f1357a56d0e3f0f4d57cde5554d46084ea08cf WHIRLPOOL 311f643228e0f7576c931d2bb1a4e4f60ea3dc6c779ab262153ab77f3477c8f230272bcd23dcbc3f837623e9c7ff978139b22d46eb7aea53929440ef7c9bd383
+EBUILD netbeans-java-7.1.2-r1.ebuild 15050 SHA256 bec8a0667446997e8d8d70ed96530b07d726c819e4f4f9a795b3aebd740ffca5 SHA512 904292ed98640b9a0ad652a377ac1bcc5e3b38b37b5214b42b8e5936fc8c748e6ee257f23ea63be19d9baa87ff834027dc68541fc1ebddcc188113bdb9df2102 WHIRLPOOL 7df0e59d649694512889fdde625a32e553980f0e9b17644649443567c9219b5acb8525539701a25203e141eeed3bcbe7992220cd20109e350fd00c9cf561254b
+EBUILD netbeans-java-7.1.2.ebuild 15027 SHA256 aceae390386f086fa8e88eb893a3c8a12f137edb651a8c8e0c4e83eccd150851 SHA512 76655876d9cabe550f444d9f9e12028d04ec8cb30a8317328fd63f4fd631f9053665cd9e83b0d7b5b4c6943489ace414d86bfb9dce38100233aa19eda1826db9 WHIRLPOOL abb9aacad2157e7a2cb476d48dc30cd240330d62bdc3f75805112a00f07318416281312979abd5b0253100cfe2c760aeb85956cad166c78ba04cd0b1337d0d05
+EBUILD netbeans-java-7.2.ebuild 12317 SHA256 42cff42e1a7c5a873ea855e48022b7734bad3d670f97102bd8b10e9a6d6b69bb SHA512 f31719bf3cb101470708b1ab7bbfd0b768d62a910d76b432de0d3f20898203def10cab3b4c719bad31d944a81bcaa1789f2e2499b9c36f3a054ab02859b5b5c0 WHIRLPOOL ecaf772357e52564e44ad6f74d3ec76826613dd4c0aaef6bb444628b7f7b57ae11c3696ff247dc2d462f430ffdfc8586f761b36c6a8affaea477acaf576ee4fe
+MISC ChangeLog 3547 SHA256 7d8ac7f83b560b34d69c4506d8d1e668153bfaef61ea299d3ef42c5df533bc84 SHA512 f1a177fab95bb0b251981781032e25bdcb4b3bdf1df13088cc6af88e100d3117f8d0da4eac26107310c6fc79e340a66682c46618ec54fc47731ae4b888a1814d WHIRLPOOL ea410bd19a6ec62be74a3d9ebed6fa3917b3d7ffb8d6eead3e5f63db525e6c807a2eb34f5b59a6e16da535c0bd28f87616783381953d4a709787e8ae57357213
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild
index 02a2cbd6c026..88e7dc4e5cdd 100644
--- a/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.1.1-r1.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.1-r1.ebuild,v 1.3 2012/05/07 06:31:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.1-r1.ebuild,v 1.4 2012/12/06 13:02:31 fordfrog Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -80,7 +80,7 @@ JAVA_PKG_BSFIX="off"
 pkg_pretend() {
 	local die_now=""
 
-	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -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"
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
index 96abb1492a87..47f2507f4429 100644
--- a/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.1.2-r1.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.2-r1.ebuild,v 1.3 2012/05/30 06:02:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild,v 1.4 2012/12/06 13:02:31 fordfrog Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -80,7 +80,7 @@ JAVA_PKG_BSFIX="off"
 pkg_pretend() {
 	local die_now=""
 
-	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -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"
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild
index 1a3f167a607a..c5612228e289 100644
--- a/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.1.2.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.2.ebuild,v 1.1 2012/04/26 21:49:18 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild,v 1.2 2012/12/06 13:02:31 fordfrog Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -80,7 +80,7 @@ JAVA_PKG_BSFIX="off"
 pkg_pretend() {
 	local die_now=""
 
-	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -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"
diff --git a/dev-java/netbeans-java/netbeans-java-7.2.ebuild b/dev-java/netbeans-java/netbeans-java-7.2.ebuild
index 80ec032971ff..a0d28f72a8f2 100644
--- a/dev-java/netbeans-java/netbeans-java-7.2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.2.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.2.ebuild,v 1.1 2012/07/25 16:08:19 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.2.ebuild,v 1.2 2012/12/06 13:02:31 fordfrog Exp $
 
 EAPI="4"
 WANT_ANT_TASKS="ant-nodeps"
@@ -81,7 +81,7 @@ JAVA_PKG_BSFIX="off"
 pkg_pretend() {
 	local die_now=""
 
-	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -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"