Version bump

svn path=/; revision=139

6 files changed, 231 insertions, 187 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 8a8480d..fffd4e9 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Oct 2007; <drizzt@gentoo.org> +files/wxGTK-2.6.3-unicode-odbc.patch,
+  +files/wxGTK-2.8.4-collision.patch, ++, -wxGTK-2.8.4.0.ebuild:
+  Version bump
+
   06 Jul 2007; Timothy Redaelli <drizzt@gentoo.org> ++,
   -files/socketfix.patch, -wxGTK-2.8.3.0.ebuild:
   Version bump
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index bdd65c2..bce2592 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST wxPython-src-2.8.4.0.tar.bz2 25133956 RMD160 bbf8b040d0a990f0ac8324066cf8fe29cab84ba6 SHA1 0947c74762d1419f503d19b8b5fe4ac7c81b9cc6 SHA256 d0e007634b762fd2e98f29636ceabc5738cc92adf5c11b8553780ece64127252
+AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
+AUX wxGTK-2.8.4-collision.patch 5258 RMD160 0d932f81d1f2807af7a9470883a7427365367367 SHA1 2382cb00a4bf4c0b53a1f28b259832e4830358ee SHA256 d5a218ffafefe581fd83851848ff88086b73ce43321fa267264cd2345cc9f9f1
+DIST wxPython-src-2.8.4.2.tar.bz2 25103098 RMD160 4b101dbae77bc982642e35e99dadbb5b5c6f8f74 SHA1 bdce13be9edf565ff7ba8622e8c30b687773d0d4 SHA256 e88257d929905fb7bbf5b6a08a24afbb421fd2ba4ca58b64ae462d8c295d11b7
 DIST wxWidgets-2.8.4-HTML.tar.gz 1596934 RMD160 65d0e8ff0aac36a46e20aa406979754545d806f3 SHA1 33c8716653805d0807f32b3ebdae84c672549233 SHA256 879a7ceb6e7eed258dffcf7236c7f99c307faba9a9325a53c86c789198f36241
-EBUILD wxGTK-2.8.4.0.ebuild 4862 RMD160 a665401b5ae9cdb3d58aacdc71f98bb93aaf6dd6 SHA1 3703c18c40a99507ad512f228ac5e017a674151f SHA256 03b675dc4d035429eaba393669a1b50d5a401182977c76fcf254bcf17801e2b7
-MISC ChangeLog 236 RMD160 ad94fc375c92f97320dcec0831142a408128f5a0 SHA1 34743293799c8e8dc059ba6de5b0a11f04ba7fbe SHA256 3147452fafb1b48f0ff40800db9d9e1cdfbf1eb64fbf09295b8dc3bd01309b31
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGjhSSjJyKLBkBVroRArSOAKCJ1yZNFWgDUfjcdKP/SPACqmH/BQCcDRtW
-eeM7HC5gC7ZCBn9XG/QAQiM=
-=L7Vq
------END PGP SIGNATURE-----
+EBUILD wxGTK-2.8.4.2.ebuild 2869 RMD160 fd8c47a0141d7db84a66b06ecf6608ccc86c2e32 SHA1 4d4deeaafbb62fcdbc5c12941f2abbd6e796cf31 SHA256 a5b85c6c6b32ed4f88d1c93e045226b2b065564e62c6fb1e4dbdd6e0e9cbcbac
+MISC ChangeLog 391 RMD160 0ad50d0972291d392428e0d2c7177a481d6828e6 SHA1 3c285ea78dfb4b46828881a4080a8f0c422d5f92 SHA256 45b43f092456fcb52f713c77674c5ec8b26d6e09bdb78505c138d4fcfcf222fc
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch
new file mode 100644
index 0000000..cb0ce43
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.3-unicode-odbc.patch
@@ -0,0 +1,14 @@
+diff -Naur wxPython-src-2.6.3.3-orig/Makefile.in wxPython-src-2.6.3.3/Makefile.in
+--- wxPython-src-2.6.3.3-orig/Makefile.in	2007-02-25 17:08:11.000000000 -0600
++++ wxPython-src-2.6.3.3/Makefile.in	2007-02-25 17:20:46.000000000 -0600
+@@ -1081,8 +1081,8 @@
+ 	$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ 	$(__THREAD_DEFINE_p) $(__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) $(CPPFLAGS) \
+-	$(CXXFLAGS)
++	-DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT \
++	$(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+ ODBCDLL_OBJECTS =  \
+ 	$(__odbcdll___win32rc) \
+ 	odbcdll_db.o \
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
new file mode 100644
index 0000000..c600c9b
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
@@ -0,0 +1,76 @@
+diff -Naur wxPython-src-2.8.4.2-orig/Makefile.in wxPython-src-2.8.4.2/Makefile.in
+--- wxPython-src-2.8.4.2-orig/Makefile.in	2007-09-08 18:07:31.000000000 -0600
++++ wxPython-src-2.8.4.2/Makefile.in	2007-09-08 18:08:57.000000000 -0600
+@@ -26,6 +26,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_DIR = @INSTALL_DIR@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ BK_DEPS = @BK_DEPS@
+ BK_MAKE_PCH = @BK_MAKE_PCH@
+ srcdir = @srcdir@
+@@ -11310,9 +11311,10 @@
+ 
+ install: all $(__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)
++	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
+ 	$(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 \
+@@ -12068,8 +12070,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)
++	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/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
+@@ -12077,7 +12079,7 @@
+ 	$(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
+ 
+diff -Naur wxPython-src-2.8.4.2-orig/src/common/intl.cpp wxPython-src-2.8.4.2/src/common/intl.cpp
+--- wxPython-src-2.8.4.2-orig/src/common/intl.cpp	2007-06-29 22:11:06.000000000 -0600
++++ wxPython-src-2.8.4.2/src/common/intl.cpp	2007-09-08 18:08:57.000000000 -0600
+@@ -1513,6 +1513,8 @@
+   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,
+@@ -1581,7 +1583,7 @@
+   bool bOk = true;
+   if ( bLoadDefault )
+   {
+-    bOk = AddCatalog(wxT("wxstd"));
++    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));bOk = AddCatalog(wxT("wxstd"));
+ 
+     // there may be a catalog with toolkit specific overrides, it is not
+     // an error if this does not exist
+diff -Naur wxPython-src-2.8.4.2-orig/utils/wxrc/Makefile.in wxPython-src-2.8.4.2/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.4.2-orig/utils/wxrc/Makefile.in	2007-06-29 22:14:13.000000000 -0600
++++ wxPython-src-2.8.4.2/utils/wxrc/Makefile.in	2007-09-08 18:09:16.000000000 -0600
+@@ -118,7 +118,6 @@
+ @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/wxGTK-2.8.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.4.0.ebuild
deleted file mode 100644
index 74f0ce6..0000000
--- a/x11-libs/wxGTK/wxGTK-2.8.4.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-HTML_PV="$(get_version_component_range 1-3)"
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and wxbase non-gui library"
-
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/wxwindows/wxWidgets-${HTML_PV}-HTML.tar.gz )"
-
-SLOT="2.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc gnome joystick odbc opengl sdl stl unicode X gif"
-LICENSE="wxWinLL-3"
-HOMEPAGE="http://www.wxwidgets.org"
-
-# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
-#         has its own implementation of it
-# Note 2: PCX support is enabled if the correct libraries are detected.
-#         There is no USE flag for this.
-
-RDEPEND="X? ( opengl? ( virtual/opengl )
-		>=x11-libs/gtk+-2.0
-		>=dev-libs/glib-2.0
-		media-libs/tiff
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		gnome? ( >=gnome-base/libgnomeprintui-2.8 ) )
-	odbc? ( dev-db/unixODBC )
-	x86? ( sdl? ( >=media-libs/libsdl-1.2 ) )
-	amd64? ( sdl? ( >=media-libs/libsdl-1.2 ) )
-	ppc? ( sdl? ( >=media-libs/libsdl-1.2 ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	X? (
-		x11-proto/xproto
-		x11-proto/xineramaproto
-		x11-proto/xf86vidmodeproto
-	   )"
-
-S=${WORKDIR}/wxPython-src-${PV}
-HTML_S=${WORKDIR}/wxWidgets-${HTML_PV}
-
-# Configure a build.
-# It takes three parameters;
-# $1: prefix for the build directory (used for wxGTK which has two
-#     builds needed.
-# $2: "unicode" if it must be build with else ""
-# $3: all the extra parameters to pass to configure script
-configure_build() {
-	export LANG='C'
-
-	mkdir ${S}/$1_build
-	cd ${S}/$1_build
-	# odbc works with ansi only:
-	subconfigure $3 $(use_with odbc)
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake failed"
-	#wxbase has no contrib:
-	if [[ -e contrib/src ]]; then
-		cd contrib/src
-		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "emake contrib failed"
-	fi
-
-	if [[ "$2" == "unicode" ]] && use unicode; then
-		mkdir ${S}/$1_build_unicode
-		cd ${S}/$1_build_unicode
-		subconfigure $3 --enable-unicode
-		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake failed"
-		if [[ -e contrib/src ]]; then
-			cd contrib/src
-			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "Unicode emake contrib failed"
-		fi
-	fi
-}
-
-# This is a commodity function which calls configure script
-# with the default parameters plus extra parameters. It's used
-# as building the unicode version required redoing it.
-# It takes all the params and passes them to the script
-subconfigure() {
-	ECONF_SOURCE="${S}" \
-		econf \
-			--with-zlib \
-			$(use_enable debug) $(use_enable debug debug_gdb) \
-			$* || die "./configure failed"
-}
-
-# Installs a build
-# It takes only a parameter: the prefix for the build directory
-# see configure_build function
-install_build() {
-	cd ${S}/$1_build
-	einstall libdir="${D}/usr/$(get_libdir)" || die "Install failed"
-	if [[ -e contrib ]]; then
-		cd contrib/src
-		einstall libdir="${D}/usr/$(get_libdir)" || die "Install contrib failed"
-	fi
-	if [[ -e ${S}/$1_build_unicode ]]; then
-		cd ${S}/$1_build_unicode
-		einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install failed"
-		cd contrib/src
-		einstall libdir="${D}/usr/$(get_libdir)" || die "Unicode install contrib failed"
-	fi
-}
-
-pkg_setup() {
-	if use X; then
-		elog "To install only wxbase (non-gui libs) use USE=-X"
-	else
-		elog "To install GUI libraries, in addition to wxbase, use USE=X"
-	fi
-}
-
-src_compile() {
-	gnuconfig_update
-	append-flags -fno-strict-aliasing
-	myconf="${myconf}
-		$(use_with sdl)
-		$(use_enable joystick)"
-
-	if use X; then
-		myconf="${myconf}
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)"
-	fi
-	if use stl; then
-		myconf="${myconf}
-		$(use_enable stl)"
-	fi
-
-	if use gif; then
-		myconf="${myconf}
-			$(use_enable gif)"
-	else
-		myconf="${myconf}
-		$(use_disable gif)"
-	fi
-
-
-	use X && configure_build gtk2 unicode "${myconf} --with-gtk=2"
-	use X || configure_build base unicode "${myconf} --disable-gui"
-}
-
-src_install() {
-	use X && install_build gtk2
-	use X || install_build base
-
-	cp ${D}/usr/bin/wx-config ${D}/usr/bin/wx-config-2.8 || die "Failed to cp wx-config"
-
-	# In 2.6 all wx-config*'s go in/usr/lib/wx/config
-	# Only install wx-config if 2.4 is not installed:
-	if [ -e "/usr/bin/wx-config" ]; then
-		if [ "$(/usr/bin/wx-config --release)" = "2.4" ]; then
-			rm ${D}/usr/bin/wx-config
-		fi
-	fi
-
-	dodoc ${S}/docs/changes.txt
-	dodoc ${S}/docs/gtk/readme.txt
-
-	if use doc; then
-		dohtml -r ${HTML_S}/docs/html/*
-	fi
-}
-
-pkg_postinst() {
-	elog "dev-libs/wxbase has been removed from portage."
-	elog "wxBase is installed with wxGTK, as one of many libraries."
-	elog "If only wxBase is wanted, -X USE flag may be specified."
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.8.4.2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.4.2.ebuild
new file mode 100644
index 0000000..a9a9a9a
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.4.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc debug gnome joystick odbc opengl sdl"
+
+DEPEND="
+	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
+				gnome-base/gnome-vfs )
+		opengl? ( virtual/opengl )
+		)"
+
+SLOT="2.8"
+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
+
+	# Patches specific to this Version
+
+}
+
+src_compile() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--enable-shared
+			--enable-unicode
+			--disable-optimise
+			--disable-rpath
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat
+			$(use_enable debug)
+			$(use_enable joystick)
+			$(use_with sdl)
+			$(use_with odbc)"
+
+	# wxGTK options
+	use X && \
+		myconf="${myconf}
+			--enable-gui
+			--with-libpng
+			--with-libxpm
+			--with-libjpeg
+			--with-libtiff
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with gnome 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."
+
+	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
+
+	if use doc; then
+		# i want a way to install this stuff without compressing it.
+		# until i find that way just do this.
+		mkdir -p "${D}"usr/share/doc/${PF}/
+		cp -R "${S}"/docs/* "${D}"usr/share/doc/${PF}/
+	fi
+
+	# This causes a collision
+	rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
+
+	# TODO - wx-config wrapper
+}