Version bump, remove old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 122 insertions, 238 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index b181620dfc63..cff31bce794b 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.252 2010/04/09 03:52:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.253 2010/05/27 05:12:16 dirtyepic Exp $
+
+*wxGTK-2.8.11.0 (27 May 2010)
+
+  27 May 2010; Ryan Hill <dirtyepic@gentoo.org> -wxGTK-2.6.4.0-r5.ebuild,
+  -wxGTK-2.8.10.1-r1.ebuild, +wxGTK-2.8.11.0.ebuild,
+  +files/wxGTK-2.8.11-collision.patch,
+  +files/wxGTK-2.8.11-unicode-odbc.patch:
+  Version bump, remove old.
 
   09 Apr 2010; Jeroen Roovers <jer@gentoo.org> wxGTK-2.6.4.0-r6.ebuild,
   wxGTK-2.8.10.1-r5.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 5e016bf8e59b..ff65e2623530 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
 AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
 AUX wxGTK-2.6.4-mmedia.patch 599 RMD160 e894dacc346d7c10f9582c2885df8c0b82962bb1 SHA1 d1da9fe158c5db80f8e65395b9d2c3383133352c SHA256 0f848e5985e404d89fbcc4820ca07069845dc8219e0a8679ff5ad3bf28dbc93f
@@ -8,13 +11,22 @@ AUX wxGTK-2.8.10.1-CVE-2009-2369.patch 2348 RMD160 0b0c37a21bd68a99d837592c7745b
 AUX wxGTK-2.8.10.1-gsocket.patch 480 RMD160 8aa2654dfe926980388235a91d78aa73fc8471d1 SHA1 885442567f2f80f78f9ed4f0ac2483c6fc932efe SHA256 a2955800a8ece8d3e328d0a287bd73d021cf7e14898432b1771e708a1f960fac
 AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 RMD160 2444b56d28dacf4def2e329419596a491e88f2a2 SHA1 80039dc3e6a796c6fa86088d0c2d6ccda1a3d040 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698
 AUX wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch 1620 RMD160 5263552010efd258e94251f215d26ed0b2cedd38 SHA1 a18887d73b8c04a865f10521f5197ed217ec6c6d SHA256 28574bdcdddf6223038727d2bb0637611d3e39bb6613ed8353634e7d2621658f
+AUX wxGTK-2.8.11-collision.patch 5720 RMD160 afce2ed0ce4247f43d6db92e6652f739f58aa97e SHA1 8fc4d98b5bfc0cdf755795fff9eb6c8cb8009cdd SHA256 f2fc90c35c798b9546117707b3f9d81d627a122b9bf395657d78c79355ae717d
+AUX wxGTK-2.8.11-unicode-odbc.patch 624 RMD160 436cc03a4e45ed649298cf08a8ec134b97f4c4b5 SHA1 6cdf8f6e5140355d7bf6433d3afad483201c0961 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65
 AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
+DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
-EBUILD wxGTK-2.6.4.0-r5.ebuild 4765 RMD160 f7f7e49e22003fe00a280ec12def28349ed3ea55 SHA1 aa63f810cd8e8029da28c3fa629b226107342f55 SHA256 fcb538bd0b2065bdf21596e453996d2a3949dcc8b14c128f1ea6ff523093ff30
 EBUILD wxGTK-2.6.4.0-r6.ebuild 5002 RMD160 7b7cb150152fff0ea6f55d03e1d2691e93401775 SHA1 708312c2e00ab46671a60eddc06f6c5242cb3fd5 SHA256 598a286ceed03e47f66463f3ea0296b04c4f915d246a9ab26d39b74f5e7fc6dc
-EBUILD wxGTK-2.8.10.1-r1.ebuild 3588 RMD160 08c246b8c2651bf26a3250b9e8c4b8fbb6e94818 SHA1 697540aea5ab9815ebab8abd1e9291a478e58e32 SHA256 39d95da1522cc0926c5ba1f129e1f1f4803a98bce41780bcb68ada92afd216fc
 EBUILD wxGTK-2.8.10.1-r5.ebuild 3903 RMD160 c659d4b2032887fc731df343da10829d3920f267 SHA1 2f5ee7eafd284e3aae225547096f6bd4bacf68de SHA256 e6c9d1a523c5d04025c12d946809313b76322839a1c8eb7d173b4e1d16d6e80f
-MISC ChangeLog 39664 RMD160 e26aa02994bd368bc565f01de1978e6af4f82d23 SHA1 35d79e091f4e62b6a19e25c4945c28ccc24c3e71 SHA256 39ff6f3452a426d0c60c6a327fd499d8439f524b89d0aecfbf6c591e05cbb260
+EBUILD wxGTK-2.8.11.0.ebuild 3544 RMD160 7a5e26bbc06c84933713ab83981deffee5952eec SHA1 db1b600f77c2e0c9c39a2490d94087f57fe74944 SHA256 ecaf73b8348f8700355b708c92bf54be5698af43a2e6f827e96c110979546b58
+MISC ChangeLog 39938 RMD160 8c81d60545e3ba266e7a34435270fc51c28c72f6 SHA1 e68e265b2d98d1179aead4660f79957c79d3225e SHA256 fcb18a83c48c4c8e8ff7b34a350a48e897e0041fd59ba30b582d0140ed459916
 MISC metadata.xml 670 RMD160 fd336b73e871568e6ac86023a36923f497ee07f3 SHA1 e6a2a8aba2e72a9cb5020e36852742f85b20a5f0 SHA256 942586d9bdc5d1da6dbb785f62a2977cb6c2f710f34591a7b8861a9672a98296
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkv9//sACgkQiqiDRvmkBmLFhgCfSSMogkKKeBE/Rgn6txUgaf2s
+L2wAniWsdkGnk3SVXdKUO8XonJSRr7gl
+=Q140
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
new file mode 100644
index 000000000000..c41743a34ac0
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
@@ -0,0 +1,74 @@
+Prevent file collisions between multiple installed SLOTs.
+
+  - Don't install wxwin.m4.  It is installed with app-admin/eselect-wxwidgets.
+  - Version the bakefile preset filenames.  Unversioned symlinks to these files
+    are handled by eselect.
+  - Version wx-config and wxrc.  Unversioned wrapper scripts are installed with
+    eselect-wxwidgets.
+  - Version wxstd.mo and modify AddCatalog to find it. (this might need more
+    work but no one has complained yet)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11695,10 +11695,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do \
++	$(INSTALL_DATA)  $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+ 	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -12455,7 +12454,8 @@ install-wxconfig:
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+-	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++	&& $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12463,7 @@ locale_install:
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ 	fi ; \
+ 	done
+ 
+--- a/src/common/intl.cpp
++++ b/src/common/intl.cpp
+@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
+   m_initialized = false;
+ }
+ 
++#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
++
+ // NB: this function has (desired) side effect of changing current locale
+ bool wxLocale::Init(const wxChar *szName,
+                     const wxChar *szShort,
+@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName,
+   bool bOk = true;
+   if ( bLoadDefault )
+   {
+-    bOk = AddCatalog(wxT("wxstd"));
++    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+     // an error if this does not exist
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -120,7 +120,6 @@ distclean: clean
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+ 
+ @COND_USE_XRC_1@uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
new file mode 100644
index 000000000000..d272247091b8
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
@@ -0,0 +1,13 @@
+Allow odbc to be used with unicode builds.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1217,7 +1217,7 @@ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ 	$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) \
+ 	$(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
+-	$(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) \
++	$(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT $(PIC_FLAG) \
+ 	$(CPPFLAGS) $(CXXFLAGS)
+ ODBCDLL_OBJECTS =  \
+ 	$(__odbcdll___win32rc) \
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r5.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r5.ebuild
deleted file mode 100644
index 638ff38f0157..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r5.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# 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.6.4.0-r5.ebuild,v 1.9 2009/08/09 13:05:16 nixnut Exp $
-
-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
-# are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="X doc debug gnome odbc opengl pch sdl unicode"
-
-RDEPEND="
-	dev-libs/expat
-	odbc?	( dev-db/unixODBC )
-	sdl?	( media-libs/libsdl )
-	X?	(
-		>=x11-libs/gtk+-2.0
-		>=dev-libs/glib-2.0
-		media-libs/jpeg
-		media-libs/tiff
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		gnome?	( gnome-base/libgnomeprintui )
-		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.6"
-LICENSE="wxWinLL-3
-		GPL-2
-		odbc? ( LGPL-2 )
-		doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# General Patches
-
-	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
-	epatch "${FILESDIR}"/${BASE_P}-collision.patch
-	epatch "${FILESDIR}"/${BASE_P}-mmedia.patch				# Bug #174874
-
-	# Patches Specific to this version
-
-	epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch
-	epatch "${FILESDIR}"/${P}-g_free.patch
-	epatch "${FILESDIR}"/wxGTK-2.8.10.1-CVE-2009-2369.patch
-
-	# Reverse apply patch in wxPython tarball that breaks ABI
-	EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \
-		EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch
-
-	# wxBase has an automagic sdl dependency.  short circuit it here.
-	# http://bugs.gentoo.org/show_bug.cgi?id=91574
-	use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
-}
-
-src_compile() {
-	local myconf
-
-	append-flags -fno-strict-aliasing
-
-	# X independent options
-	myconf="--enable-shared
-			--enable-compat24
-			--with-regex=builtin
-			--with-zlib=sys
-			--with-expat
-			$(use_enable pch precomp-headers)
-			$(use_with sdl)
-			$(use_with odbc)"
-
-	# wxGTK only
-	use X && \
-		myconf="${myconf}
-			--enable-gui
-			--with-libpng
-			--with-libxpm
-			--with-libjpeg
-			--with-libtiff
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)"
-
-	# wxBase only
-	use X || \
-		myconf="${myconf}
-			--disable-gui"
-
-	# in 2.6 we always build ansi
-	# everything else is controlled by USE
-	if ! use debug; then
-		build_wx ansi
-	else
-		build_wx ansi-debug
-	fi
-
-	if use unicode; then
-		if ! use debug; then
-			build_wx unicode
-		else
-			build_wx unicode-debug
-		fi
-	fi
-}
-
-src_install() {
-	# Note - the last version to be installed becomes the default, so install
-	# ansi after unicode
-	install_wx unicode
-	install_wx unicode-debug
-	install_wx ansi
-	install_wx ansi-debug
-
-	dodoc "${S}"/docs/changes.txt
-	dodoc "${S}"/docs/gtk/readme.txt
-
-	if use doc; then
-		dohtml -r "${HTML_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
-}
-
-build_wx() {
-	local build_wx_conf
-
-	case "$1" in
-		ansi)
-			build_wx_conf="${build_wx_conf}
-			--disable-unicode"
-		;;
-
-		ansi-debug)
-			build_wx_conf="${build_wx_conf}
-			--disable-unicode
-			--enable-debug_flag"
-		;;
-
-		unicode)
-			build_wx_conf="${build_wx_conf}
-			--enable-unicode"
-		;;
-
-		unicode-debug)
-			build_wx_conf="${build_wx_conf}
-			--enable-unicode
-			--enable-debug_flag"
-		;;
-
-		*)
-			eerror "wxlib.class: build_wx called with invalid argument(s)."
-			die "wxlib.class: build_wx called with invalid argument(s)."
-		;;
-	esac
-
-	mkdir -p build_$1
-	pushd build_$1
-
-	ECONF_SOURCE="${S}" econf \
-		${myconf} \
-		${build_wx_conf} \
-		|| die "Failed to configure $1."
-
-	emake || die "Failed to make $1."
-
-	if [[ -e contrib/src ]]; then
-		cd contrib/src
-		emake || die "Failed to make $1 contrib."
-	fi
-
-	popd
-}
-
-install_wx() {
-	if [[ -d build_$1 ]]; then
-		pushd build_$1
-		emake DESTDIR="${D}" install || die "Failed to install $1."
-		if [[ -e contrib/src ]]; then
-			cd contrib/src
-			emake DESTDIR="${D}" install || die "Failed to install $1 contrib."
-		fi
-		popd
-	fi
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.8.10.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
index f1896e34c10d..64c61cc6d2fa 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.10.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r1.ebuild,v 1.9 2009/07/29 21:43:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.1 2010/05/27 05:12:16 dirtyepic Exp $
 
 EAPI="2"
 
@@ -16,8 +16,8 @@ BASE_P="${PN}-${BASE_PV}"
 # 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc debug gnome gstreamer odbc opengl pch sdl tiff"
 
 RDEPEND="
 	dev-libs/expat
@@ -36,6 +36,7 @@ RDEPEND="
 			>=gnome-base/gconf-2.0
 			>=media-libs/gstreamer-0.10 )
 		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff )
 		)"
 
 DEPEND="${RDEPEND}
@@ -57,12 +58,10 @@ LICENSE="wxWinLL-3
 S="${WORKDIR}/wxPython-src-${PV}"
 
 src_prepare() {
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
-	epatch "${FILESDIR}"/${PN}-2.8.10-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
+	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
 	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
-	# this version only:
-	epatch "${FILESDIR}"/${P}-CVE-2009-2369.patch              # Bug #277722
+	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
 }
 
 src_configure() {
@@ -79,11 +78,9 @@ src_configure() {
 			--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)"
+			$(use_with odbc odbc sys)
+			$(use_with sdl)
+			$(use_with tiff libtiff sys)"
 
 	# wxGTK options
 	#   --enable-graphics_ctx - needed for webkit, editra
@@ -96,7 +93,6 @@ src_configure() {
 			--with-libpng=sys
 			--with-libxpm=sys
 			--with-libjpeg=sys
-			--with-libtiff=sys
 			$(use_enable gstreamer mediactrl)
 			$(use_enable opengl)
 			$(use_with opengl)