Bump for gtk+-3.6 support. Update license and description. Drop old.

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

7 files changed, 43 insertions, 45 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 8497a00c4e07..1507005fb3dc 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.240 2012/11/26 13:18:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.241 2012/12/09 22:23:58 tetromino Exp $
+
+*gtkmm-3.6.0 (09 Dec 2012)
+
+  09 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gtkmm-2.24.2.ebuild,
+  gtkmm-3.2.0.ebuild, gtkmm-3.4.0.ebuild, -gtkmm-3.4.1.ebuild,
+  gtkmm-3.4.2.ebuild, +gtkmm-3.6.0.ebuild:
+  Bump for gtk+-3.6 support. Update license and description. Drop old.
 
   26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Update to global useflag.
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index ae1e09e11354..9430cae08b1a 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -5,29 +5,23 @@ AUX gtkmm-3.4.0-automagic-gdk-targets.patch 1326 SHA256 46d4f70f8cb1a3f9c2d501ea
 DIST gtkmm-2.24.2.tar.xz 10776640 SHA256 c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d SHA512 9f48138641815a40f9c22f6b8785cbcd9e92473c405577dcc6ae29559835d51a17d87fd75518d8043eeec8ce0f643aeb8cfcd68a6df382d0b392da33f6c6f8b7 WHIRLPOOL 2c0408f4b3f5f6296e23a8782a386b80dd70fcb1247309f700bd03c0468c1f9226b501793c4dbc13ba8304be5429d38c4dc4dd8b64cbfcc290f5c23bf3d814e7
 DIST gtkmm-3.2.0.tar.xz 8784844 SHA256 6195dac58454e287ae17d380c028827f0a49669a3b93f85e2d4f6eb9459674f2 SHA512 845437f06de0956a208cdf1ec0ee5a855220de4765154f78a35d00e38b6e88b9c671a617d786fbdc91e69c207a377a0b5e80808446233f75055b1da8e85c4aac WHIRLPOOL 489cd735fb9a522968e0f21bb86c0bf7d5f3ed237bfe9a291244c495794ca08ea3120a232365b4f58057e102bc6414e32b8a2b619a8b53189a609a34cc3e7508
 DIST gtkmm-3.4.0.tar.xz 9188956 SHA256 42ea4e9acdd37fc3fe7026f8249a5427927b51048adff827bc1312900d6b12e9 SHA512 f98264fe9b4bcd7d926f52408f4a51d7d3191668e95fb9f49c29f88f9a63ef5330ee4d14d021eb4351f3a69646019d9c0963e7065140c5b776e0a7abf9ac62d1 WHIRLPOOL 04ac7aa36198ef4a71b64bd1d750559c499c7970e2e1012a8bb05f7bff6e95f961fa44322904b31af5f17519319a4bf83f1ca302445b9c1cbd3026d73c1ee851
-DIST gtkmm-3.4.1.tar.xz 1677032 SHA256 af218681c8ba7b97cafa67419d43be8d1151a541c1aea2a20d76971ef487bdcf SHA512 1fc950ba1277d62e737ba0e26ef90dc6502f9503837c14a42d98b4ca759d1d0f1469ebde496b02857d7f48064a1229766026580e5c4d31745d5d255339ace3d8 WHIRLPOOL 2b2fdc1447f4a03a2c724c8dbf2d41d6b52ba1a17a556697eab5a8c41a3357aaf058140abe2c38fdac9e6570de50193b8a3b3a62640d19740b027e6e6091ee99
 DIST gtkmm-3.4.2.tar.xz 10304460 SHA256 760c01bca693d26558eb5eae0cf6c743a6bb453258a633f78de506e3c98262b4 SHA512 b5eeb41c9193a14a968794c0a92c685df45f727f1af6744734d9e30e3a3d0220da9dad6eaf60318024d45aca7eb4d6398ddce1c14b6987310a7838e7d030bda1 WHIRLPOOL ad21ca94022c403ff67c59212002d7346dcb47cc08784b0016be49b286e7ccbf3add84d569850717aa1c66509a04a753fe231b577aaa7801b24717f4fb29d74c
-EBUILD gtkmm-2.24.2.ebuild 1339 SHA256 b31186e28faeacc3dfebf24e54c9acca10b851e6f2bff52344fdc05b78fbed98 SHA512 b2ee20e427a376de5457a140fc8ff4e267ef403c2259746a76e48f1865d0cffb5f9b2ac8a472fa55c5d69e90aaa764daabd702f082c2a3899f53abd59093808b WHIRLPOOL f45fcec61e055220f88a9edb62c54d1d8b176f4b47456f0fb0d80e4a5f8ac15eed7e93f4114a743b9b9891dbebc52b9238c80899e0a4a2b336b3958e21fa6698
-EBUILD gtkmm-3.2.0.ebuild 1455 SHA256 86220496cd6e45b93f41c455f27ce7706764edfe9a4c98d5162ec1f66fc7a5ac SHA512 4913a18c32c5c4f96425a3480ff93f03fc8e40b1553cb0e45bc9bb97d9571a1986612af9471befec4c8d62f18e7fbc8f4161ffd8c38d38c08e829d24bbb0a3ea WHIRLPOOL 38800020aa75dfad47d1a7581d442c67effaebb9f6242b2d2a7a00d50a40a45d5621a1419e3c267e741f9ad4dc73c8c7de247210afc59ec0dfaade3476024685
-EBUILD gtkmm-3.4.0.ebuild 1760 SHA256 e6bee89254dfd5cd2d858917f5a710bdc6522eafabbbe8340974a5215f5f02ba SHA512 cb6a41968d500d6b961ba2c122c100261b128019528726383df9b15a715f563ba8f5a8c0c0f5838909b102cefc74800be4ce7e1413001e73488ad5c2d13cdec5 WHIRLPOOL 5728559c06bfa008414ab0a4c49b6848ad4c53eb8394ce29d39169c5fb311fd9778ad29814ca12784b4b551acc4dac72083b07bdccefc378d8da7a5d6552a3cf
-EBUILD gtkmm-3.4.1.ebuild 1583 SHA256 bf5d978a55ecb273270a355cdec1947244c60b4617646284311f901cd99d1190 SHA512 b90f56e2c6108c96a8bb24533a3670b4aebc535378eec3ae20a2681fc2664e34465ba9a22934a949a8e0ef91d16ce9403d587e95fa1788dc5a859e2c4aa85d98 WHIRLPOOL c8eaa57ae5e41a59ee24360e4ab65901cd631695d1efa8682c6efcbf8c6386242ef608c32ff79e2faf5c71dad933e5ba806ee3a64f59338333309c16e3cf85c3
-EBUILD gtkmm-3.4.2.ebuild 1585 SHA256 fce652badb40ebda007de75d2d9ed892382afcb697d467552c54e0741bf4d4f5 SHA512 6f093e7ba4c3756538b956536a778c9556bc9908b986ec0bbc9fa16b8d30dd6a1cf7d274f7946a49a0da5df8f02c173ec301c096e091e889c8e3402e49955602 WHIRLPOOL a0bc2d74912874a590c2410da02b89e64752eacf91822668a6545b789aa8cddfa5a0a1764cff4d875d4bb7229bac8432b1a6aae68f363aa90a8be680044c3821
-MISC ChangeLog 32038 SHA256 cb6c7c2f15125a5ddcaa213e341da390aa511e43596dcf1e5864e1058bc6a522 SHA512 0e71ce8211ffe038f15e681984c38d6389426e242d18c7e4ab0a202071b11303ee4c3b81657afeeba918188a499360cbc8cddd9c0fa25382658e2f1238c9f321 WHIRLPOOL 61f9722fd82ddc42b1700a6b50310f2b300a5713dae494c1cc302fcfddab71a504dc0babe5af325cae0627fdd73d3041d59d0d921fe553f96ef9fd389e6a7c79
+DIST gtkmm-3.6.0.tar.xz 10111820 SHA256 888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359 SHA512 a8549be07d48bde75d1ac87210236dcfdfb97b6ef783396aedac0c4c731a4b6fce8d599eb9f3617c381356751d717e63154fb0ec618c51fa7190a7c3509d3cb7 WHIRLPOOL 308a21a0b8e5a7c0ba98ce79afa257358501443cf872fba8f78ad8b4fc2a5f3cced1e604716d6b1854e0efc7fcd5cb1a3d4b90262c25e728221c8c8d37e01adb
+EBUILD gtkmm-2.24.2.ebuild 1343 SHA256 61531cef514f29f59f5badec97221a94ff03e2861a7b5935066d7cd07c50e06e SHA512 bb1e926c05db142e9e903eb371d9a009d0ce1accd25463cc4bf79d579d30322f10d5e032602a2b3de123822c42c1315422bbf4a622835b847ca3496de3cd894d WHIRLPOOL 5edaddd6ef660646d70cc049ab59f18eb24d25e9c497396aa763f52749de5afc63ba73bf603a7b290e2f6080b2380c7dc1d77ddbbd2b6dee7bbfa85ad34e6ea8
+EBUILD gtkmm-3.2.0.ebuild 1456 SHA256 7c1bd2b0100b1f87306f76470a6d6111d5d29814c2ff052b0b0a1bf179b19fc1 SHA512 6d8d66b1894dbcf9018f5d22f42d8f56fcd4824c438ff108ea2dc06c710e11b0d43cc6d1a235ec988ec91653c82faa84c06539cf3b7a9f6d5b67ef7a2c9d0cca WHIRLPOOL ccb81921bab1d1738f56b9d28ae13137b459c088b70c55fc14cc8f387208fc4838f6ffc343324d372339a4ee449074c839751ea37170b56d6edb683234a54d02
+EBUILD gtkmm-3.4.0.ebuild 1762 SHA256 cf7e88dcbcd30789ab0eeb90cb0226c89e2d9252913d1007e14229983afb7ded SHA512 16d50033674f4a77342096978f00328334efb5defef93e9590b61e3f5a3396433fab0f92ca7e15990c24a67b2672e3f7f9c43a638bbbf9f63a8064c87307c4ba WHIRLPOOL afaead67ff2c09b5663492180f3f6b6f9eec15993c428ed34705ca1586e05ac095923a875fb4160a0d3ca2723c463cdc5ea8ea0f63e429c1a37d8236905d6c26
+EBUILD gtkmm-3.4.2.ebuild 1586 SHA256 937f6868063bb6d2c9c53fd4e86c8069afa74fec51c6f8a37f4c3a4ea56c505f SHA512 88d9380fd94cfb3e3bbcde86c19eb629d4cd86815bb5db0e5e85f07da67e016005ecde265ec6e02064c7bdb54ffda79e50b97129d22b408166f515286491b3ff WHIRLPOOL 1b777e7e41f0d30a03ba75d8b0929779d855ce473b4ac80fe4713977ec8cbc7882ea2d8a6977363ce776d412c2c1e4174c7fbb7dec065d3fdcc1c932d1a0c514
+EBUILD gtkmm-3.6.0.ebuild 1611 SHA256 403599b22d5f1bbbbf520c77d6cad18eb3f020bf56fff64c538f7560e2b04af6 SHA512 7122cd87a6c24fab85d8a042735f33745691d798128e21b51fca4f10211fdb03812f857ab53b8a4c30030db27915fbe5bd52877dc444a683d7f4c63bbdbed56d WHIRLPOOL bf8ac7f91e24232cf4a19004578058b82907c713f3a76ba784062c7e5b50a05a904d6ded270b9fff187a8f1cc3910aa5f1a486dfce38bd0aa41435981b006ec9
+MISC ChangeLog 32324 SHA256 bb0d700a86e74f337d2545998d417cfa369b32b6b3aca1a74631298cf321fa6a SHA512 79c51071f0d4fe5e66eac978e3591ed3403517ad4da00371da00f3764351f7ab590d1be340fd9e34f13ec612b16b50dce7b983fcda51854489d75869c4a440da WHIRLPOOL 6ae9f7b9433f1b6601ec4c0dbaea330901f90c596a09e34349b40a3293167828792458c671f399f85549c03241ecf39ab2764658f342f5710eacff7a3fdb8717
 MISC metadata.xml 161 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 SHA512 22fe7471187a068f45de295adc5349f8f01d16d06562f8edfceb5dacb604d98b0e3cadc23f7d0b164f6429769b71961bc5d9088a41f1ca4a968e4be37ac6ef1b WHIRLPOOL 92db96c310438550f7073b19fb34f6d5d7e478b04b43bff8a2815374ce50c2fa7291018c4131d48face3f3f0a66e0a3d2a778c42550a1fbfedb386db48a4bf05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQs2wLAAoJEOSiRoyO7jvoMusP/iwsQcrVzt4s4JVVZqoEBxWS
-VZx+OUQBGpUQF4NchYqLHfiMcdAEm/MkJf1BcysnpuCa4bPbbU8Tvmo/63gPFpHj
-p6opqwrNKK5uUOC1n0bazdnEB7j/awu22MlhMOaCXJyJ9wlEoTTciUlHI0XvgQCM
-eewblZ64YsMwk67xJ8szou9SptzWksFHIyTJOKTmbmMz6KTvYB55brLa1b/7m+ig
-23vfFXKI7lJDGWGx82btqfKoKbi14dNZVqTHeeOzIlwin4n8bVe5CvLLFGZqz2HI
-mUvmG++3Lvli3vU2qScIfdepFEemNyYE0HOTl/g/Evxb5z26PI4FtcpBzC42Iyyf
-y6FShla945k8Cf5ahmDTLWvOf8/6DGZD4pbBQ8/ttgLabYzTpnbHdj8BqO2WU3BX
-bBUWipYV0B46T7UjmhpR+TWAYzn8iZYpIbsaex+lFa2gvIHOETsdbirNxGD9ES3w
-UjJCoR8LbV2MAa8bwWtNZfqqQiMeUt/zWiYt6+6tWiLubdrEFE4ouEkSBThwzPGb
-ugXqf5G5rQEUxPvbB3bZ9LxhaImt4wGyasc61l217KZg2QSMPsO4TcbALPLrS8Iq
-LXaV8VFefKr2wjYGwcy8Uo8ADbQ1idGSvHs3pNIDFhfFfR3dfPOnu+8B2A0FMRht
-t4hwX4/8qU2zIiejgc+e
-=feTx
+iQEcBAEBCAAGBQJQxQ+AAAoJEJ0WA1zPCt1hmTgH/3020es7xUastClL8hxiPEhq
+dY+kHidoetmjRNd+VjVytI9G6cWBwMoJPZXVB9ZgP9QM8jqHf3XXNjOZffp7cLeT
+zlvGqDT0YZx0EVhp4OK5eiHxXrjZLS2IA6hBYhDd76X9s1m4yAvYTriaYhabPiL/
+sUoygxLA9Z3GI9Rn0eRptv7RP9pdlN3WqWasipTc23EI1HwrAhnulTAT8aqBrvrL
+ehdALwYHL1NkSP+YAL0gZ3BNBag2kcwS40wMzQgAfVYXzDmFtmh9MbPaQFWQoqWk
+VBIbkimUED4J9N1zsrMoKj/r7KFg7jyk7J6M1SCa+ObGJhUWxhnQYpWUxYTy4H8=
+=MZ3H
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild
index 21e94d7b4c0f..99f18ec1737c 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild,v 1.9 2012/05/04 03:44:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.2.ebuild,v 1.10 2012/12/09 22:23:58 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
diff --git a/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild
index c6aaa975aa20..3360b05f42e4 100644
--- a/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild,v 1.9 2012/05/20 19:36:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.2.0.ebuild,v 1.10 2012/12/09 22:23:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3.0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc examples test"
diff --git a/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
index aff7e2666aa5..ce26d09c0201 100644
--- a/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild,v 1.10 2012/10/28 16:40:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild,v 1.11 2012/12/09 22:23:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3.0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
diff --git a/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild
index 4554c5531501..5440ffc87983 100644
--- a/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild,v 1.2 2012/10/14 20:32:24 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.2.ebuild,v 1.3 2012/12/09 22:23:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,10 +8,10 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="3.0"
 KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
diff --git a/dev-cpp/gtkmm/gtkmm-3.4.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild
index 63aafd5888cd..bd5698374399 100644
--- a/dev-cpp/gtkmm/gtkmm-3.4.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild
@@ -1,25 +1,25 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.1.ebuild,v 1.1 2012/09/15 09:21:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.6.0.ebuild,v 1.1 2012/12/09 22:23:58 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="C++ interface for GTK+2"
+DESCRIPTION="C++ interface for GTK+"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
-SLOT="3.0"
+LICENSE="LGPL-2.1+"
+SLOT="3.0/1" # subslot is libgtkmm-3.0 soname suffix
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 RDEPEND="
-	>=dev-cpp/glibmm-2.32.0:2
-	>=x11-libs/gtk+-3.4.0:3[aqua?,wayland?,X?]
+	>=dev-cpp/glibmm-2.34:2
+	>=x11-libs/gtk+-3.5.12:3[aqua?,wayland?,X?]
 	>=x11-libs/gdk-pixbuf-2.22.1:2
 	>=dev-cpp/atkmm-2.22.2
 	>=dev-cpp/cairomm-1.9.2.2
@@ -31,11 +31,10 @@ DEPEND="${RDEPEND}
 		media-gfx/graphviz
 		dev-libs/libxslt
 		app-doc/doxygen )"
-
 #	dev-cpp/mm-common"
 # eautoreconf needs mm-common
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog PORTING NEWS README"
 	targets=
 	G2CONF="${G2CONF}
@@ -44,9 +43,7 @@ pkg_setup() {
 		$(use_enable aqua quartz-backend)
 		$(use_enable wayland wayland-backend)
 		$(use_enable X x11-backend)"
-}
 
-src_prepare() {
 	if ! use test; then
 		# don't waste time building tests
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \