--- ../../../gentoo/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild	2015-04-01 18:35:27.833739762 +0300
+++ ./wxGTK-2.8.12.1-r4.ebuild	2015-05-22 18:51:46.206092520 +0300
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic multilib versionator
+inherit eutils flag-o-matic versionator multilib-minimal
 
 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://wxwidgets.org/"
@@ -16,49 +16,50 @@
 # 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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff"
 
 SLOT="2.8"
 
 RDEPEND="
-	dev-libs/expat
-	odbc?   ( dev-db/unixODBC )
-	sdl?    ( media-libs/libsdl )
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	odbc?   ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl?    ( media-libs/libsdl[${MULTILIB_USEDEP}] )
 	X?  (
-		dev-libs/glib:2
-		media-libs/libpng:0=
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		gnome?  ( gnome-base/libgnomeprintui:2.2 )
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+		virtual/jpeg:=[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libXinerama[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		x11-libs/pango[X,${MULTILIB_USEDEP}]
+		gnome?  ( gnome-base/libgnomeprintui:2.2[${MULTILIB_USEDEP}] )
 		gstreamer? (
-			gnome-base/gconf:2
-			media-libs/gstreamer:0.10
-			media-libs/gst-plugins-base:0.10 )
-		opengl? ( virtual/opengl )
-		tiff?   ( media-libs/tiff:0 )
+			gnome-base/gconf:2[${MULTILIB_USEDEP}]
+			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
 		)
 	aqua? (
-		>=x11-libs/gtk+-2.4[aqua=]
-		virtual/jpeg
-		tiff?   ( media-libs/tiff:0 )
+		>=x11-libs/gtk+-2.4:2[aqua=,${MULTILIB_USEDEP}]
+		virtual/jpeg:=[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
 		)"
 
 DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		opengl? ( virtual/glu )
-		X?  (
-			x11-proto/xproto
-			x11-proto/xineramaproto
-			x11-proto/xf86vidmodeproto
-			)"
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+	X? (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+	)
+"
 
-PDEPEND=">=app-eselect/eselect-wxwidgets-0.7"
+PDEPEND=">=app-eselect/eselect-wxwidgets-20140423-r3"
 
 LICENSE="wxWinLL-3
 		GPL-2
@@ -73,18 +74,22 @@
 	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
 	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
 
-	# x32 https://bugs.gentoo.org/421851
-	sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
-
 	# prefix https://bugs.gentoo.org/394123
 	sed -i -e "s:/usr:${EPREFIX}/usr:g" \
 		-e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
 		configure || die
 
 	epatch_user
+
+	multilib_prepare() {
+		# x32 https://bugs.gentoo.org/421851
+		sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" "${BUILD_DIR}"/configure || die
+	}
+	multilib_copy_sources
+	multilib_parallel_foreach_abi multilib_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf
 
 	append-flags -fno-strict-aliasing
@@ -135,15 +140,10 @@
 			--disable-gui"
 	fi
 
-	mkdir "${S}"/wxgtk_build
-	cd "${S}"/wxgtk_build
-
-	ECONF_SOURCE="${S}" econf ${myconf}
+	econf ${myconf}
 }
 
-src_compile() {
-	cd "${S}"/wxgtk_build
-
+multilib_src_compile() {
 	emake
 
 	if [[ -d contrib/src ]]; then
@@ -152,16 +152,16 @@
 	fi
 }
 
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install
+multilib_src_install() {
+	default
 
 	if [[ -d contrib/src ]]; then
 		cd contrib/src
 		emake DESTDIR="${D}" install
 	fi
+}
 
+multilib_src_install_all() {
 	cd "${S}"/docs
 	dodoc changes.txt readme.txt todo30.txt
 	newdoc base/readme.txt base_readme.txt