Revision bump.

 - prevent segfault by configuring with --without-gnomevfs (Bug #203389)
 - don't build the mmedia contrib library (indirectly fixes Bug #174874)
(Portage version: 2.1.4_rc14)

4 files changed, 29 insertions, 12 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index d44ca1bac554..42b9f50a4f16 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.174 2007/12/23 18:28:42 dirtyepic Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.175 2008/01/06 22:47:55 dirtyepic Exp $
+
+*wxGTK-2.8.7.1-r1 (06 Jan 2008)
+
+  06 Jan 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxGTK-2.8.7-mmedia.patch, -wxGTK-2.8.7.1.ebuild,
+  +wxGTK-2.8.7.1-r1.ebuild:
+  Revision bump.
+   - prevent segfault by configuring with --without-gnomevfs (Bug #203389)
+   - don't build the mmedia contrib library (indirectly fixes Bug #174874)
 
   23 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.7.1.ebuild:
   Restore dropped ppc keyword for bug #199594.
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1 b/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1-r1
index 37ff37eafa0c..37ff37eafa0c 100644
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.8.7.1-r1
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
new file mode 100644
index 000000000000..3972fcbe6754
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
@@ -0,0 +1,11 @@
+diff -Naur wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in wxPython-src-2.8.7.1/contrib/src/Makefile.in
+--- wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in	2007-07-27 17:57:27.000000000 -0600
++++ wxPython-src-2.8.7.1/contrib/src/Makefile.in	2007-12-28 17:34:28.000000000 -0600
+@@ -1,6 +1,6 @@
+ # $Id: wxGTK-2.8.7-mmedia.patch,v 1.1 2008/01/06 22:47:55 dirtyepic Exp $
+ 
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet mmedia
+ 
+ all:
+ 	@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.7.1-r1.ebuild
index 87002611d088..8a32c54af79a 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.7.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1.ebuild,v 1.7 2007/12/23 18:28:42 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1-r1.ebuild,v 1.1 2008/01/06 22:47:55 dirtyepic Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -59,16 +59,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# General patches
-
 	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
 	epatch "${FILESDIR}"/${PN}-2.8.4-collision.patch
 	epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch
-
-	# Patches specific to this Version
-
-	# none yet :)
-
+	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch			# Bug #174874
 }
 
 src_compile() {
@@ -89,6 +83,9 @@ src_compile() {
 			$(use_with odbc)"
 
 	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+
 	use X && \
 		myconf="${myconf}
 			--enable-graphics_ctx
@@ -101,7 +98,7 @@ src_compile() {
 			$(use_enable opengl)
 			$(use_with opengl)
 			$(use_with gnome gnomeprint)
-			$(use_with gnome gnomevfs)"
+			--without-gnomevfs"
 
 	# wxBase options
 	use X || \