Migrate away from wxlib.eclass. Fix depends. Allow parallel building. Grab some relatively important patches from upstream. Ensure the wxrc tool is built and installed. Install HTML documentation with USE=doc properly again. Closes bugs #147394 and #123786.

Package-Manager: portage-2.1.2_pre1-r1

7 files changed, 306 insertions, 8 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 72e2515fcc24..265732109afa 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.123 2006/09/04 11:39:53 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.124 2006/09/24 12:11:02 leio Exp $
+
+*wxGTK-2.6.3.3 (24 Sep 2006)
+
+  24 Sep 2006; Mart Raudsepp <leio@gentoo.org>
+  +files/wxGTK-2.6.3.3-dialog_focus.patch,
+  +files/wxGTK-2.6.3.3-slider_linesize.patch,
+  +files/wxGTK-2.6.3.3-wxrc_build_fix.patch, +wxGTK-2.6.3.3.ebuild:
+  Migrate away from wxlib.eclass. Fix depends. Allow parallel building. Grab
+  some relatively important patches from upstream. Ensure the wxrc tool is
+  built and installed. Restore ABI compatibility with latest stable version
+  (2.6.2-r1). Install HTML documentation with USE=doc properly again. Closes
+  bugs #147394 and #123786.
 
   04 Sep 2006; Mart Raudsepp <leio@gentoo.org>
   -files/wxGTK-2.6.1-windowcpp.diff, -wxGTK-2.6.1-r1.ebuild,
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index beb429dc608e..0c8330845519 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -29,12 +29,25 @@ AUX wxGTK-2.4.2-pango_fix.patch 618 RMD160 699a6fde11b4feb65940b85e0afe881c93f55
 MD5 568639b28866f0c708c091d2e28f982e files/wxGTK-2.4.2-pango_fix.patch 618
 RMD160 699a6fde11b4feb65940b85e0afe881c93f55649 files/wxGTK-2.4.2-pango_fix.patch 618
 SHA256 a9f252b80d62f0e65c8ba6ce27eceb70076006ea344e9f2989d12a88e0ec4d03 files/wxGTK-2.4.2-pango_fix.patch 618
+AUX wxGTK-2.6.3.3-dialog_focus.patch 664 RMD160 20433654838ea0f1349bd32c2760a53ad14008c9 SHA1 31bb73a6edd2e32afa06abe079eb9906f68cfb47 SHA256 0583f9bf34c8aadbe8142c25739c80e41d6ce2388b15d336916ac1a7fa78e34e
+MD5 ddf5e2466e1d293156c3a0e0e056f719 files/wxGTK-2.6.3.3-dialog_focus.patch 664
+RMD160 20433654838ea0f1349bd32c2760a53ad14008c9 files/wxGTK-2.6.3.3-dialog_focus.patch 664
+SHA256 0583f9bf34c8aadbe8142c25739c80e41d6ce2388b15d336916ac1a7fa78e34e files/wxGTK-2.6.3.3-dialog_focus.patch 664
+AUX wxGTK-2.6.3.3-slider_linesize.patch 1129 RMD160 2a0765a2861222398e9d5a813daadf5a3aa56276 SHA1 a994444731221e2fe4a3f3153443474aae2697c5 SHA256 dacbcaa9e9d2d943c87a002dc4378889317207d37ac5cca9800d727b6efa45d9
+MD5 9b51b60fc3fc5630f7a057a9af27da0a files/wxGTK-2.6.3.3-slider_linesize.patch 1129
+RMD160 2a0765a2861222398e9d5a813daadf5a3aa56276 files/wxGTK-2.6.3.3-slider_linesize.patch 1129
+SHA256 dacbcaa9e9d2d943c87a002dc4378889317207d37ac5cca9800d727b6efa45d9 files/wxGTK-2.6.3.3-slider_linesize.patch 1129
+AUX wxGTK-2.6.3.3-wxrc_build_fix.patch 1288 RMD160 0072a233b07e1cf3035daa85a1be2aa4e491a5bc SHA1 30cd35d9f90561df585a0ee385324e5684215e1b SHA256 9b40e8c8f4e101a27c14fadd8c2a0f597c7323f335ab2eecfbc4c450f4f55d4b
+MD5 54f6bb3088e1a1b0499aad2f40ef6f10 files/wxGTK-2.6.3.3-wxrc_build_fix.patch 1288
+RMD160 0072a233b07e1cf3035daa85a1be2aa4e491a5bc files/wxGTK-2.6.3.3-wxrc_build_fix.patch 1288
+SHA256 9b40e8c8f4e101a27c14fadd8c2a0f597c7323f335ab2eecfbc4c450f4f55d4b files/wxGTK-2.6.3.3-wxrc_build_fix.patch 1288
 AUX wxWidgets-2.6.2-gcc41.patch 559 RMD160 b8118789927ca6de5df4b05318b039edc49908e7 SHA1 f5e31a94069a30a4844a85f07801f40dd51c9102 SHA256 2427a07fa30b7bbe12fde4c76d2735cec3592b4b690ac86697355ae3a71fbd91
 MD5 a7173de92807f66492cda98731156932 files/wxWidgets-2.6.2-gcc41.patch 559
 RMD160 b8118789927ca6de5df4b05318b039edc49908e7 files/wxWidgets-2.6.2-gcc41.patch 559
 SHA256 2427a07fa30b7bbe12fde4c76d2735cec3592b4b690ac86697355ae3a71fbd91 files/wxWidgets-2.6.2-gcc41.patch 559
 DIST wxGTK-2.4.2.tar.bz2 5381935 RMD160 8076d1ba31c9b23becb241cbad5a83763fee776e SHA1 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c SHA256 2b057cbd6f5573d2bac2c8af180fcd9f56ad4e27bba44abdd2cb0a6904c725b1
 DIST wxPython-src-2.6.3.2.tar.gz 18946956 RMD160 4fabaefa4c066d1cccc5301bdd31cda16a55647b SHA1 2f845459e089c615e15ac165b5135b688b9d62cf SHA256 21558bf3f306bb935b53e0ca42664ca325ec3cc4d9452b79bb5d9ff4b68aadb6
+DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60f3692eb783 SHA1 e55a3a8cfbd1aff394be15297ae205a8c597bed8 SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
 DIST wxWidgets-2.6.1-HTML.tar.gz 1437702 RMD160 b89efc1a99a903a71e21a6f3a888197a91916300 SHA1 d43a35db16472b0040fb8ebe81ece05009aa36d3 SHA256 763689c62e72bc04b46504ed893fe768dfb9ef03b2fa50b14c93d59261f41ad0
 DIST wxWidgets-2.6.1.tar.bz2 12649487 RMD160 20c009754f70cd3e983aba795306838fa622eec7 SHA1 98811470cd31de9a477c1f5e943809bfc5dbd41d SHA256 2c745de137dbe1ad48c0ad5fe68334670f1e9baf89d59c1ed9bf178f8d75a656
 DIST wxWidgets-2.6.2-HTML.tar.gz 1440455 RMD160 6ad8767efcc2d0881ce202e333d9f0f5b393866a SHA1 8f9e34d31dcb8bcd095160b65262822993de4ce7 SHA256 eeb47240ccc56a8eb14d09153e1cfaa9ad9c3f71ea67b21ac62790e59c405312
@@ -56,10 +69,14 @@ EBUILD wxGTK-2.6.3.2.ebuild 1902 RMD160 61593a29b0f9ba0fe817e6dedda47bc7a2c176ad
 MD5 72d952a769f6294346d3e71dc82f54d6 wxGTK-2.6.3.2.ebuild 1902
 RMD160 61593a29b0f9ba0fe817e6dedda47bc7a2c176ad wxGTK-2.6.3.2.ebuild 1902
 SHA256 18f7dd23f2a42e8a3cc66912b9ccfbe49b9c8af011520f83f4e79a7e0eb705ab wxGTK-2.6.3.2.ebuild 1902
-MISC ChangeLog 19169 RMD160 ee2a3450a81c700342083c9d86170b569ba77fae SHA1 21d269fb1f2932eea9e9475eead0501e04d151fa SHA256 2c4659b12b6474d3bc1aed5c2a22277952176cc4749b7f40a898f98df6440eb5
-MD5 ace722a96625ddfcf35090d348c20b8a ChangeLog 19169
-RMD160 ee2a3450a81c700342083c9d86170b569ba77fae ChangeLog 19169
-SHA256 2c4659b12b6474d3bc1aed5c2a22277952176cc4749b7f40a898f98df6440eb5 ChangeLog 19169
+EBUILD wxGTK-2.6.3.3.ebuild 5117 RMD160 90f53800a7cbc39b5b0853c70c2f7a380b7485d4 SHA1 22556cdace413a6b67fb535b69b9a125a2b53fe6 SHA256 0cff02e5df7cb0d60e5add560b43ccd404270e59032c6de626fa9e968db6b0c5
+MD5 29bc48fe65c4d21cb11bd1c8b8cc387a wxGTK-2.6.3.3.ebuild 5117
+RMD160 90f53800a7cbc39b5b0853c70c2f7a380b7485d4 wxGTK-2.6.3.3.ebuild 5117
+SHA256 0cff02e5df7cb0d60e5add560b43ccd404270e59032c6de626fa9e968db6b0c5 wxGTK-2.6.3.3.ebuild 5117
+MISC ChangeLog 19737 RMD160 6655c64238f9f9355cc51b860cbcd766e2b79a15 SHA1 d1f6d8950dc3fa1697463af0863434d6a2d3abfe SHA256 7e03882dc2a4d9bd7b3ea9141b23646758f4a5bd46eff76f53f4a4439c9cafa8
+MD5 44f7097f42de8f68534ee602cdbad7c8 ChangeLog 19737
+RMD160 6655c64238f9f9355cc51b860cbcd766e2b79a15 ChangeLog 19737
+SHA256 7e03882dc2a4d9bd7b3ea9141b23646758f4a5bd46eff76f53f4a4439c9cafa8 ChangeLog 19737
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -76,10 +93,13 @@ SHA256 5b793e6ce19b46528f537fd7e5ec07761b282ae7b4200dc04272315a9b8c709b files/di
 MD5 1a36ae3262abdfdd3dd89773d51120b5 files/digest-wxGTK-2.6.3.2 533
 RMD160 24318485fe1db1892149a6fef1c8aae60a6d38a6 files/digest-wxGTK-2.6.3.2 533
 SHA256 8a14da7ff59997861984f4f8b49a96812386d9ab89f1bedafe8eeeed22e113d1 files/digest-wxGTK-2.6.3.2 533
+MD5 eb68af7b26b012c1917773f8e8ef72ac files/digest-wxGTK-2.6.3.3 536
+RMD160 df919a5e942c91fc9be13999d0b3db38d3880b3c files/digest-wxGTK-2.6.3.3 536
+SHA256 38f9f296e8a111b7459cdc57231520a7d0277574f8153cb2353c46534378695f files/digest-wxGTK-2.6.3.3 536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFA9bhamhnQswr0vIRArhOAKCowvZQkcj4/f/jBMfyk5oZ8G4SAwCgmp8i
-r6ZbHOaPgG0CdoQdupN3yGE=
-=Ndkf
+iD8DBQFFFnXNkeYb6olFHJcRAgOvAKDLddt0clrRxn6KwRBhFYydW4jh3ACgkhFR
+grIPgQE2itreSDysltFktz0=
+=LikM
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.3.3 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.3.3
new file mode 100644
index 000000000000..a13365d0e0f7
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.3.3
@@ -0,0 +1,6 @@
+MD5 66b9c5f8e20a9505c39dab1a1234daa9 wxPython-src-2.6.3.3.tar.bz2 18963104
+RMD160 7feacff6808574143590a0a421ee60f3692eb783 wxPython-src-2.6.3.3.tar.bz2 18963104
+SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb wxPython-src-2.6.3.3.tar.bz2 18963104
+MD5 e575ac25e30749bd540b23ed9b370029 wxWidgets-2.6.3-HTML.tar.gz 1349870
+RMD160 3be20dce033c3e14999783a959fe0804fcab3d91 wxWidgets-2.6.3-HTML.tar.gz 1349870
+SHA256 d564729b6e862c751dcea2487137832f9fbf95a665481c50d029fba9d4dd9cc1 wxWidgets-2.6.3-HTML.tar.gz 1349870
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-dialog_focus.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-dialog_focus.patch
new file mode 100644
index 000000000000..d003fbe199ff
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-dialog_focus.patch
@@ -0,0 +1,19 @@
+Do not set focus inside ShowModal. Fixes wxWindow::SetFocus for modal dialogs, and wxFileDialog initial focus problem.
+
+Index: src/gtk/dialog.cpp
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/gtk/dialog.cpp,v
+retrieving revision 1.109
+retrieving revision 1.109.2.1
+diff -u -B -w -p -r1.109 -r1.109.2.1
+--- src/gtk/dialog.cpp	2005/06/20 08:18:39	1.109
++++ src/gtk/dialog.cpp	2006/07/29 16:40:58	1.109.2.1
+@@ -205,8 +205,6 @@ int wxDialog::ShowModal()
+     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
+ 
+     Show( true );
+-
+-    SetFocus();
+ 
+     m_modalShowing = true;
+ 
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-slider_linesize.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-slider_linesize.patch
new file mode 100644
index 000000000000..c82c770b3ef2
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-slider_linesize.patch
@@ -0,0 +1,38 @@
+Implement Get/SetLineSize due to no timeline for a 2.6.4 release that would include this.
+Useful for applications like xara-xtreme.
+
+Index: src/gtk/slider.cpp
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/gtk/slider.cpp,v
+retrieving revision 1.58.2.3
+retrieving revision 1.58.2.4
+diff -u -B -w -p -r1.58.2.3 -r1.58.2.4
+--- src/gtk/slider.cpp	2006/03/10 18:45:31	1.58.2.3
++++ src/gtk/slider.cpp	2006/07/27 13:34:33	1.58.2.4
+@@ -335,13 +335,24 @@ int wxSlider::GetThumbLength() const
+     return (int)ceil(m_adjust->page_size);
+ }
+ 
+-void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
++void wxSlider::SetLineSize( int lineSize )
+ {
++    double fline = (double)lineSize;
++
++    if (fabs(fline-m_adjust->step_increment) < 0.2) return;
++
++    m_adjust->step_increment = fline;
++
++    GtkDisableEvents();
++
++    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
++
++    GtkEnableEvents();
+ }
+ 
+ int wxSlider::GetLineSize() const
+ {
+-    return 0;
++    return (int)ceil(m_adjust->step_increment);
+ }
+ 
+ bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_build_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_build_fix.patch
new file mode 100644
index 000000000000..11100cf1690d
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.3.3-wxrc_build_fix.patch
@@ -0,0 +1,27 @@
+Fixes makefiles to fail if building wxrc fails.
+Ensures wxrc will be present, for the applications that needs it, if emerge succeeds.
+
+Index: Makefile.in
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/Makefile.in,v
+retrieving revision 1.521.2.10
+diff -u -B -r1.521.2.10 Makefile.in
+--- Makefile.in	2006/05/23 18:13:44	1.521.2.10
++++ Makefile.in	2006/09/24 07:44:55
+@@ -9933,13 +9933,13 @@
+ 	(cd samples && $(MAKE) all)
+ 
+ @COND_USE_XRC_1@wxrc: $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__xmldll___depname) $(__xmllib___depname)
+-@COND_USE_XRC_1@	(test -d utils/wxrc && cd utils/wxrc && $(MAKE) all) || true
++@COND_USE_XRC_1@	(if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) all ; fi)
+ 
+ @COND_USE_XRC_1@clean-wxrc: 
+-@COND_USE_XRC_1@	(test -d utils/wxrc && cd utils/wxrc && $(MAKE) clean) || true
++@COND_USE_XRC_1@	(if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) clean ; fi)
+ 
+ @COND_USE_XRC_1@install-wxrc: $(__wxrc___depname)
+-@COND_USE_XRC_1@	(test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true
++@COND_USE_XRC_1@	(if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) install ; fi)
+ 
+ install-wxconfig: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild b/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild
new file mode 100644
index 000000000000..af93c3df7fa8
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.3.3.ebuild,v 1.1 2006/09/24 12:11:02 leio Exp $
+
+inherit debug eutils multilib toolchain-funcs gnuconfig versionator flag-o-matic
+
+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.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnome joystick odbc opengl sdl unicode X"
+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/libgnomeui-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
+		einfo "To install only wxbase (non-gui libs) use USE=-X"
+	else
+		einfo "To install GUI libraries, in addition to wxbase, use USE=X"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-wxrc_build_fix.patch"
+	epatch "${FILESDIR}/${P}-dialog_focus.patch"
+	epatch "${FILESDIR}/${P}-slider_linesize.patch"
+
+	# Reverse apply patch in wxPython tarball that breaks ABI
+	EPATCH_OPTS="-R" epatch "${S}/patches/listctrl-ongetitemcolumnimage.patch"
+}
+
+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
+
+	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.6 || 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() {
+	einfo "dev-libs/wxbase has been removed from portage."
+	einfo "wxBase is installed with wxGTK, as one of many libraries."
+	einfo "If only wxBase is wanted, -X USE flag may be specified."
+}