Add confcache fix

Package-Manager: portage-2.1_rc3

4 files changed, 46 insertions, 10 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index feb3dbc34abb..06b13bc7b628 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/gnash
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.8 2006/05/28 21:27:59 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.9 2006/05/29 00:54:50 genstef Exp $
+
+  29 May 2006; <stefan@gentoo.org>
+  +files/gnash-0.7.1_p20060528-confcache-gtkglext.patch,
+  gnash-0.7.1_p20060528.ebuild:
+  Add confcache fix
 
 *gnash-0.7.1_p20060528 (28 May 2006)
 
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 95675beac50a..49d71a7c85a0 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -1,3 +1,7 @@
+AUX gnash-0.7.1_p20060528-confcache-gtkglext.patch 1243 RMD160 e6b984d5a1812dc3295c9770521319b8614e379f SHA1 0fc67d1182cfde783e9ac0b42c4620820e7de9b1 SHA256 c6a78b2302cca20c7f99f1688a99c57874f23d38ab96d6d92c3a8618d6784220
+MD5 dfb5f91c4a2b2cc4da7bc41405728522 files/gnash-0.7.1_p20060528-confcache-gtkglext.patch 1243
+RMD160 e6b984d5a1812dc3295c9770521319b8614e379f files/gnash-0.7.1_p20060528-confcache-gtkglext.patch 1243
+SHA256 c6a78b2302cca20c7f99f1688a99c57874f23d38ab96d6d92c3a8618d6784220 files/gnash-0.7.1_p20060528-confcache-gtkglext.patch 1243
 AUX gnash-0.7.1_p20060528-opengl.diff 1459 RMD160 25c45abb3427c2db70f2ed8031176b9c7bdf31bc SHA1 11fe9b45ccef8909fcb17c2300e36419d1a714d4 SHA256 8346b49ab7361cc735f22e20b438d49e66203bab78455319e91aa77ac7617984
 MD5 75bf7804629d31f152ce60d2540c5bf4 files/gnash-0.7.1_p20060528-opengl.diff 1459
 RMD160 25c45abb3427c2db70f2ed8031176b9c7bdf31bc files/gnash-0.7.1_p20060528-opengl.diff 1459
@@ -12,14 +16,14 @@ EBUILD gnash-0.7.1.ebuild 2229 RMD160 c274ea987a00dd579ad9c516900c88784821472f S
 MD5 21ff21874073e37af2ac0e9b25e8784a gnash-0.7.1.ebuild 2229
 RMD160 c274ea987a00dd579ad9c516900c88784821472f gnash-0.7.1.ebuild 2229
 SHA256 73e1b49a9568a7d2fed40c9161a4aaacbda27a2505ceb1217b54dd3f1fa54eab gnash-0.7.1.ebuild 2229
-EBUILD gnash-0.7.1_p20060528.ebuild 2312 RMD160 26bc064f6fdf990e3ccd63db6021263eb9247a67 SHA1 1276d8246fa7c0ff8d7017ecd668c13661e4888b SHA256 0b8b9330b589ffb4da0be16a8406a2ea61acc101c283d9eba53b49f69dfac0a0
-MD5 1df1ce246209704eb2df4727afc6576b gnash-0.7.1_p20060528.ebuild 2312
-RMD160 26bc064f6fdf990e3ccd63db6021263eb9247a67 gnash-0.7.1_p20060528.ebuild 2312
-SHA256 0b8b9330b589ffb4da0be16a8406a2ea61acc101c283d9eba53b49f69dfac0a0 gnash-0.7.1_p20060528.ebuild 2312
-MISC ChangeLog 1883 RMD160 08a9db228c5b89ef1512efcd60aa1841a12d0efd SHA1 2852d8242ab747578b145da597a3d861b27cf0da SHA256 099a1c13cf994b9162108e0908696f8efbd7d6c00d28bdf020a43123a2d91b02
-MD5 31c077d4388c386fbd269595aeb47d80 ChangeLog 1883
-RMD160 08a9db228c5b89ef1512efcd60aa1841a12d0efd ChangeLog 1883
-SHA256 099a1c13cf994b9162108e0908696f8efbd7d6c00d28bdf020a43123a2d91b02 ChangeLog 1883
+EBUILD gnash-0.7.1_p20060528.ebuild 2362 RMD160 7f72b2e18c97906f8050fbd2ef8ee15ea8d1afa1 SHA1 12ddabadccd21a5e904aa4cabd20250db50dd2b0 SHA256 e41b420c5139997b1504f08d0703a23b6c554456573a90674b56435c7001af7a
+MD5 2870f3fb276fb8dd35741a3bfd4c6fd7 gnash-0.7.1_p20060528.ebuild 2362
+RMD160 7f72b2e18c97906f8050fbd2ef8ee15ea8d1afa1 gnash-0.7.1_p20060528.ebuild 2362
+SHA256 e41b420c5139997b1504f08d0703a23b6c554456573a90674b56435c7001af7a gnash-0.7.1_p20060528.ebuild 2362
+MISC ChangeLog 2028 RMD160 ab4ecdc235a00b1d0d61ee59b9a3ed6088033bb6 SHA1 4c448218cb9128d85569879c71a0d3eeea41544c SHA256 738198cdecb8e8b4ddc9cef9700f5a13eedc5fd5572a09201487f7228e0f7b57
+MD5 cbf402b440f274c82543b000cddd102b ChangeLog 2028
+RMD160 ab4ecdc235a00b1d0d61ee59b9a3ed6088033bb6 ChangeLog 2028
+SHA256 738198cdecb8e8b4ddc9cef9700f5a13eedc5fd5572a09201487f7228e0f7b57 ChangeLog 2028
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
diff --git a/net-www/gnash/files/gnash-0.7.1_p20060528-confcache-gtkglext.patch b/net-www/gnash/files/gnash-0.7.1_p20060528-confcache-gtkglext.patch
new file mode 100644
index 000000000000..8fd9f7c92969
--- /dev/null
+++ b/net-www/gnash/files/gnash-0.7.1_p20060528-confcache-gtkglext.patch
@@ -0,0 +1,26 @@
+--- gnash/macros/gtkglext.m4.orig	2006-05-29 02:39:53.000000000 +0200
++++ gnash/macros/gtkglext.m4	2006-05-29 02:40:54.000000000 +0200
+@@ -101,12 +101,12 @@
+         for i in $incllist; do
+ 	  if test -f $i/gtk/gtkgl.h; then
+ 	    if test x"$i" != x"/usr/include"; then
+-	      ac_cv_path_glext_incl="$i"
++	      ac_cv_path_glext_incl="-I$i"
+ 	      break
+             fi
+ 	  else
+ 	    if test -f $i/${gnash_glext_topdir}/gtk/gtkgl.h; then
+-	      ac_cv_path_glext_incl="$i/${gnash_glext_topdir}"
++	      ac_cv_path_glext_incl="-I$i/${gnash_glext_topdir}"
+ 	      break
+ 	    fi
+ 	  fi
+@@ -169,7 +169,7 @@
+     libslist="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ 
+     libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+-    ac_cv_path_glext_incl="-I${ac_cv_path_glext_incl}"
++    ac_cv_path_glext_incl="${ac_cv_path_glext_incl}"
+     for i in $libslist; do
+       if test -f $i/gtkglext-${gnash_glext_version}/include/gdkglext-config.h; then
+         ac_cv_path_glext_incl="${ac_cv_path_glext_incl} -I${i}/gtkglext-${gnash_glext_version}/include"
diff --git a/net-www/gnash/gnash-0.7.1_p20060528.ebuild b/net-www/gnash/gnash-0.7.1_p20060528.ebuild
index 27064a3ed450..9156581f291e 100644
--- a/net-www/gnash/gnash-0.7.1_p20060528.ebuild
+++ b/net-www/gnash/gnash-0.7.1_p20060528.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/net-www/gnash/gnash-0.7.1_p20060528.ebuild,v 1.1 2006/05/28 21:27:59 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1_p20060528.ebuild,v 1.2 2006/05/29 00:54:50 genstef Exp $
 
 inherit nsplugins kde-functions autotools
 
@@ -54,6 +54,7 @@ src_unpack() {
 	#Fix a busted opengl as-needed
 	cd ${S}
 	epatch ${FILESDIR}/${P}-opengl.diff
+	epatch ${FILESDIR}/${P}-confcache-gtkglext.patch
 
 	# we want sound
 	sed -i -e "s:bool do_sound = .*:bool do_sound = true;:" backend/gnash.cpp