Fixing javascript headers, patch thanks to Arttu Valo <arttuv69@gmail.com> bug #281383

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 54 insertions, 14 deletions

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index bda4bb3f3032..d2e0ce28d308 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/coin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.25 2009/08/12 05:16:07 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.26 2009/09/07 01:26:27 vostorga Exp $
+
+  07 Sep 2009; Víctor Ostorga <vostorga@gentoo.org> coin-3.1.0.ebuild,
+  +files/coin-3.1.0-javascript.patch:
+  Fixing javascript headers, patch thanks to Arttu Valo <arttuv69@gmail.com>
+  bug #281383
 
 *coin-3.1.0 (12 Aug 2009)
 
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 6aca8b4d837b..ec5a45a9559a 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX coin-3.1.0-javascript.patch 1259 RMD160 b5d2b39d7f75bf975efde6e2e96f21ba97894fc0 SHA1 8ab2f91bc9fdf1e23ba49f9cd2cd4f50810dd7aa SHA256 179489dfd99872150cc229d4f9d1bd40a03c67df5daad20741ff8b3a1874a883
 DIST Coin-2.4.5.tar.gz 4721898 RMD160 acf04dcfcb66af1cd98249b63bca2ff40f7b3c1b SHA1 3832a1a64434dcd44b8bf0fecff4ac0fa513eb82 SHA256 fc8d7c03b21cd9f12f396d36af35a4bc88aa412b84e671c495a8e3f46fefd4f8
 DIST Coin-2.5.0.tar.gz 4360148 RMD160 6c846d9b8eac769a45c8279dd45b1312b3c4120a SHA1 19dc61398d843bff120aec9c640ea814c827b577 SHA256 28bebac7f12025c7cf70a89aff4c7e6cd244ce0deae6ce947cc2806ef6db24be
 DIST Coin-3.1.0.tar.gz 5632452 RMD160 0fd8125b08be4d623d2ded14feceb0c70b45eec4 SHA1 369f3b28baa7725ab2a3f0f2cf4ccaa191fcecc5 SHA256 81ec8c4bf0daca6718d6b59eca76354f5f9e1c5a19c20dd4fa173d65f04cb899
 EBUILD coin-2.4.5.ebuild 2197 RMD160 9ac81083209a3c0c2fcbdf17d838af0488f4c8c6 SHA1 dffa6fba616cdc24b7f60e29563ac9a46bc67fbf SHA256 def1d7888b169bb5084fb1f775040f2dc70421b2caa446d8abc0f1b9fb6cf095
 EBUILD coin-2.5.0.ebuild 2198 RMD160 ef8e8c7811c7a6e3a3507d5f1eda83893d91ca97 SHA1 0d44eb52e40debf4df5a7bfc662438bd65b0e87a SHA256 19c0f27f8c45083461a0fc276e9d673881b14e9cd57fb7c94033d7c30e194ac9
-EBUILD coin-3.1.0.ebuild 1615 RMD160 42ba751e3cc817fdfe7563fafa5721cbed3b9e3b SHA1 011d9fe892b26c96c10fd187d34a9ece92a08a79 SHA256 2aebb2978bb096ad406f59f11661f965635517b7e67c1db6044df37f08c5307e
-MISC ChangeLog 3651 RMD160 9f2fa6e9d8ef1f9b3a3a821ed5435aef7cd5c3ae SHA1 f257875d12d22e4455d5822ec89a9ce459563025 SHA256 c2de3c7175805ea8d600f75476a655833a52841b5751a2421b8eee23cff37789
+EBUILD coin-3.1.0.ebuild 1693 RMD160 d6bd7aec2adfc87bc22a636738cebf670a5275e4 SHA1 2ab43437ed03bc658f6f576364ce7a821ebcd866 SHA256 e0edabf980c1e1f1ba2003d6cb2c369f942e2da74c093ec5d626eda35783d299
+MISC ChangeLog 3852 RMD160 91ad057934ed9f6ebccbcb1274cbf807eb1e5d15 SHA1 70ba05c5eedc67af9b472c65a6ba18874940288e SHA256 a42f2d827b1a7259e813b5ffdb130cd052c49b5d125b0b52683f15c6eea8169e
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqCUD8ACgkQiqiDRvmkBmLm0ACePL4kcVf9p5xk/ydUcVFJwpyV
-B8wAn09BtAZfzQ5Mosjv3b1V/+uodO3x
-=XZix
------END PGP SIGNATURE-----
diff --git a/media-libs/coin/coin-3.1.0.ebuild b/media-libs/coin/coin-3.1.0.ebuild
index 707d19f5157d..86c2ff06e216 100644
--- a/media-libs/coin/coin-3.1.0.ebuild
+++ b/media-libs/coin/coin-3.1.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.0.ebuild,v 1.1 2009/08/12 05:16:07 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.0.ebuild,v 1.2 2009/09/07 01:26:27 vostorga Exp $
 
 EAPI=2
 
+inherit eutils
+
 MY_P=${P/c/C}
 S="${WORKDIR}/${MY_P}"
 
@@ -33,6 +35,10 @@ DEPEND="${RDEPEND}
 		doc? ( app-doc/doxygen )
 		dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-javascript.patch"
+}
+
 src_configure() {
 	econf \
 		htmldir=/usr/share/doc/${PF}/html				\
diff --git a/media-libs/coin/files/coin-3.1.0-javascript.patch b/media-libs/coin/files/coin-3.1.0-javascript.patch
new file mode 100644
index 000000000000..f45d9cd78cf6
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.0-javascript.patch
@@ -0,0 +1,38 @@
+Index: src/vrml97/JS_VRMLClasses.h
+===================================================================
+--- src/vrml97/JS_VRMLClasses.h	(revision 13505)
++++ src/vrml97/JS_VRMLClasses.h	(revision 13506)
+@@ -28,6 +28,7 @@
+ #error this is a private header file
+ #endif /* ! COIN_INTERNAL */
+ 
++#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
+ /* ********************************************************************** */
+ 
+ class SoJavaScriptEngine;
+@@ -37,5 +38,6 @@
+ void JS_addVRMLclasses(SoJavaScriptEngine * engine);
+ 
+ /* ********************************************************************** */
++#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT
+ 
+ #endif /* !COIN_JS_VRMLCLASSES_H */
+Index: src/vrml97/JS_VRMLClasses.cpp
+===================================================================
+--- src/vrml97/JS_VRMLClasses.cpp	(revision 13505)
++++ src/vrml97/JS_VRMLClasses.cpp	(revision 13506)
+@@ -2,7 +2,7 @@
+ #include "config.h"
+ #endif // HAVE_CONFIG_H
+ 
+-#ifdef HAVE_VRML97
++#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
+ 
+ /**************************************************************************\
+  *
+@@ -2097,4 +2097,4 @@
+     MFVec3dHandler::jsval2field);
+ }
+ 
+-#endif // HAVE_VRML97
++#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT