Version bump, also use eapi4 and install settings.ini instead of gtkrc as it's the way to configure default settings for gtk3. Remove old.

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

7 files changed, 38 insertions, 548 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 4d1ec0453a4f..f648bbc277ec 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.524 2011/07/11 15:43:06 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.525 2011/07/28 18:04:54 pacho Exp $
+
+*gtk+-3.0.12 (28 Jul 2011)
+
+  28 Jul 2011; Pacho Ramos <pacho@gentoo.org> -gtk+-2.22.1-r1.ebuild,
+  -files/gtk+-2.22.1-old-icons.patch, -files/gtk+-2.22.1-print-settings.patch,
+  -gtk+-3.0.10.ebuild, +gtk+-3.0.12.ebuild, +files/settings.ini:
+  Version bump, also use eapi4 and install settings.ini instead of gtkrc as
+  it's the way to configure default settings for gtk3. Remove old.
 
   11 Jul 2011; Matt Turner <mattst88@gentoo.org> gtk+-3.0.11.ebuild:
   Added ~mips, bug 364693
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4875f367694e..d8bb86f68822 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
 AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
@@ -5,27 +8,31 @@ AUX gtk+-1.2.10-cleanup.patch 246 RMD160 edc29b9cbf43115f8630c465e1ba91a631e733c
 AUX gtk+-1.2.10-m4.patch 220 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 SHA1 898e6846de5d4c57ecc2e2503ed56355324fd2ee SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324
 AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734
 AUX gtk+-2.21.3-multilib.patch 611 RMD160 eca8037e03582ee04ba454b2010ba6405551239d SHA1 c304db88d098e59f2776dd99392d6712b84a4972 SHA256 4c3db89f401176ea121a982974d81ca6ba3db315d2bce16c83ef7f7d7f629f3b
-AUX gtk+-2.22.1-old-icons.patch 12064 RMD160 6aba5be9d9bcd3822fba547e5da375d9609f5011 SHA1 05704ffa9926b14626a1426b0e87110aff8b290e SHA256 74d10eec7a1620565db13270b0cd5de748af0a7101b2c3950cd33a3623fa6085
-AUX gtk+-2.22.1-print-settings.patch 1222 RMD160 afcdd3c81cb9e14a8bc4cef866f440d61d79e477 SHA1 0fea85e06c70ee554fa963572ebb8a19f6f4a953 SHA256 245ba029eeac389fe9ce6f23864178d2851a167621b622631044f613324a0da9
 AUX gtk+-2.24.4-old-icons.patch 17368 RMD160 e7638f603a06234814b8b342584ab4e80a481cd6 SHA1 2530c85a890b618aa8e3277b4f10da632d865be9 SHA256 4cb55c322e45ea151217db40c6761e6eaaea89551ff1a4134107c92774a7b635
 AUX gtk+-2.24.5-background-repaint.patch 1884 RMD160 d20c7389127d7b6a6253c438c9b0a2563828b823 SHA1 9800e67a5457734871bb45d34e5b3724ee6e9708 SHA256 3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93
 AUX gtk+-2.24.5-darwin-quartz-introspection.patch 1127 RMD160 9b08611d585fe88d8db310f91efdd22396f567d9 SHA1 d36be7be62307d1a6f4e64cd14d3da523af97488 SHA256 a0f91bf77bd2827c10c31c0f2d7de106254d3b053e5a2bf734e35bd814db3493
 AUX gtk+-3.0.11-darwin-quartz-introspection.patch 2515 RMD160 e03ad9794395099b729e4cba53135b34ace777d0 SHA1 deda072dc35c454facccc232493bca5a5150b443 SHA256 49f8e2f1635c3eb8d7a4b2d1039150fc573f6a931ad2b3736176691ad2df8faf
 AUX gtk+-3.0.8-darwin-quartz.patch 579 RMD160 e7cee263b7edbf2d8cdfb848939c0f588b595567 SHA1 5196ef95f68080e2bd8a1582db7d61b0a65b0aac SHA256 2d30683f849be9be698424514341e814833c102c4f41d12cd02536cba62846fc
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
+AUX settings.ini 96 RMD160 ff8d7e28f097820b15ea1d2168d9405db1a5707b SHA1 92c3120655ba14f163846a22d5c94fa50b0eb437 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
-DIST gtk+-2.22.1.tar.bz2 18306164 RMD160 f7d5cd312dc982a599e6a834c87c1bc07ff87e2d SHA1 c88d8be4aebd6e59d6ca44d57f6acd18e2be1c08 SHA256 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
 DIST gtk+-2.24.4.tar.bz2 17607752 RMD160 56a6f731cfdc47686c71f8f6b4253484e08dd230 SHA1 c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf SHA256 7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5
 DIST gtk+-2.24.5.tar.xz 13252580 RMD160 f0eb690c906166c5f0e296faac8fdb983955921b SHA1 eb1200fe42bd2d5e3dc1bdb69b524600cbc06df1 SHA256 d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3
-DIST gtk+-3.0.10.tar.bz2 16894706 RMD160 ad5c86cfca724af72c1b48f3e511b45e444b02ac SHA1 5e8e356b87796b0a99f16a01663ec1aa972d19eb SHA256 a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30
 DIST gtk+-3.0.11.tar.xz 12673196 RMD160 e7ed69ac6f0876917263dabbae2c8f9fb83325c9 SHA1 5278d6f1dfe1ba8299028704962f5fe2dd41952c SHA256 e2e38b316c4657df0cf376c3b6aad63158a9068c557ad41033a677f29967001b
+DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
-EBUILD gtk+-2.22.1-r1.ebuild 7597 RMD160 03ba03c4ff419e7898fa2d547421727162e76658 SHA1 f5c24e1cd89a41f13ecee6f143859f9f94a5f8e9 SHA256 4224d89c2380fdc57bb15d6af05f6d442cedc21ba99dfc9a3048c33b3b45001a
 EBUILD gtk+-2.24.4.ebuild 7494 RMD160 645ea0730a5ce2e7654246670ab48d8718341691 SHA1 2124ba5abe3ed82d7aaa7c0384083f91e665fc8f SHA256 7f6107c9f000521006ac205c8d386be09f20a136a5825878903fb35c8d64dd8c
 EBUILD gtk+-2.24.5-r1.ebuild 7984 RMD160 3b6df3337e84f42d8323063f9251c752f3d19746 SHA1 bbf0d3b4df82dfb5fb88fbaddeb1063d9842d0d5 SHA256 f416e2421cf8f2a1f7ce54850f05c3ee77c9037bec7287f08a515970ed77f70f
-EBUILD gtk+-3.0.10.ebuild 5799 RMD160 593efc5363f470144c83d14803c02c95b5009d56 SHA1 cdcaa3dc8618583958d4172b23a9a49e4f437b4c SHA256 02fe8d1fc8bf2d9611d711725878cf99c690101baad6cc70277a2c0c82d33029
 EBUILD gtk+-3.0.11.ebuild 6055 RMD160 7e69516cff88f605ad0aa0635fa35d20a4d2dc87 SHA1 79acbd6124d08bdca724edc777fc49ee6577fe39 SHA256 5d9f161be94d922fd008d870f03a1d829401cd96bdb7c8b53c0afad806cfd042
-MISC ChangeLog 78315 RMD160 7ff56800b0b579b3a5fdb04702608cbc8c6d504a SHA1 8bc27e3e97561a92d75a540528398e0dd888f34a SHA256 5bb02300ec719aebc378aabc4cba143503f779496280c7a1f36cc0ff6c765754
+EBUILD gtk+-3.0.12.ebuild 5897 RMD160 3df8a5cd5ae53c472a17d15970ae3e385b8a24c2 SHA1 4d2b4c9a72292075a21569a1b71bf9f231f705ec SHA256 d0eb62888239f0e41aed32ff35a2301096009ff1433ff7fa4a7017e1588d0741
+MISC ChangeLog 78698 RMD160 3775ec3856446b0222bbb3b6c39a00ae706f4676 SHA1 d1e022369ae137f82c3cfde5d662c97cb692eff8 SHA256 4094c5554f7be5b4bb0cc779d8603f55bf11050f76c71b9056cd2595ee500ad1
 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4xpM4ACgkQCaWpQKGI+9So8ACfXDwUt4hg/xdphbXSwnfGWo+U
+8d8AnR9osT+CiaGsZyA/yc/jxngzumwZ
+=eSH7
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-2.22.1-old-icons.patch b/x11-libs/gtk+/files/gtk+-2.22.1-old-icons.patch
deleted file mode 100644
index 6047bb0dc1e5..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.22.1-old-icons.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff -aur gtk+-2.22.0.orig//gtk/Makefile.in gtk+-2.22.0/gtk/Makefile.in
---- gtk+-2.22.0.orig//gtk/Makefile.am	2010-10-15 04:57:50.810006145 +0800
-+++ gtk+-2.22.0/gtk/Makefile.am	2010-10-15 05:13:49.083339478 +0800
-@@ -1598,7 +1598,172 @@
- 	stock-icons/24/folder-remote.png 		\
- 	stock-icons/24/user-home.png 			\
- 	stock-icons/24/user-desktop.png 		\
--	stock-icons/24/text-x-generic.png
-+	stock-icons/24/text-x-generic.png		\
-+	stock-icons/16/gtk-quit.png			\
-+	stock-icons/16/gtk-info.png			\
-+	stock-icons/16/gtk-file.png			\
-+	stock-icons/16/gtk-open.png			\
-+	stock-icons/16/gtk-print-preview.png		\
-+	stock-icons/16/gtk-print.png			\
-+	stock-icons/16/gtk-properties.png		\
-+	stock-icons/16/gtk-revert-to-saved-ltr.png	\
-+	stock-icons/16/gtk-revert-to-saved-rtl.png	\
-+	stock-icons/16/gtk-save-as.png			\
-+	stock-icons/16/gtk-new.png			\
-+	stock-icons/16/gtk-harddisk.png			\
-+	stock-icons/16/gtk-clear.png			\
-+	stock-icons/16/gtk-copy.png			\
-+	stock-icons/16/gtk-cut.png			\
-+	stock-icons/16/gtk-delete.png			\
-+	stock-icons/16/gtk-find-and-replace.png		\
-+	stock-icons/16/gtk-find.png			\
-+	stock-icons/16/gtk-paste.png			\
-+	stock-icons/16/gtk-redo-ltr.png			\
-+	stock-icons/16/gtk-redo-rtl.png			\
-+	stock-icons/16/gtk-select-all.png		\
-+	stock-icons/16/gtk-undo-ltr.png			\
-+	stock-icons/16/gtk-undo-rtl.png			\
-+	stock-icons/16/gtk-directory.png		\
-+	stock-icons/16/gtk-unindent-ltr.png		\
-+	stock-icons/16/gtk-unindent-rtl.png		\
-+	stock-icons/16/gtk-indent-ltr.png		\
-+	stock-icons/16/gtk-indent-rtl.png		\
-+	stock-icons/16/gtk-justify-center.png		\
-+	stock-icons/16/gtk-justify-fill.png		\
-+	stock-icons/16/gtk-justify-left.png		\
-+	stock-icons/16/gtk-justify-right.png		\
-+	stock-icons/16/gtk-bold.png			\
-+	stock-icons/16/gtk-italic.png			\
-+	stock-icons/16/gtk-strikethrough.png		\
-+	stock-icons/16/gtk-underline.png		\
-+	stock-icons/16/gtk-goto-bottom.png		\
-+	stock-icons/16/gtk-go-down.png			\
-+	stock-icons/16/gtk-goto-first-ltr.png		\
-+	stock-icons/16/gtk-home.png			\
-+	stock-icons/16/gtk-jump-to-ltr.png		\
-+	stock-icons/16/gtk-jump-to-rtl.png		\
-+	stock-icons/16/gtk-goto-last-ltr.png		\
-+	stock-icons/16/gtk-go-forward-ltr.png		\
-+	stock-icons/16/gtk-go-back-ltr.png		\
-+	stock-icons/16/gtk-goto-top.png			\
-+	stock-icons/16/gtk-go-up.png			\
-+	stock-icons/16/gtk-about.png			\
-+	stock-icons/16/gtk-help.png			\
-+	stock-icons/16/gtk-missing-image.png		\
-+	stock-icons/16/gtk-add.png			\
-+	stock-icons/16/gtk-remove.png			\
-+	stock-icons/16/gtk-floppy.png			\
-+	stock-icons/16/gtk-cdrom.png			\
-+	stock-icons/16/gtk-media-pause.png		\
-+	stock-icons/16/gtk-media-play-ltr.png		\
-+	stock-icons/16/gtk-media-play-rtl.png		\
-+	stock-icons/16/gtk-media-stop.png		\
-+	stock-icons/16/gtk-media-record.png		\
-+	stock-icons/16/gtk-media-rewind-ltr.png		\
-+	stock-icons/16/gtk-media-forward-ltr.png	\
-+	stock-icons/16/gtk-media-previous-ltr.png	\
-+	stock-icons/16/gtk-media-next-ltr.png		\
-+	stock-icons/16/gtk-network.png			\
-+	stock-icons/16/gtk-print-error.png		\
-+	stock-icons/16/gtk-print-report.png		\
-+	stock-icons/16/gtk-print-paused.png		\
-+	stock-icons/16/gtk-print-warning.png		\
-+	stock-icons/16/gtk-stop.png			\
-+	stock-icons/16/gtk-execute.png			\
-+	stock-icons/16/gtk-spell-check.png		\
-+	stock-icons/16/gtk-fullscreen.png		\
-+	stock-icons/16/gtk-refresh.png			\
-+	stock-icons/16/gtk-leave-fullscreen.png		\
-+	stock-icons/16/gtk-sort-ascending.png		\
-+	stock-icons/16/gtk-sort-descending.png		\
-+	stock-icons/16/gtk-close.png			\
-+	stock-icons/16/gtk-zoom-fit.png			\
-+	stock-icons/16/gtk-zoom-in.png			\
-+	stock-icons/16/gtk-zoom-100.png			\
-+	stock-icons/16/gtk-zoom-out.png			\
-+	stock-icons/24/gtk-quit.png			\
-+	stock-icons/24/gtk-info.png			\
-+	stock-icons/24/gtk-file.png			\
-+	stock-icons/24/gtk-open.png			\
-+	stock-icons/24/gtk-print-preview.png		\
-+	stock-icons/24/gtk-print.png			\
-+	stock-icons/24/gtk-properties.png		\
-+	stock-icons/24/gtk-revert-to-saved-ltr.png	\
-+	stock-icons/24/gtk-revert-to-saved-rtl.png	\
-+	stock-icons/24/gtk-save-as.png			\
-+	stock-icons/24/gtk-new.png			\
-+	stock-icons/24/gtk-harddisk.png			\
-+	stock-icons/24/gtk-clear.png			\
-+	stock-icons/24/gtk-copy.png			\
-+	stock-icons/24/gtk-cut.png			\
-+	stock-icons/24/gtk-delete.png			\
-+	stock-icons/24/gtk-find-and-replace.png		\
-+	stock-icons/24/gtk-find.png			\
-+	stock-icons/24/gtk-paste.png			\
-+	stock-icons/24/gtk-redo-ltr.png			\
-+	stock-icons/24/gtk-redo-rtl.png			\
-+	stock-icons/24/gtk-select-all.png		\
-+	stock-icons/24/gtk-undo-ltr.png			\
-+	stock-icons/24/gtk-undo-rtl.png			\
-+	stock-icons/24/gtk-directory.png		\
-+	stock-icons/24/gtk-unindent-ltr.png		\
-+	stock-icons/24/gtk-unindent-rtl.png		\
-+	stock-icons/24/gtk-indent-ltr.png		\
-+	stock-icons/24/gtk-indent-rtl.png		\
-+	stock-icons/24/gtk-justify-center.png		\
-+	stock-icons/24/gtk-justify-fill.png		\
-+	stock-icons/24/gtk-justify-left.png		\
-+	stock-icons/24/gtk-justify-right.png		\
-+	stock-icons/24/gtk-bold.png			\
-+	stock-icons/24/gtk-italic.png			\
-+	stock-icons/24/gtk-strikethrough.png		\
-+	stock-icons/24/gtk-underline.png		\
-+	stock-icons/24/gtk-goto-bottom.png		\
-+	stock-icons/24/gtk-go-down.png			\
-+	stock-icons/24/gtk-goto-first-ltr.png		\
-+	stock-icons/24/gtk-home.png			\
-+	stock-icons/24/gtk-jump-to-ltr.png		\
-+	stock-icons/24/gtk-jump-to-rtl.png		\
-+	stock-icons/24/gtk-goto-last-ltr.png		\
-+	stock-icons/24/gtk-go-forward-ltr.png		\
-+	stock-icons/24/gtk-go-back-ltr.png		\
-+	stock-icons/24/gtk-goto-top.png			\
-+	stock-icons/24/gtk-go-up.png			\
-+	stock-icons/24/gtk-about.png			\
-+	stock-icons/24/gtk-help.png			\
-+	stock-icons/24/gtk-missing-image.png		\
-+	stock-icons/24/gtk-add.png			\
-+	stock-icons/24/gtk-remove.png			\
-+	stock-icons/24/gtk-floppy.png			\
-+	stock-icons/24/gtk-cdrom.png			\
-+	stock-icons/24/gtk-media-pause.png		\
-+	stock-icons/24/gtk-media-play-ltr.png		\
-+	stock-icons/24/gtk-media-play-rtl.png		\
-+	stock-icons/24/gtk-media-stop.png		\
-+	stock-icons/24/gtk-media-record.png		\
-+	stock-icons/24/gtk-media-rewind-ltr.png		\
-+	stock-icons/24/gtk-media-forward-ltr.png	\
-+	stock-icons/24/gtk-media-previous-ltr.png	\
-+	stock-icons/24/gtk-media-next-ltr.png		\
-+	stock-icons/24/gtk-network.png			\
-+	stock-icons/24/gtk-print-error.png		\
-+	stock-icons/24/gtk-print-report.png		\
-+	stock-icons/24/gtk-print-paused.png		\
-+	stock-icons/24/gtk-print-warning.png		\
-+	stock-icons/24/gtk-stop.png			\
-+	stock-icons/24/gtk-execute.png			\
-+	stock-icons/24/gtk-spell-check.png		\
-+	stock-icons/24/gtk-fullscreen.png		\
-+	stock-icons/24/gtk-refresh.png			\
-+	stock-icons/24/gtk-leave-fullscreen.png		\
-+	stock-icons/24/gtk-sort-ascending.png		\
-+	stock-icons/24/gtk-sort-descending.png		\
-+	stock-icons/24/gtk-close.png			\
-+	stock-icons/24/gtk-zoom-fit.png			\
-+	stock-icons/24/gtk-zoom-in.png			\
-+	stock-icons/24/gtk-zoom-100.png			\
-+	stock-icons/24/gtk-zoom-out.png			\
-+	stock-icons/48/gtk-dialog-error.png
- 
- @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
- @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
-@@ -2869,7 +3034,91 @@
- 	   && $(LN_S) folder.png user-desktop.png 			\
- 	   && $(RM) text-x-generic.png 					\
- 	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
-+	   && $(LN_S) application-exit.png gtk-quit.png			\
-+	   && $(LN_S) dialog-information.png gtk-info.png			\
-+	   && $(LN_S) document-new.png gtk-file.png			\
-+	   && $(LN_S) document-open.png gtk-open.png			\
-+	   && $(LN_S) document-print-preview.png gtk-print-preview.png			\
-+	   && $(LN_S) document-print.png gtk-print.png			\
-+	   && $(LN_S) document-properties.png gtk-properties.png			\
-+	   && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png			\
-+	   && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png			\
-+	   && $(LN_S) document-save-as.png gtk-save-as.png			\
-+	   && $(LN_S) document-x-generic.png gtk-new.png			\
-+	   && $(LN_S) drive-harddisk.png gtk-harddisk.png			\
-+	   && $(LN_S) edit-clear.png gtk-clear.png			\
-+	   && $(LN_S) edit-copy.png gtk-copy.png			\
-+	   && $(LN_S) edit-cut.png gtk-cut.png			\
-+	   && $(LN_S) edit-delete.png gtk-delete.png			\
-+	   && $(LN_S) edit-find-replace.png gtk-find-and-replace.png			\
-+	   && $(LN_S) edit-find.png gtk-find.png			\
-+	   && $(LN_S) edit-paste.png gtk-paste.png			\
-+	   && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png			\
-+	   && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png			\
-+	   && $(LN_S) edit-select-all.png gtk-select-all.png			\
-+	   && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png			\
-+	   && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png			\
-+	   && $(LN_S) folder.png gtk-directory.png			\
-+	   && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png			\
-+	   && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png			\
-+	   && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png			\
-+	   && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png			\
-+	   && $(LN_S) format-justify-center.png gtk-justify-center.png			\
-+	   && $(LN_S) format-justify-fill.png gtk-justify-fill.png			\
-+	   && $(LN_S) format-justify-left.png gtk-justify-left.png			\
-+	   && $(LN_S) format-justify-right.png gtk-justify-right.png			\
-+	   && $(LN_S) format-text-bold.png gtk-bold.png			\
-+	   && $(LN_S) format-text-italic.png gtk-italic.png			\
-+	   && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png			\
-+	   && $(LN_S) format-text-underline.png gtk-underline.png			\
-+	   && $(LN_S) go-bottom.png gtk-goto-bottom.png			\
-+	   && $(LN_S) go-down.png gtk-go-down.png			\
-+	   && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png			\
-+	   && $(LN_S) go-home.png gtk-home.png			\
-+	   && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png			\
-+	   && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png			\
-+	   && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png			\
-+	   && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png			\
-+	   && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png			\
-+	   && $(LN_S) go-top.png gtk-goto-top.png			\
-+	   && $(LN_S) go-up.png gtk-go-up.png			\
-+	   && $(LN_S) help-about.png gtk-about.png			\
-+	   && $(LN_S) help-contents.png gtk-help.png			\
-+	   && $(LN_S) image-missing.png gtk-missing-image.png			\
-+	   && $(LN_S) list-add.png gtk-add.png			\
-+	   && $(LN_S) list-remove.png gtk-remove.png			\
-+	   && $(LN_S) media-floppy.png gtk-floppy.png			\
-+	   && $(LN_S) media-optical.png gtk-cdrom.png			\
-+	   && $(LN_S) media-playback-pause.png gtk-media-pause.png			\
-+	   && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png			\
-+	   && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png			\
-+	   && $(LN_S) media-playback-stop.png gtk-media-stop.png			\
-+	   && $(LN_S) media-record.png gtk-media-record.png			\
-+	   && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png			\
-+	   && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png			\
-+	   && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png			\
-+	   && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png			\
-+	   && $(LN_S) network-idle.png gtk-network.png			\
-+	   && $(LN_S) printer-error.png gtk-print-error.png			\
-+	   && $(LN_S) printer-info.png gtk-print-report.png			\
-+	   && $(LN_S) printer-paused.png gtk-print-paused.png			\
-+	   && $(LN_S) printer-warning.png gtk-print-warning.png			\
-+	   && $(LN_S) process-stop.png gtk-stop.png			\
-+	   && $(LN_S) system-run.png gtk-execute.png			\
-+	   && $(LN_S) tools-check-spelling.png gtk-spell-check.png			\
-+	   && $(LN_S) view-fullscreen.png gtk-fullscreen.png			\
-+	   && $(LN_S) view-refresh.png gtk-refresh.png			\
-+	   && $(LN_S) view-restore.png gtk-leave-fullscreen.png			\
-+	   && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png			\
-+	   && $(LN_S) view-sort-descending.png gtk-sort-descending.png			\
-+	   && $(LN_S) window-close.png gtk-close.png			\
-+	   && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png			\
-+	   && $(LN_S) zoom-in.png gtk-zoom-in.png			\
-+	   && $(LN_S) zoom-original.png gtk-zoom-100.png			\
-+	   && $(LN_S) zoom-out.png gtk-zoom-out.png			\
- 	) done 								\
-+	&& (cd stock-icons/48						\
-+	   && $(LN_S) dialog-error.png gtk-dialog-error.png)		\
- 	&& touch stamp-icons
- 
- gtkbuiltincache.h: @REBUILD@ stamp-icons
diff --git a/x11-libs/gtk+/files/gtk+-2.22.1-print-settings.patch b/x11-libs/gtk+/files/gtk+-2.22.1-print-settings.patch
deleted file mode 100644
index 80863bd51007..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.22.1-print-settings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 55cf284749f3e3c56440b2f535956161657cd150 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun, 12 Dec 2010 11:54:47 +0000
-Subject: printing: Set new print operation settings before emitting custom-widget-apply signal
-
-So that custom settings can be added from the custom-widget-apply
-callback.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=637069
----
-diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
-index dbf6228..4528036 100644
---- a/gtk/gtkprintoperation-unix.c
-+++ b/gtk/gtkprintoperation-unix.c
-@@ -659,7 +659,11 @@ handle_print_response (GtkWidget *dialog,
-       settings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (pd));
-       page_setup = gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (pd));
-       page_setup_set = gtk_print_unix_dialog_get_page_setup_set (GTK_PRINT_UNIX_DIALOG (pd));
--      
-+
-+      /* Set new print settings now so that custom-widget options
-+       * can be added to the settings in the callback
-+       */
-+      gtk_print_operation_set_print_settings (rdata->op, settings);
-       g_signal_emit_by_name (rdata->op, "custom-widget-apply", rdata->op->priv->custom_widget);
-     }
-   
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
new file mode 100644
index 000000000000..a65c0a818dbc
--- /dev/null
+++ b/x11-libs/gtk+/files/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-theme-name = Adwaita
+gtk-icon-theme-name = gnome
+gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild
deleted file mode 100644
index 9246669e1e69..000000000000
--- a/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild,v 1.11 2011/03/22 19:48:00 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.4"
-
-inherit eutils flag-o-matic gnome.org libtool python virtualx autotools
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug doc examples +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-RDEPEND="!aqua? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		>=x11-libs/cairo-1.6[X,svg]
-		x11-libs/gdk-pixbuf:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6[aqua,svg]
-		x11-libs/gdk-pixbuf:2[introspection?,jpeg?,jpeg2k?,tiff?]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.25.10
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	cups? ( net-print/cups )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	!<gnome-base/gail-1000"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	x86-interix? (
-		sys-libs/itx-bind
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
-
-	# Don't break inclusion of gtkclist.h, upstream bug 536767
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-
-	# Set new print operation settings before emitting custom-widget-apply signal, upstream bug #637069
-	epatch "${FILESDIR}/${PN}-2.22.1-print-settings.patch"
-
-	# Create symlinks to old icons until apps are ported, bug #339319
-	epatch "${FILESDIR}/${PN}-2.22.1-old-icons.patch"
-
-	# Stop trying to build unmaintained docs, bug #349754
-	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
-	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-
-	# Cannot work because glib is too clever to find real user's home
-	# gentoo bug #285687, upstream bug #639832
-	# XXX: /!\ Pay extra attention to second sed when bumping /!\
-	sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-		|| die "failed to disable recentmanager test (1)"
-	sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-		|| die "failed to disable recentmanager test (2)"
-	sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-		|| die "failed to disable recentmanager test (3)"
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.am Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
-	fi
-
-	# Use elibtoolize in place of eautoreconf when it will be dropped
-	#elibtoolize
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="$(use_enable doc gtk-doc)
-		$(use_enable xinerama)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		--disable-papi"
-	if use aqua; then
-		myconf="${myconf} --with-gdktarget=quartz"
-	else
-		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
-	fi
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR} || die "dodir failed"
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /etc/gtk-2.0
-	doins "${T}"/gtkrc || die "doins gtkrc failed"
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2 || die "doenvd failed"
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
-	done
-
-	# Clean up useless la files
-	find "${ED}"/usr/$(get_libdir)/gtk-2.0/ -name "*.la" -delete
-
-	python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	# gtk.immodules should be in their CHOST directories respectively.
-	gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
-		|| ewarn "Failed to run gtk-query-immodules-2.0"
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
-	fi
-
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.0.10.ebuild b/x11-libs/gtk+/gtk+-3.0.12.ebuild
index 8dfc8b006efc..9f25a1314a95 100644
--- a/x11-libs/gtk+/gtk+-3.0.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.0.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.10.ebuild,v 1.1 2011/06/02 15:30:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12.ebuild,v 1.1 2011/07/28 18:04:54 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
 
@@ -14,8 +14,10 @@ SLOT="3"
 # NOTE: This gtk+ has multi-gdk-backend support, see:
 #  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
 IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
@@ -111,6 +113,8 @@ src_prepare() {
 
 	# http://mail.gnome.org/archives/commits-list/2011-March/msg04372.html
 	epatch "${FILESDIR}"/${PN}-3.0.8-darwin-quartz.patch
+	# fix building with gir #372953
+	epatch "${FILESDIR}"/${PN}-3.0.11-darwin-quartz-introspection.patch
 }
 
 src_configure() {
@@ -148,14 +152,12 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install
 
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
 	insinto /etc/gtk-3.0
-	doins "${T}"/gtkrc || die "doins gtkrc failed"
+	doins "${FILESDIR}"/settings.ini
 
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
 	find "${ED}" -name "*.la" -delete
@@ -180,7 +182,7 @@ pkg_postinst() {
 	if ! has_version "app-text/evince"; then
 		elog "Please install app-text/evince for print preview functionality."
 		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
+		elog "add it to your settings.ini file."
 	fi
 }