6 files changed, 79 insertions, 45 deletions
diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index 2a1cfbde10e3..93bdc2c691fb 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/glibmm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.237 2015/06/07 10:17:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.238 2015/06/09 15:02:55 eva Exp $
+
+*glibmm-2.44.0 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> -glibmm-2.42.0.ebuild,
+  +glibmm-2.44.0.ebuild:
+  Version bump for Gnome 3.16. Clean up old revision.
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> glibmm-2.42.0-r1.ebuild:
   arm stable, bug #534012
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 5798806e9f79..b4951617b49d 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -3,15 +3,16 @@ Hash: SHA256
 
 DIST glibmm-2.40.0.tar.xz 5645840 SHA256 34f320fad7e0057c63863706caa802ae0051b21523bed91ec33baf8421ca484f SHA512 3a51b3e311ba59505b3c452afdfdf456f184c39651d81317ff62f942d309f8707306cc68c69c20f7534f585036086088159414c7e75de59ab2684c4850559cb9 WHIRLPOOL 876ac86023e41b281408bf5435e32cd7674c2db1f92910508a082c8b316651b9e612de431ff767bffe4cd0613bb03a040e7569198cf3dc607f572cbcf5198bb2
 DIST glibmm-2.42.0.tar.xz 6031860 SHA256 985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397 SHA512 63bac04bf288d90f40d8bd08d16e147a42e2293a99998fabdc83bf1ef8a50197e44d95c1608f93fe7f2a1a791dd624dffb2db4426d3eaf32ce0f75ddac3559fb WHIRLPOOL 644b9446907066b20695ae9d848633b73aa30adff43d7c08f7afe002670cfac96a7e98d9669d35721c1f41fd2efb1ebc03d84ae1bdd3147f32e5a70ad3d099ea
+DIST glibmm-2.44.0.tar.xz 6102664 SHA256 1b0ac0425d24895507c0e0e8088a464c7ae2d289c47afa1c11f63278fc672ea8 SHA512 4a932b127ce0ed0798cef3555fdd1ca1632fc10720b74f9a39626989c216542807d76ae67ebc980049b65b1c163d236fc9875506ca2d80584c724394bbb8bfd7 WHIRLPOOL d1fad56af4487e661398ec3be006c528c5c6c1cba0181ad08725f14cb94bbbfe2f9c20870722b90ebca61a51e9959eee89b1f92a7f00f99bc3a573b123360197
 EBUILD glibmm-2.40.0.ebuild 1643 SHA256 12d4c968ea10a73f7567233f6295ad1a51233f870eeca6cb2029e54ff4009de6 SHA512 c9217edfa3c37875b898e6c0a3cf6c1b30d0a82a36d7ea34a5cd34cb3566799429e71d2325498fe094d3d2e389d0abd20f3f77b15728f55fe281f4fafa012db4 WHIRLPOOL b1aa97f8ae88ab407c6f1fb7c22b5e3235675ff2d7064ea99193c3bd8bb154391626bd81babaa2151b24d57db13f19b59aed3ec497f3f8b02e696757721fcef4
 EBUILD glibmm-2.42.0-r1.ebuild 2109 SHA256 6f7c1f5fdbcb3de8dca5bd3258192eb855f7a0d3d74f9fd17108a6d59edcd604 SHA512 113c1fbd1f31255739f271eaa6a42a836fc24001545ee436425fe281487256f160633bdcd246e85182e1185903b858083ad10ffe540683028a71b3a5bacb57ca WHIRLPOOL 7a2a4bf472dc73c6883bd9bb84eb931545b1a5b039d6b067856f187c586fb48bc9bd7c5dc5032fad5ae7e8789a8953a8332656108e2d7fe3b62d70b1c6d5819c
-EBUILD glibmm-2.42.0.ebuild 1779 SHA256 bc4a8bcfb3a15ac24b6cf9b17fd4fc6863094ea9169b25e2011e11095afdd5f8 SHA512 016237e52f99e603dfe91f6435917449e83f47995ca6985d8cf0828118fd0f301c4ad4a1f7011257c133c5d439eb44ac9016bfb04107a38a19a236a42c5fe32b WHIRLPOOL 9e25ae638b28f7f6900d2f3935a70ecb6b1f20a9ae1d1335ceded1241da99988120d10941fea74bd712c1d0f1020957ab189194e48aa54c009b44b86d95dc538
-MISC ChangeLog 28875 SHA256 69091bc1a4da11743a8b29bc2b572671bde02f4a7d85c6d838c490182d233464 SHA512 55467728b5ed3298e2791c9b200a346f697da92d4e187557a55ebaefb7d33bb209592a1cdaf9aa8fce5269907c657ece88787d071b59b03ed02bbd4df91c97aa WHIRLPOOL f237b9a3e011d9e9311718424a7efb0841c7120f167db92bf988c41cd646d785727b23e9af7ebcf98149dc2d4d3ddcdc3b173c2b27af075e5675bebb6e62186d
+EBUILD glibmm-2.44.0.ebuild 2109 SHA256 611632b70fee6f959410868257e33b5218f51e0045f8bf9efe2c11aa5bff5450 SHA512 314432ac507c6dffdb06f2a714de4c6d4af2d60b8d8b7a6d961084724f1c738ffdb746fcf6552ae764be27f485a8fc0a74911e06dbf948b2ee5bc9d157823e18 WHIRLPOOL 99d9b58d80583296a153d5ba09e7dc16c8e0f18c82a7fa167bf27db6965ef7f5d602c77f73c841647c98e65785cc914d58cbc28f8021c7c870c03b133f6c69fc
+MISC ChangeLog 29059 SHA256 896aeafe0f8756982179077f1859e9d7a9c4463125b147230301694e808d2d83 SHA512 5d640ce5d018f7510a9b2920916d56d285634a65365dccf3bb0322381b66fe3b65bd38886adf2f1db6d3782276775169a3595a1b902ac09274495f64330d4280 WHIRLPOOL 4d8df0e8495260fcf1d4d1092946f329e56d2e53b41b6348d3e8488dba542bf932400657de05ed6adae95917b82baeba811090b1245c023e28aebb2491a2d88a
 MISC metadata.xml 161 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 SHA512 22fe7471187a068f45de295adc5349f8f01d16d06562f8edfceb5dacb604d98b0e3cadc23f7d0b164f6429769b71961bc5d9088a41f1ca4a968e4be37ac6ef1b WHIRLPOOL 92db96c310438550f7073b19fb34f6d5d7e478b04b43bff8a2815374ce50c2fa7291018c4131d48face3f3f0a66e0a3d2a778c42550a1fbfedb386db48a4bf05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV0GiMACgkQkKaRLQcq0GIepACeLNUusPEpkgHgAaRCDpQD/JiW
-kLAAn2iR+Yt5ht/nfnLGBu99yBBYKhNC
-=kJBW
+iEYEAREIAAYFAlV3ACAACgkQ1fmVwcYIWAYzxACg2CMZFGHhZk5kENNqKfQxUlrO
+Yq0AniQGuxFSyjULCdaPWeD7p49qFvCX
+=0set
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/glibmm/glibmm-2.42.0.ebuild b/dev-cpp/glibmm/glibmm-2.44.0.ebuild
index 9940caedbe70..be6ee62a81b4 100644
--- a/dev-cpp/glibmm/glibmm-2.42.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.44.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.42.0.ebuild,v 1.1 2014/12/21 12:18:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.44.0.ebuild,v 1.1 2015/06/09 15:02:55 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 multilib-minimal
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="http://www.gtkmm.org"
@@ -15,11 +15,16 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"
 
-RDEPEND="
-	>=dev-libs/libsigc++-2.2.10:2
-	>=dev-libs/glib-2.42:2
+COMMON_DEPEND="
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtkmmlibs-20140508
+		!app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
+"
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
@@ -32,11 +37,9 @@ src_prepare() {
 			-i Makefile.am Makefile.in || die "sed 1 failed"
 	fi
 
-	if ! use examples; then
-		# don't waste time building examples
-		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
+	# don't build examples - we want to install example sources, not binaries
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die "sed 2 failed"
 
 	# Test fails with IPv6 but not v4, upstream bug #720073
 	sed -e 's:giomm_tls_client/test::' \
@@ -45,15 +48,15 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure() {
-	gnome2_src_configure \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
 		$(use_enable debug debug-refcounting) \
-		$(use_enable doc documentation) \
+		$(multilib_native_use_enable doc documentation) \
 		--enable-deprecated-api
 }
 
-src_test() {
-	cd "${S}/tests/"
+multilib_src_test() {
+	cd tests
 	default
 
 	for i in */test; do
@@ -61,8 +64,12 @@ src_test() {
 	done
 }
 
-src_install() {
+multilib_src_install() {
 	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
 
 	if ! use doc && ! use examples; then
 		rm -fr "${ED}usr/share/doc/glibmm*"
diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index e1e89941a1f5..6ec31cb237a3 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.298 2015/06/07 10:20:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.299 2015/06/09 15:04:27 eva Exp $
+
+*gtkmm-3.16.0 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> -gtkmm-3.14.0.ebuild,
+  +gtkmm-3.16.0.ebuild:
+  Version bump for Gnome 3.16. Clean up old revision.
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org> gtkmm-2.24.4-r1.ebuild:
   arm stable, bug #534012
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 2ba3209d8829..6e723e174b02 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -4,17 +4,18 @@ Hash: SHA256
 DIST gtkmm-2.24.4.tar.xz 10262212 SHA256 443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee SHA512 75d8c7a7c32adb33a9867b36877422bce52d8486d66be5aaa2afe1eee439efc2ba09aab7d06b9986d74879103415062c5386d5354aff6d44a63b2ba2d75f7c89 WHIRLPOOL 06074ec3f2f7adfe1f24b4d629ef73e852a9b21d719f2705f254389802813b53625be0be4aa30e191df134609b8349ea0725afcf858d26c0bf18282dd8358ab0
 DIST gtkmm-3.12.0.tar.xz 10113956 SHA256 86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1 SHA512 a412fca2adc0b35c6f282ce091587a66f255a27fe294b0f064083a4c2b621bf0b44999e4967dd3ed21bb07bd5dc27e312dafa1d6c20ed976a01e0a7a558b5fad WHIRLPOOL c59c2bc5e34463a599aa71462d8635c83ee763bc9cc3fd702d99f8341a2db3e86934d543f86c57fd967af6a964cf41b1c94562e4b556a97e0d80949b3857d432
 DIST gtkmm-3.14.0.tar.xz 11400284 SHA256 d9f528a62c6ec226fa08287c45c7465b2dce5aae5068e9ac48d30a64a378e48b SHA512 0525381c19fd0ac0c2f1895f8acd1401caa4b3486b4ca644fb032e1dc984a39deac6552f0bd59e6892705c77d050e0642618bd48ad28e353eaf331c790a684c2 WHIRLPOOL 877e6f7ce7d7ce97a4361829320215bb308f05cda27475bf8f925905ac86054bf03a3137336085ccf244bac87cdeb285b5229628ec09c484a6b12d51a8cb88cd
+DIST gtkmm-3.16.0.tar.xz 11468644 SHA256 9b8d4af5e1bb64e52b53bc8ef471ef43e1b9d11a829f16ef54c3a92985b0dd0c SHA512 282e53a0f3f3c4d1594057e4367bb4f4abe8fbf7f2bae2a819b35d4e4137a3e739aa83039114eb52eba16a9dd048abd78f011fb14635e53cf61019c6f4c06397 WHIRLPOOL 87c4dbccb79472c264621b3b96f5e06c73d03f4bbc0121f25e9c29f75e5c3e3e57aede9398b6c8b00e47d4eccd5eb6dfc6068c242af744f77f1d59af14bd2f25
 EBUILD gtkmm-2.24.4-r1.ebuild 1822 SHA256 fc09226432c6a8797cce64469809d5503481fee9cf45ec8a829968083113a16e SHA512 71e059501bf4f4c8761fabae9270bbadf7203d1dfcb5bf18eb6dfbd4af2b743b46a2a6d136fcd73af02245e94a0a095ffc5ebbc4b751139eb4a0dbc65bd20375 WHIRLPOOL 2b9cab9d10b06727abd4b8ed966e2ac1a05ef9f863ef9ede7cb735f9ba899c40d0d97368574518bc4baa6ea365a6c00ecb6fcd3e03a65d89fac83d9466df6817
 EBUILD gtkmm-2.24.4.ebuild 1312 SHA256 3ce21c511d2f6ee6ff37aa5c1f908d73618834596114275de849deff477a8e7d SHA512 024b7aff3f619bcf112903683bba888ec0a20be4f7185233a17cf58750059d164ce941bd34526fee0d3e5cc208e1bece95591e7ef889e3c7bbb5ea315d5635d5 WHIRLPOOL a3b34e35ecaf2c09e6252ee8beebc2c28dd538d1de30c6301c67bc761843474f86dfc62b06bcf1e393822842f32ceb5f470abf569c41af4c94c53f2a74e80c01
 EBUILD gtkmm-3.12.0.ebuild 1563 SHA256 cecee19001a46d76abc87c2f3c4ac839de390f1f02a6f3a1125c7e297498044e SHA512 f74495f3ccd85d771f1027e1b7f5b938e27548abf4475261ca2b986a522ba81df3cffaa3fdd96eac8211e2143eb681e8d6cc2e21247ad5789effcb64c21471bc WHIRLPOOL f8fe4fe583ac0ad87bd1ee9c1b50e5725c96fb37b352b657dfa418ad66329534e852ac5b5117a364eb5ff56f27080d3cfdb8064899f1d26f76d0a1ef2fc6603d
 EBUILD gtkmm-3.14.0-r1.ebuild 2038 SHA256 e47e60b9081deff2cf5d5e15b08d3ae4646c56df3e4f3da63484a8a1eefa3bb4 SHA512 a3092bad0dac543c185d2527bb8d6f6b0842b49495cc23ccbc8561e117e53304405fc4553ecc9c5a327ea248b867c0be848bc315560069d516c78d2bec0cddc8 WHIRLPOOL 8b72b3005b094cf0ede4104de253fc87a3eee6c62c161ff5c7bd82e01b2ae6f3fcde4aa37727054cd89b1827f14debac848d2ed08349a0016a1f6a76ed108c2a
-EBUILD gtkmm-3.14.0.ebuild 1571 SHA256 dfda411e8bc81d5000d738ae2f5934e6e3465ac6607d0a4f9d0f18eebdf8db26 SHA512 0a6db7f4dca7a30b2a11920bcec05c5b03263d5c681b4a53f5ee6359b360cb13bfac6e353768bcb8996aa2c3da49bd500f84430c5e5178a780a53d341c57eee3 WHIRLPOOL 42e4f71255c81ff803429bbd9a0204bc9086e3538d4eb17e54324d8ce56e087d608f8ae32a67a72c3aee04e4a0be3db02a4092f4966e8adcda08eae398cea70b
-MISC ChangeLog 39111 SHA256 fbfe451fbeb7c777f9a1a632c3c2c21110f2d66e1fdf84d71412d442c6eb794f SHA512 ab74c6f3d0a38393117ec858805eae781afe44cd1bd016afcc0791d980791d82e05e33277e0eae4b947fb102d4cb5716ce3fa46a376a9ed11868763e2254ceb4 WHIRLPOOL 0efd927c50fd542e80c5d1283784190a38ea5c37aa27755cb81b66fe8c6b5aea0889259f2323b385bb164345e7de280d527c99435b12f9c87be21b141e98f17c
+EBUILD gtkmm-3.16.0.ebuild 2038 SHA256 ac85214540f0765ee9ff940713782d79127b530181b9569ab0c2923ae064aac0 SHA512 9b29bfefe29f8354cc701694a77388abf5102a37ff20c164ccdd994d55bd943f6bafab111fa1f84c5ee9a81c53921c2739628cc997a5764517960e976c3232a5 WHIRLPOOL 038c482bd12dc2a64e8756e12fa7656ddf11dc144dfbfce9bc06fd5d6f5f4e6247d8ab41aac08cdd983442dd844ed5aaba7c9a91d34ab7b335aa6f1ddf870561
+MISC ChangeLog 39292 SHA256 c27700cce0946ae8d39cf45c98d15afbe646fa60831b0cb3b8e61425c4dcabc2 SHA512 ffbf02022c4a17169c5d443cd300676badf8e0086b30e51978ad7230b018a41689c2a0e1682a311c940e3cfde874960b24d070ba1fbb3cb8267f02f8927e47ae WHIRLPOOL 32e997523aa6e482bb63c8ac8a158b488118275fe6df4823c75b6d3a176a8403e8ec8c182566ffeb2fd5217c66cc2ead9f4dab460dc5297f0b43d9a72bafb2c1
 MISC metadata.xml 161 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 SHA512 22fe7471187a068f45de295adc5349f8f01d16d06562f8edfceb5dacb604d98b0e3cadc23f7d0b164f6429769b71961bc5d9088a41f1ca4a968e4be37ac6ef1b WHIRLPOOL 92db96c310438550f7073b19fb34f6d5d7e478b04b43bff8a2815374ce50c2fa7291018c4131d48face3f3f0a66e0a3d2a778c42550a1fbfedb386db48a4bf05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV0GwgACgkQkKaRLQcq0GLTmQCeK+V2Vv+sCZnIwLVHJFHJkm7Y
-b4QAn2VmK+522jZ4qNGoISOblfnkjMOT
-=JIdf
+iEYEAREIAAYFAlV3AHwACgkQ1fmVwcYIWAYmIACcCUdoupH4Fk+uyazKPs87h33n
+yQcAoN3khh0Qi65iL7rn4FQyKY19B/m2
+=oh8V
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/gtkmm-3.14.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
index 7bf3731b2c29..61826a9440f0 100644
--- a/dev-cpp/gtkmm/gtkmm-3.14.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.14.0.ebuild,v 1.2 2015/03/06 05:06:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild,v 1.1 2015/06/09 15:04:27 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 multilib-minimal
 
 DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
@@ -16,16 +16,21 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~
 IUSE="aqua doc examples test wayland +X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
-RDEPEND="
-	>=dev-cpp/glibmm-2.41.2:2
-	>=x11-libs/gtk+-3.14:3[aqua?,wayland?,X?]
-	>=x11-libs/gdk-pixbuf-2.26:2
-	>=dev-cpp/atkmm-2.22.2
-	>=dev-cpp/cairomm-1.9.2.2
-	>=dev-cpp/pangomm-2.27.1:1.4
-	dev-libs/libsigc++:2
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.44.0:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.16:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.28:2[${MULTILIB_USEDEP}]
+	>=dev-cpp/atkmm-2.22.7[${MULTILIB_USEDEP}]
+	>=dev-cpp/cairomm-1.10.0-r1[${MULTILIB_USEDEP}]
+	>=dev-cpp/pangomm-2.34.0:1.4[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtkmmlibs-20140508
+		!app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
+"
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? (
 		media-gfx/graphviz
@@ -51,12 +56,20 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure() {
-	DOCS="AUTHORS ChangeLog PORTING NEWS README"
-	gnome2_src_configure \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
 		--enable-api-atkmm \
-		$(use_enable doc documentation) \
+		$(multilib_native_use_enable doc documentation) \
 		$(use_enable aqua quartz-backend) \
 		$(use_enable wayland wayland-backend) \
 		$(use_enable X x11-backend)
 }
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog PORTING NEWS README"
+	einstalldocs
+}