- Fix nested HTML tables (bug #264544, Ivan Trombley)

- Add missing gconf dependency with USE=gstreamer (bug #267022, Morten Lied
  Johansen)
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

6 files changed, 207 insertions, 12 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 0a3d4cc93766..66bd75df6852 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.220 2009/02/21 22:20:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.221 2009/04/25 02:25:43 dirtyepic Exp $
+
+*wxGTK-2.8.9.2-r1 (25 Apr 2009)
+
+  25 Apr 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxGTK-2.8.9.2-nestedtables.patch, wxGTK-2.8.9.1-r3, wxGTK-2.8.9.2,
+  +wxGTK-2.8.9.2-r1.ebuild:
+  - Fix nested HTML tables (bug #264544, Ivan Trombley)
+  - Add missing gconf dependency with USE=gstreamer (bug #267022, Morten Lied 
+    Johansen)
 
 *wxGTK-2.8.9.2 (21 Feb 2009)
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 27ffc8243ab9..add9d64c19d1 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -12,19 +12,21 @@ AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19
 AUX wxGTK-2.8.7-race-fix.patch 3623 RMD160 a05a4c1c6f7b5452c1dad3ec8a5806d8344e1e64 SHA1 0d98de48b4f4f5fa06c33fc1c2aa2b3f9a775417 SHA256 c463e541c0a8d4e856698a85afb5cad9c46f687988c047a6e32b55648cad4ca8
 AUX wxGTK-2.8.8-collision.patch 6072 RMD160 28101d936ed94190fa9a38c707f804c113a3e413 SHA1 66a7d717c5f3dc78fc3f0b451de178423b255399 SHA256 21949c67d2977a5bb59e22e73fcbeb8631462ec38fc864d4975309b3f24d69a0
 AUX wxGTK-2.8.9-dont-touch-my-bools.patch 872 RMD160 931ba9d7b4929a2c44b6866c61fec115498de143 SHA1 eddfb0ab5d3b934ac82969badd6dfd9ecba81d91 SHA256 2c7bfd887374adce1f35889d8876a608a2e3d8c64566667cd38e1124998ebd69
+AUX wxGTK-2.8.9.2-nestedtables.patch 773 RMD160 82a481f6ec6ad668308ddf1b10803f46d344eb14 SHA1 74e37c2d44d44cd335ff469be42006d2dbb7ddf3 SHA256 a0509fbfc428c4706818c972c49da447dea75808fa856fcce6872acafcc7976c
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.9.1.tar.bz2 27969655 RMD160 2b193c867a028985f8ead4084a9c1f024a1d37c6 SHA1 7359af790d58082330c867f5c10f51b6382d9a35 SHA256 584bc8a90e413409c20d1aff05bf547809fc2b57b74c5aba60fc3a2a98a0e7fa
 DIST wxPython-src-2.8.9.2.tar.bz2 29370216 RMD160 93a9bd35b59e16674375b1431e24d47b58a824d2 SHA1 a0d58d8b9606d04a35b9853da15eb7dfb08d5637 SHA256 0683ef245d7c121dea7f16f08f0d2cd77348d588e6831cc3bc88cf23dc6029b5
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
 EBUILD wxGTK-2.6.4.0-r4.ebuild 4710 RMD160 08573f1b1e490e6d08ef282b08b4805653062757 SHA1 beebb30d9eadf9cd1938927adbdb2ebef734c6b4 SHA256 8c4fb921e21b30fb18ba73827939af2b84f148c7f945587f4a3839237789b068
-EBUILD wxGTK-2.8.9.1-r3.ebuild 3471 RMD160 fe0168ddc154d3a0c966e7b9b2a2b054c565f34a SHA1 9d5a5ed39b7525c6ac3f4c3e929d7ef3ea3fcd88 SHA256 3cbf7b7a7f42742a71fca64153d9e39ea1e39715783855c4fc6b89c288ef7150
-EBUILD wxGTK-2.8.9.2.ebuild 3525 RMD160 5828c57305d49ebc6f0d2d4ca18c27b5944c4153 SHA1 0ca8945111ce0c932da3741142d65ee6955c0092 SHA256 1fdffe924767d1127c65d327ad0b342e70c564d6f6eaf6e29942ef94b204f715
-MISC ChangeLog 34329 RMD160 af4edb9ceb7a261942a7c3704deed5da8ffafd45 SHA1 bb69644de82fc0b3ab465b3e9dd5dc906b4bbe2d SHA256 71927d9f00d6ecd1ce5229a14821795b5abcd2ee83994360cadbc97a0f893cf5
+EBUILD wxGTK-2.8.9.1-r3.ebuild 3503 RMD160 1cf46a38c02ff151e695ba1cc52a7cf27e020977 SHA1 69e5b404de10168c7a8ff7060d0fdec947c63d0a SHA256 4eac832ee9ee321fbedb5b5096e807553115edf2eb37c9aa0616d732cd5b3c80
+EBUILD wxGTK-2.8.9.2-r1.ebuild 3631 RMD160 e2a708203df47021c89d934389a221378deb4e45 SHA1 156f00e2dbff86f81750938266beafc9d136d6d7 SHA256 9c6c499f711444780d0cddc5fdedbca70d2c1f3689bc549c9e758818e145760c
+EBUILD wxGTK-2.8.9.2.ebuild 3554 RMD160 aec0958e3971636231de959ffce7c0918190371a SHA1 7307120c9bc905f7357e9dd589522c2d5ca15cf0 SHA256 610fa1554db375cfec962e4ce73c3af372145bbdc1d1ceb54a1726c88e66d0a4
+MISC ChangeLog 34664 RMD160 de499cfb4fbb10481265dc1ca728aca23ee04083 SHA1 990c6e9e4b5fe0a6a413f32d14b5fb8b0fe9ba78 SHA256 3496cf6fba9ed9cb557f471993db9618c1aa5d55614722caecfa71e4231b9bba
 MISC metadata.xml 500 RMD160 d0f05c0d915928bc4c424ca00f20621805ddc7f0 SHA1 3ba77d570e4764cf377b3e63078b21f69232a1fc SHA256 2592b31d76fd0a79aa634bcbc9697d7ee8420b89cbead01a8db562a4d66be98c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmgfpcACgkQiqiDRvmkBmIbKwCgvp3gdRd1ECxP8HbZBvIzoghj
-2MAAnRydPJjgdvVwR8nPzLLrDEY40WPA
-=7ifH
+iEYEARECAAYFAknydSsACgkQiqiDRvmkBmLOogCeKTxIPtOkYoUWA33Wom4Twi4K
+LwQAn1ZcH0P4zDxf7+pGd4PiHLx1PoHq
+=q3wX
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch b/x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch
new file mode 100644
index 000000000000..2448d0a6866e
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.9.2-nestedtables.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/show_bug.cgi?id=264544
+http://trac.wxwidgets.org/ticket/10370
+
+--- wxPython-src-2.8.9.2-orig/src/html/m_tables.cpp
++++ wxPython-src-2.8.9.2/src/html/m_tables.cpp
+@@ -684,6 +684,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH
+         {
+             wxHtmlTableCell *oldt = m_Table;
+ 
++            wxHtmlContainerCell *oldEnclosing = m_enclosingContainer;
+             m_enclosingContainer = c = m_WParser->OpenContainer();
+ 
+             m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
+@@ -722,6 +723,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH
+             m_WParser->CloseContainer();
+ 
+             m_Table = oldt;
++            m_enclosingContainer = oldEnclosing;
+ 
+             return true; // ParseInner() called
+         }
diff --git a/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild b/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild
index b762a3388d31..5b722adacd17 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild,v 1.8 2009/02/15 15:19:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild,v 1.9 2009/04/25 02:25:43 dirtyepic Exp $
 
 EAPI="2"
 
@@ -32,7 +32,9 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
 		gnome?  ( gnome-base/libgnomeprintui )
-		gstreamer? ( >=media-libs/gstreamer-0.10 )
+		gstreamer? (
+			>=gnome-base/gconf-2.0
+			>=media-libs/gstreamer-0.10 )
 		opengl? ( virtual/opengl )
 		)"
 
diff --git a/x11-libs/wxGTK/wxGTK-2.8.9.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.9.2-r1.ebuild
new file mode 100644
index 000000000000..fbd8e71d0f67
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.9.2-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2-r1.ebuild,v 1.1 2009/04/25 02:25:43 dirtyepic Exp $
+
+EAPI="2"
+
+inherit eutils versionator flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc debug gnome gstreamer odbc opengl pch sdl"
+
+RDEPEND="
+	dev-libs/expat
+	odbc?   ( dev-db/unixODBC )
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=x11-libs/gtk+-2.4
+		>=dev-libs/glib-2.4
+		media-libs/jpeg
+		media-libs/tiff
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		gnome?  ( gnome-base/libgnomeprintui )
+		gstreamer? (
+			>=gnome-base/gconf-2.0
+			>=media-libs/gstreamer-0.10 )
+		opengl? ( virtual/opengl )
+		)"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		X?  (
+			x11-proto/xproto
+			x11-proto/xineramaproto
+			x11-proto/xf86vidmodeproto
+			)"
+
+PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
+
+SLOT="2.8"
+LICENSE="wxWinLL-3
+		GPL-2
+		odbc?	( LGPL-2 )
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
+	epatch "${FILESDIR}"/${PN}-2.8.8-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch
+	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
+	epatch "${FILESDIR}"/${P}-nestedtables.patch               # Bug #264544
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--enable-shared
+			--enable-unicode
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable debug)
+			$(use_enable pch precomp-headers)
+			$(use_with sdl)"
+
+	use odbc \
+		&& myconf="${myconf} --with-odbc=sys" \
+		|| myconf="${myconf} $(use_with odbc)"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-libtiff=sys
+			$(use_enable gstreamer mediactrl)
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			--without-gnomevfs"
+
+	# wxBase options
+	use X || \
+		myconf="${myconf}
+			--disable-gui"
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+
+	emake || die "make failed."
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake || die "make contrib failed."
+	fi
+}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install || die "install failed."
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake DESTDIR="${D}" install || die "install contrib failed."
+	fi
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt todo30.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/html/*
+	fi
+
+	# We don't want this
+	rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild
index 938d77344c47..ea90a396e2eb 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild,v 1.1 2009/02/21 22:20:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild,v 1.2 2009/04/25 02:25:43 dirtyepic Exp $
 
 EAPI="2"
 
@@ -32,7 +32,9 @@ RDEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
 		gnome?  ( gnome-base/libgnomeprintui )
-		gstreamer? ( >=media-libs/gstreamer-0.10 )
+		gstreamer? (
+			>=gnome-base/gconf-2.0
+			>=media-libs/gstreamer-0.10 )
 		opengl? ( virtual/opengl )
 		)"