Added patches for malformed build.xml files.

Package-Manager: portage-2.1.2_rc2-r3

6 files changed, 93 insertions, 8 deletions

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 9a4cfb4de1ad..aa28fede2fe3 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/netbeans
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.43 2006/12/05 13:17:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.44 2006/12/06 22:45:30 betelgeuse Exp $
+
+  06 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/5.5/jdbcstorage-build.xml-comments.patch,
+  +files/5.5/mdrant-build.xml-comments.patch, netbeans-5.5-r1.ebuild:
+  Added patches for malformed build.xml files.
 
   05 Dec 2006; Vlastimil Babka <caster@gentoo.org> netbeans-5.5-r1.ebuild:
   Fixed jsch dependency to >=dev-java/jsch-0.1.24 to fix bug #157208.
diff --git a/dev-util/netbeans/files/5.5/jdbcstorage-build.xml-comments.patch b/dev-util/netbeans/files/5.5/jdbcstorage-build.xml-comments.patch
new file mode 100644
index 000000000000..500173aeb3cc
--- /dev/null
+++ b/dev-util/netbeans/files/5.5/jdbcstorage-build.xml-comments.patch
@@ -0,0 +1,38 @@
+diff -ur netbeans-src.old/mdr/extras/jdbcstorage/build.xml netbeans-src/mdr/extras/jdbcstorage/build.xml
+--- netbeans-src.old/mdr/extras/jdbcstorage/build.xml	2006-12-06 23:46:13.000000000 +0200
++++ netbeans-src/mdr/extras/jdbcstorage/build.xml	2006-12-06 23:53:28.000000000 +0200
+@@ -1,20 +1,22 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ 
+-<!-- The contents of this file are subject to the terms of the Common Development
+-<!-- and Distribution License (the License). You may not use this file except in
+-<!-- compliance with the License.
+- 
+-<!-- You can obtain a copy of the License at http://www.netbeans.org/cddl.html
+-<!-- or http://www.netbeans.org/cddl.txt.
+ <!-- 
+-<!-- When distributing Covered Code, include this CDDL Header Notice in each file
+-<!-- and include the License file at http://www.netbeans.org/cddl.txt.
+-<!-- If applicable, add the following below the CDDL Header, with the fields
+-<!-- enclosed by brackets [] replaced by your own identifying information:
+-<!-- "Portions Copyrighted [year] [name of copyright owner]"
++
++The contents of this file are subject to the terms of the Common Development
++and Distribution License (the License). You may not use this file except in 
++compliance with the License. 
++ 
++You can obtain a copy of the License at http://www.netbeans.org/cddl.html
++or http://www.netbeans.org/cddl.txt. 
++
++When distributing Covered Code, include this CDDL Header Notice in each file
++and include the License file at http://www.netbeans.org/cddl.txt.
++If applicable, add the following below the CDDL Header, with the fields
++enclosed by brackets [] replaced by your own identifying information:
++"Portions Copyrighted [year] [name of copyright owner]"
+  
+ The Original Software is NetBeans. The Initial Developer of the Original
+-<!-- Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
++Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ Microsystems, Inc. All Rights Reserved.
+ -->
+ 
diff --git a/dev-util/netbeans/files/5.5/mdrant-build.xml-comments.patch b/dev-util/netbeans/files/5.5/mdrant-build.xml-comments.patch
new file mode 100644
index 000000000000..36e9ad19aa8a
--- /dev/null
+++ b/dev-util/netbeans/files/5.5/mdrant-build.xml-comments.patch
@@ -0,0 +1,37 @@
+diff -ur netbeans-src.old/mdr/extras/mdrant/build.xml netbeans-src/mdr/extras/mdrant/build.xml
+--- netbeans-src.old/mdr/extras/mdrant/build.xml	2006-12-07 00:14:08.000000000 +0200
++++ netbeans-src/mdr/extras/mdrant/build.xml	2006-12-07 00:18:35.000000000 +0200
+@@ -1,20 +1,21 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ 
+-<!-- The contents of this file are subject to the terms of the Common Development
+-<!-- and Distribution License (the License). You may not use this file except in
+-<!-- compliance with the License.
+- 
+-<!-- You can obtain a copy of the License at http://www.netbeans.org/cddl.html
+-<!-- or http://www.netbeans.org/cddl.txt.
+ <!-- 
+-<!-- When distributing Covered Code, include this CDDL Header Notice in each file
+-<!-- and include the License file at http://www.netbeans.org/cddl.txt.
+-<!-- If applicable, add the following below the CDDL Header, with the fields
+-<!-- enclosed by brackets [] replaced by your own identifying information:
+-<!-- "Portions Copyrighted [year] [name of copyright owner]"
++The contents of this file are subject to the terms of the Common Development
++and Distribution License (the License). You may not use this file except in
++compliance with the License.
++ 
++You can obtain a copy of the License at http://www.netbeans.org/cddl.html
++or http://www.netbeans.org/cddl.txt.
++ 
++When distributing Covered Code, include this CDDL Header Notice in each file
++and include the License file at http://www.netbeans.org/cddl.txt.
++If applicable, add the following below the CDDL Header, with the fields
++enclosed by brackets [] replaced by your own identifying information:
++"Portions Copyrighted [year] [name of copyright owner]"
+  
+ The Original Software is NetBeans. The Initial Developer of the Original
+-<!-- Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
++Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ Microsystems, Inc. All Rights Reserved.
+ -->
+ 
diff --git a/dev-util/netbeans/files/digest-netbeans-4.0-r2 b/dev-util/netbeans/files/digest-netbeans-4.0-r2
index 86112c46c714..6738b50385f4 100644
--- a/dev-util/netbeans/files/digest-netbeans-4.0-r2
+++ b/dev-util/netbeans/files/digest-netbeans-4.0-r2
@@ -1,2 +1,4 @@
 MD5 c851459f64b3e8586b616463a1ad75e8 netbeans-4_0-docs-javadoc.tar.bz2 12728428
 MD5 a5488c563b93b3181cfeccbb67ee761c netbeans-4_0-src-ide_sources.tar.bz2 53877180
+RMD160 7720ef5d53869316437c35d3c54bd50fe2f58143 netbeans-4_0-src-ide_sources.tar.bz2 53877180
+SHA256 3d65584f74a43d4f4e3b41f85b1f719c4867488d91f31116ef3d5746dc4faf14 netbeans-4_0-src-ide_sources.tar.bz2 53877180
diff --git a/dev-util/netbeans/metadata.xml b/dev-util/netbeans/metadata.xml
index e78f15d30351..e8ff72847918 100644
--- a/dev-util/netbeans/metadata.xml
+++ b/dev-util/netbeans/metadata.xml
@@ -11,14 +11,14 @@
 	</maintainer>
 
 	<longdescription>
-NetBeans is dedicated to providing rock solid software development products (NetBeans IDE, NetBeans Platform) that address the needs 
-of developers, users and the businesses who rely on NetBeans as a basis for their products. NetBeans is also a vibrant community 
-where people from just about any country you can think of, have the ability ask questions, give advice, make a wide variety of 
-contributions and ultimately share in the success of our products. You will find students on our mailing list, developers from top 
+NetBeans is dedicated to providing rock solid software development products (NetBeans IDE, NetBeans Platform) that address the needs
+of developers, users and the businesses who rely on NetBeans as a basis for their products. NetBeans is also a vibrant community
+where people from just about any country you can think of, have the ability ask questions, give advice, make a wide variety of
+contributions and ultimately share in the success of our products. You will find students on our mailing list, developers from top
 companies and individuals looking to sharpen their skills.
 
-In June of 2000 NetBeans was made Open Source by Sun Microsystems who remains the project sponsor. Today two products exist: the 
-NetBeans IDE and NetBeans Platform. Both products are free for commercial and noncommercial use. The source code to both are available 
+In June of 2000 NetBeans was made Open Source by Sun Microsystems who remains the project sponsor. Today two products exist: the
+NetBeans IDE and NetBeans Platform. Both products are free for commercial and noncommercial use. The source code to both are available
 to anyone, to reuse as they see fit, under the terms of use.
 	</longdescription>
 
diff --git a/dev-util/netbeans/netbeans-5.5-r1.ebuild b/dev-util/netbeans/netbeans-5.5-r1.ebuild
index d5b902d5a757..f2c9548c7384 100644
--- a/dev-util/netbeans/netbeans-5.5-r1.ebuild
+++ b/dev-util/netbeans/netbeans-5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r1.ebuild,v 1.3 2006/12/05 13:17:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r1.ebuild,v 1.4 2006/12/06 22:45:30 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -153,6 +153,9 @@ set_env() {
 src_unpack () {
 	unpack ${MAINTARBALL}
 
+	epatch "${MY_FDIR}/jdbcstorage-build.xml-comments.patch"
+	epatch "${MY_FDIR}/mdrant-build.xml-comments.patch"
+
 	if use doc; then
 		mkdir javadoc && cd javadoc
 		unpack ${JAVADOCTARBALL} || die "Unable to extract javadoc"