--- /usr/portage/dev-libs/libindicator/libindicator-12.10.0-r300.ebuild	2012-07-30 23:01:09.000000000 +0200
+++ libindicator/libindicator-12.10.0-r301.ebuild	2013-03-15 21:00:39.982889176 +0100
@@ -1,9 +1,10 @@
-# 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/libindicator/libindicator-12.10.0-r300.ebuild,v 1.2 2012/07/30 20:51:21 ssuominen Exp $
+# $Header: $
 
-EAPI=4
-inherit eutils flag-o-matic virtualx
+EAPI=5
+
+inherit eutils flag-o-matic virtualx multilib-minimal
 
 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="http://launchpad.net/libindicator"
@@ -12,29 +13,43 @@
 LICENSE="GPL-3"
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="test gtk3"
 
 RDEPEND=">=dev-libs/glib-2.22
-	>=x11-libs/gtk+-3.2:3"
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )"
+	test? ( dev-util/dbus-test-runner )
+	amd64? (
+		x11-proto/kbproto[abi_x86_32?]
+		x11-proto/xproto[abi_x86_32?]
+		)
+	"
 
-src_configure() {
-	append-flags -Wno-error
+ECONF_SOURCE=${S}
 
+multilib_src_configure() {
+	append-flags -Wno-error
+	
+	use gtk3 && GTK_SWITCH="--with-gtk=3" || GTK_SWITCH="--with-gtk=2"
+	
 	econf \
 		--disable-silent-rules \
 		--disable-static \
-		--with-gtk=3
+		${GTK_SWITCH}
 }
 
-src_test() {
+multilib_src_test() {
 	Xemake check #391179
 }
 
-src_install() {
+multilib_src_install() {
 	emake -j1 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
 	dodoc AUTHORS ChangeLog NEWS
 	prune_libtool_files --all
 }