netbeans-6.9-r2: removed error message when no class files are found (bug #328357)

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

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index a7a1542074f62595ae5e30f246b3636557e3e5af..e48c7650afda1b50b5653784612e57803f8ea8d1 100644 (file)
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.142 2010/07/08 22:10:01 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.143 2010/07/16 01:38:37 fordfrog Exp $
+
+  16 Jul 2010; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.9-r2.ebuild:
+  Removed error message when no class files are found (bug #328357)
 
 *netbeans-6.9-r2 (08 Jul 2010)
 

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 7eb0ebb21c7219bd97d1667dc4de2a8aa7fb4616..4890cfa5c7f5892fd04754165241f4ca12779a48 100644 (file)
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -34,6 +34,6 @@ EBUILD netbeans-6.5-r4.ebuild 39583 RMD160 158952f34096de9267be8fa499946745b50d5
 EBUILD netbeans-6.7.1.ebuild 42302 RMD160 97684afb2c5ca20d654e03fb44c75918f5bb4f03 SHA1 04502d6b1a6a00eb98f1d3f306aa8d4186d7b7b2 SHA256 367aad17c9ed274ba549a53b4a1a7dacc21534eebb588ab4baf61d7db26c27d1
 EBUILD netbeans-6.7.ebuild 42090 RMD160 96f48f27dadbac4189af2ae56e3d88e1ea94e749 SHA1 7820f23bd52d68a021471bd292106898cb633843 SHA256 a91aba869b0f5d66e91c1aaa2fe1a5bf6799d5632d6a19e858a4661a21a96a6e
 EBUILD netbeans-6.8-r1.ebuild 43136 RMD160 1ed63a12ce46beb4838913c8f65690aaec9d2a3a SHA1 bf2af027925686c64e58a34d60bbe7fada2cac4a SHA256 5b34a9b43e28cefa7518645f2850f480e25701e09b9cbb4afb304cdb893d3d80
-EBUILD netbeans-6.9-r2.ebuild 45990 RMD160 cc0c60aed93810845fdd5e1a9cf9e6786911cb04 SHA1 652db9b0ca2f0114d77004d6718f3a2615f5ad62 SHA256 cbf61a5acc87cdb20ee4aabf38cdd43fd71f3b9e9497e3e73ff12d17c6631093
-MISC ChangeLog 26706 RMD160 a866a825e6ebfa70d51d4576238d9ce0efb6d891 SHA1 17dfb9249cc7ebba4f1c8ca623b859b29d273878 SHA256 e4d1761eec002bbfd77ab9d635860514398acc32693afe643d359a39cbf823f8
+EBUILD netbeans-6.9-r2.ebuild 46059 RMD160 a76d01fb0de80eb5151602e6d7abcf9108b96a29 SHA1 1e8de42b3a199b922e8d1ebe1ca84e8e685a8ed0 SHA256 85f98f30743b35af4bfa9d16706c9c9ebd4d7b0d6c5bb0d385a21b1e1c76326d
+MISC ChangeLog 26851 RMD160 9d894b5cdaa9183f9111cf65f2c59fed4aa4646e SHA1 f8611de841a63b2df5bba0e34d217a3425c31ba6 SHA256 c2a19f5eaf4c5e605ae7c1b9cb7904214424b1380a8ea027c270dbf0619afaaf
 MISC metadata.xml 1301 RMD160 1e12597c731e35626197ed6ff4efc2094aa12e61 SHA1 8b0614fb5db9568c8b489908d62fcafc9b636f84 SHA256 14d98dfb63646fb6bc7d433f9626ffa7801ff1de38535167f9b0528dac0182a9

diff --git a/dev-util/netbeans/netbeans-6.9-r2.ebuild b/dev-util/netbeans/netbeans-6.9-r2.ebuild
index 8495c6b647980e6ae97645308cce78fb3164e4bc..ee96272aa28915e8b042f7b6533a8093ff5be7b6 100644 (file)
--- a/dev-util/netbeans/netbeans-6.9-r2.ebuild
+++ b/dev-util/netbeans/netbeans-6.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9-r2.ebuild,v 1.1 2010/07/08 22:10:01 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9-r2.ebuild,v 1.2 2010/07/16 01:38:37 fordfrog Exp $
 
 EAPI="2"
 WANT_SPLIT_ANT="true"
@@ -457,7 +457,11 @@ src_prepare () {
 
        # Clean up nbbuild
        einfo "Removing prebuilt *.class files from nbbuild"
-       find "${S}" -name "*.class" | xargs rm -v
+       local class_files=`find "${S}" -name "*.class"`
+
+       if [ -n "${class_files}" ] ; then
+               rm -v ${class_files}
+       fi
 
        if [ -z "${JAVA_PKG_NB_USE_BUNDLED}" ] ; then
                place_unpack_symlinks