--- /usr/portage/dev-libs/libappindicator/libappindicator-12.10.0.ebuild	2012-07-27 19:01:09.000000000 +0200
+++ libappindicator/libappindicator-12.10.0-r1.ebuild	2013-03-15 21:00:39.982889176 +0100
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-12.10.0.ebuild,v 1.2 2012/07/27 16:34:15 ssuominen Exp $
+# $Header: $
 
-EAPI=4
-inherit eutils
+EAPI=5
+inherit eutils autotools multilib-minimal
 
 AYATANA_VALA_VERSION=0.16
 
@@ -14,40 +14,53 @@
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
+IUSE="+introspection gtk3"
 
 RDEPEND=">=dev-libs/dbus-glib-0.98
 	>=dev-libs/glib-2.26
-	>=dev-libs/libdbusmenu-0.6.2:3[gtk]
-	>=dev-libs/libindicator-12.10.0:3
-	>=x11-libs/gtk+-3.2:3
+	>=dev-libs/libdbusmenu-0.6.2:3[gtk3=,gtk,abi_x86_32?]
+	>=dev-libs/libindicator-12.10.0:3[gtk3=,abi_x86_32?]
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
 	introspection? ( >=dev-libs/gobject-introspection-1 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	introspection? ( dev-lang/vala:${AYATANA_VALA_VERSION}[vapigen] )"
 
+ECONF_SOURCE=${S}
+
 src_prepare() {
+	epatch ${FILESDIR}/multilib_disable_python.patch
+	sed -i "s/.*python.*/\\\/" bindings/Makefile.am || die not found
+	sed -i "s/ python //" bindings/Makefile.in || die not found
+	eautoreconf
+	
 	# Disable MONO for now because of http://bugs.gentoo.org/382491
 	sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
 }
 
-src_configure() {
+multilib_src_configure() {
 	# http://bugs.gentoo.org/409133
 	export APPINDICATOR_PYTHON_CFLAGS=' '
 	export APPINDICATOR_PYTHON_LIBS=' '
-
+	
 	use introspection && export VALAC="$(type -P valac-${AYATANA_VALA_VERSION})"
-
+	
+	use gtk3 && GTK_SWITCH="--with-gtk=3" || GTK_SWITCH="--with-gtk=2"
+	
 	econf \
 		--disable-silent-rules \
 		--disable-static \
 		--with-html-dir=/usr/share/doc/${PF}/html \
-		--with-gtk=3
+		$(use_enable introspection) \
+		${GTK_SWITCH}
 }
 
-src_install() {
+multilib_src_install() {
 	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog
+}
 
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog
 	prune_libtool_files
 }