--- /usr/portage/dev-libs/libdbusmenu/libdbusmenu-0.6.2.ebuild	2012-10-30 08:31:08.000000000 +0100
+++ libdbusmenu/libdbusmenu-0.6.2-r1.ebuild	2013-03-15 21:00:42.756912342 +0100
@@ -1,12 +1,12 @@
-# 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/libdbusmenu/libdbusmenu-0.6.2.ebuild,v 1.5 2012/10/30 07:22:29 ssuominen Exp $
+# $Header: $
 
-EAPI=4
+EAPI=5
 
 AYATANA_VALA_VERSION=0.16
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib-minimal
 
 DESCRIPTION="Library to pass menu structure across DBus"
 HOMEPAGE="http://launchpad.net/dbusmenu"
@@ -15,12 +15,13 @@
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug gtk +introspection"
+IUSE="debug gtk gtk3 +introspection"
 
 RDEPEND=">=dev-libs/glib-2.32
 	>=dev-libs/dbus-glib-0.100
 	dev-libs/libxml2
-	gtk? ( >=x11-libs/gtk+-3.2:3 )
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	!gtk3? ( gtk? ( x11-libs/gtk+:2 ) )
 	introspection? ( >=dev-libs/gobject-introspection-1 )
 	!<${CATEGORY}/${PN}-0.5.1-r200"
 DEPEND="${RDEPEND}
@@ -28,12 +29,17 @@
 	dev-util/intltool
 	virtual/pkgconfig
 	introspection? ( dev-lang/vala:${AYATANA_VALA_VERSION}[vapigen] )"
+REQUIRED_USE="gtk3? ( gtk )"
 
-src_configure() {
+ECONF_SOURCE=${S}
+
+multilib_src_configure() {
 	append-flags -Wno-error #414323
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/share/pkgconfig/
 
 	use introspection && export VALA_API_GEN="$(type -P vapigen-${AYATANA_VALA_VERSION})"
-
+	use gtk3 && GTK_SWITCH="--with-gtk=3" || GTK_SWITCH="--with-gtk=2"
+	
 	# dumper extra tool is only for GTK+-2.x, tests use valgrind which is stupid
 	econf \
 		--docdir=/usr/share/doc/${PF} \
@@ -47,13 +53,16 @@
 		$(use_enable introspection vala) \
 		$(use_enable debug massivedebugging) \
 		--with-html-dir=/usr/share/doc/${PF}/html \
-		--with-gtk=3
+		${GTK_SWITCH}
 }
 
-src_test() { :; } #440192
+multilib_src_test() { :; } #440192
 
-src_install() {
+multilib_src_install() {
 	emake -j1 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
 	dodoc AUTHORS ChangeLog README
 
 	local a b