Apply some upstream fixes to old slot

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 396 insertions, 5 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 6ec31cb237a3..ff16f332d7bd 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,14 @@
 # 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.299 2015/06/09 15:04:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.300 2015/07/07 19:02:09 pacho Exp $
+
+*gtkmm-2.24.4-r2 (07 Jul 2015)
+
+  07 Jul 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gtkmm-2.24.4-missing-includes.patch,
+  +files/gtkmm-2.24.4-newer-glibmm.patch, +files/gtkmm-2.24.4-papersize.patch,
+  +gtkmm-2.24.4-r2.ebuild:
+  Apply some upstream fixes to old slot
 
 *gtkmm-3.16.0 (09 Jun 2015)
 
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 6e723e174b02..f379b34ff021 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,21 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gtkmm-2.24.4-missing-includes.patch 5161 SHA256 cdb33a7de66bed0086a794521681a4521e8761440339d182695784dbf7cbf0b1 SHA512 fefcdc0176b1d30ad8c540d7eea35a65547242ac248109ad93ef035c039f98522f026f9ebe4798fb21c49996bbf7cbbd2055dc2a4c6c93c7113a6a298b39fa18 WHIRLPOOL bd46d97759e3271c13808197b4297c2829c7b7cfe9f9f0a6a7c43ea60ef842c51445bd7271c53bcb11f3261efc70be19344223e668f8ea5042fec64029e8bffc
+AUX gtkmm-2.24.4-newer-glibmm.patch 2676 SHA256 f6f93c53f98adf44ded91c0a9289b0fdf1c0dbd4f36aaa7a0efa20fdd7a2b408 SHA512 8f386652bb9206b224a889e00f4fdb32eb3dd13979674ee06e2b1cccf07eafbe21c34a50931454cab8f059e3f12fd246b8a8d81232fc418225c3137b500fe28e WHIRLPOOL 9a37520f340027a82e4b88466f209b3df3528182cfb7ab0f90db84d6328905a60290058d3ec54fade8383d706ec45e87767fdd23ff3c50b689c6035a0ccbcaf4
+AUX gtkmm-2.24.4-papersize.patch 1260 SHA256 18d47169814e0ab6a9a085a9803679a6aff95fb574c33a3f1547fb8fc25d0dcf SHA512 04b9e56f64b4ba6fbc1a6f2a862dfc88161414988968d471045761df8899e85907bb922f5d2c4519356b107b97173d92beab0220face5484bf603d049e99a715 WHIRLPOOL 7a2bf8391dfd521c965daf1d2f4ab36f0b1bede55a34fb820bd759dbd6bf6df289ccd6bf4db88760ffd08ffd0abfd40bd7d8bfb215fdec90611290645ca559c3
 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-r2.ebuild 2006 SHA256 3525f4b3349ae2f065716476d0eee5f501f9b19f7a91f86a110b0137bfe80f4c SHA512 b6d5cddf419fee36b446642d2535568db42c2b534a4af063f5a5b62f05fe7651c16d2c7685ccf917b33e086dc6c65c23a6d760a14b9bdbcb13406b6da246108a WHIRLPOOL f0a00b73d3d26afa634ffc8852e4014606c8c131726751c9f20786664033fed411d27afe818662ada00ce096d59c84d649566f50ed03258be653dd65e8d00fdc
 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.16.0.ebuild 2038 SHA256 ac85214540f0765ee9ff940713782d79127b530181b9569ab0c2923ae064aac0 SHA512 9b29bfefe29f8354cc701694a77388abf5102a37ff20c164ccdd994d55bd943f6bafab111fa1f84c5ee9a81c53921c2739628cc997a5764517960e976c3232a5 WHIRLPOOL 038c482bd12dc2a64e8756e12fa7656ddf11dc144dfbfce9bc06fd5d6f5f4e6247d8ab41aac08cdd983442dd844ed5aaba7c9a91d34ab7b335aa6f1ddf870561
-MISC ChangeLog 39292 SHA256 c27700cce0946ae8d39cf45c98d15afbe646fa60831b0cb3b8e61425c4dcabc2 SHA512 ffbf02022c4a17169c5d443cd300676badf8e0086b30e51978ad7230b018a41689c2a0e1682a311c940e3cfde874960b24d070ba1fbb3cb8267f02f8927e47ae WHIRLPOOL 32e997523aa6e482bb63c8ac8a158b488118275fe6df4823c75b6d3a176a8403e8ec8c182566ffeb2fd5217c66cc2ead9f4dab460dc5297f0b43d9a72bafb2c1
+MISC ChangeLog 39565 SHA256 7435f3d4619be7570f63d1b794b6447d65e8e2791d28a976e0ceb642e892c797 SHA512 faa1c8e1c60772b15994fffa73baca5e548a4e6177f709823d0154e059d1e050207c622e7e49dd4851c9acf53e0d8b630610fa8f729f58ff6be15633cc11eb2a WHIRLPOOL 250561ef10284d2c4f1d66b9850bb7a682deae3a06be5956785261e87200e36b086d3758d6bc6aa1e2c1ed0cd3c72d669fe767667ba8a56e9388657ceea69727
 MISC metadata.xml 161 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 SHA512 22fe7471187a068f45de295adc5349f8f01d16d06562f8edfceb5dacb604d98b0e3cadc23f7d0b164f6429769b71961bc5d9088a41f1ca4a968e4be37ac6ef1b WHIRLPOOL 92db96c310438550f7073b19fb34f6d5d7e478b04b43bff8a2815374ce50c2fa7291018c4131d48face3f3f0a66e0a3d2a778c42550a1fbfedb386db48a4bf05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV3AHwACgkQ1fmVwcYIWAYmIACcCUdoupH4Fk+uyazKPs87h33n
-yQcAoN3khh0Qi65iL7rn4FQyKY19B/m2
-=oh8V
+iEYEAREIAAYFAlWcIjIACgkQCaWpQKGI+9QTSACfSPPX0dlN4KaPkXADSIH70GgD
+zWoAn39RcM2gkd+vpW3iKOjkTcnd55Qv
+=iutx
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/files/gtkmm-2.24.4-missing-includes.patch b/dev-cpp/gtkmm/files/gtkmm-2.24.4-missing-includes.patch
new file mode 100644
index 000000000000..640d48a3d128
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-2.24.4-missing-includes.patch
@@ -0,0 +1,200 @@
+From 185abd365c2898ad77dbb33a099341fa28e5a496 Mon Sep 17 00:00:00 2001
+From: Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
+Date: Thu, 2 Jul 2015 19:53:16 +0200
+Subject: 	Add #includes needed with glibmm newer than 2.31.0.
+
+	* gdk/src/color.hg:
+	* gdk/src/pixbufanimationiter.hg:
+	* gdk/src/pixbufformat.hg:
+	* gdk/src/rectangle.hg:
+	* gdk/src/rgbcmap.hg:
+	* gdk/src/types.hg:
+	* gtk/src/enums.hg:
+	* gtk/src/main.hg:
+	* gtk/src/papersize.hg:
+	* gtk/src/textattributes.hg:
+	* gtk/src/treemodel.hg: Add individual includes now that gmmproc does not
+	add #include <glibmm.h> at the top of every generated header.
+	* gtk/gtkmm/border.h: Add #include <gtk/gtk.h> to make
+	glibmm/tools/test_scripts/testheaders.sh happy.
+
+diff --git a/ChangeLog b/ChangeLog
+index 73e1eac..1d6d4d0 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,22 @@
++2015-07-02  Kjell Ahlstedt  <kjell.ahlstedt@bredband.net>
++
++	Add #includes needed with glibmm newer than 2.31.0.
++
++	* gdk/src/color.hg:
++	* gdk/src/pixbufanimationiter.hg:
++	* gdk/src/pixbufformat.hg:
++	* gdk/src/rectangle.hg:
++	* gdk/src/rgbcmap.hg:
++	* gdk/src/types.hg:
++	* gtk/src/enums.hg:
++	* gtk/src/main.hg:
++	* gtk/src/papersize.hg:
++	* gtk/src/textattributes.hg:
++	* gtk/src/treemodel.hg: Add individual includes now that gmmproc does not
++	add #include <glibmm.h> at the top of every generated header.
++	* gtk/gtkmm/border.h: Add #include <gtk/gtk.h> to make
++	glibmm/tools/test_scripts/testheaders.sh happy.
++
+ 2012-03-14  Murray Cumming  <murrayc@murrayc.com>
+ 
+ 	PaperSize: Correct the PaperSizeTraits pre-declaration.
+diff --git a/gdk/src/color.hg b/gdk/src/color.hg
+index ce22d4b..09c91fc 100644
+--- a/gdk/src/color.hg
++++ b/gdk/src/color.hg
+@@ -21,6 +21,8 @@
+ // the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
+ _CONFIGINCLUDE(gdkmmconfig.h)
+ 
++#include <glibmm/arrayhandle.h>
++
+ _DEFS(gdkmm,gdk)
+ 
+ namespace Gdk
+diff --git a/gdk/src/pixbufanimationiter.hg b/gdk/src/pixbufanimationiter.hg
+index 4e12f52..f89a037 100644
+--- a/gdk/src/pixbufanimationiter.hg
++++ b/gdk/src/pixbufanimationiter.hg
+@@ -21,6 +21,7 @@
+ 
+ #include <glibmm/object.h>
+ #include <gdkmm/pixbuf.h>
++#include <glibmm/timeval.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+ _DEFS(gdkmm,gdk)
+diff --git a/gdk/src/pixbufformat.hg b/gdk/src/pixbufformat.hg
+index c460056..6c7daab 100644
+--- a/gdk/src/pixbufformat.hg
++++ b/gdk/src/pixbufformat.hg
+@@ -20,7 +20,7 @@
+ _DEFS(gdkmm,gdk)
+ 
+ #include <gdkmmconfig.h>
+-
++#include <glibmm/arrayhandle.h>
+ 
+ #ifndef DOXYGEN_SHOULD_SKIP_THIS
+ extern "C" { typedef struct _GdkPixbufFormat GdkPixbufFormat; }
+diff --git a/gdk/src/rectangle.hg b/gdk/src/rectangle.hg
+index f48de5a..01d1959 100644
+--- a/gdk/src/rectangle.hg
++++ b/gdk/src/rectangle.hg
+@@ -19,6 +19,7 @@
+  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <glibmm/value.h>
+ #include <gdk/gdk.h>
+ 
+ _DEFS(gdkmm,gdk)
+diff --git a/gdk/src/rgbcmap.hg b/gdk/src/rgbcmap.hg
+index bfdfdfe..817661f 100644
+--- a/gdk/src/rgbcmap.hg
++++ b/gdk/src/rgbcmap.hg
+@@ -24,6 +24,7 @@ _DEFS(gdkmm,gdk)
+ #m4 _POP()
+ 
+ #include <gdkmmconfig.h>
++#include <glibmm/arrayhandle.h>
+ 
+ #ifndef DOXYGEN_SHOULD_SKIP_THIS
+ extern "C" { typedef struct _GdkRgbCmap GdkRgbCmap; }
+diff --git a/gdk/src/types.hg b/gdk/src/types.hg
+index fd644b8..a05ba0c 100644
+--- a/gdk/src/types.hg
++++ b/gdk/src/types.hg
+@@ -19,6 +19,8 @@
+ 
+ _DEFS(gdkmm,gdk)
+ 
++#include <glibmm/arrayhandle.h>
++#include <glibmm/listhandle.h>
+ #include <gdk/gdk.h>
+ #include <gdkmmconfig.h>
+ 
+diff --git a/gtk/gtkmm/border.h b/gtk/gtkmm/border.h
+index a64c669..b48017e 100644
+--- a/gtk/gtkmm/border.h
++++ b/gtk/gtkmm/border.h
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include <glibmm/value.h>
++#include <gtk/gtk.h>  /* For GtkBorder */
+ 
+ namespace Gtk
+ {
+diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
+index 66c3696..ad3d20c 100644
+--- a/gtk/src/enums.hg
++++ b/gtk/src/enums.hg
+@@ -19,6 +19,7 @@
+  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <glibmm/value.h>
+ #include <gtkmmconfig.h> //For GTKMM_MAEMO_EXTENSIONS_ENABLED
+ 
+ _DEFS(gtkmm,gtk)
+diff --git a/gtk/src/main.hg b/gtk/src/main.hg
+index c6c05ed..2665445 100644
+--- a/gtk/src/main.hg
++++ b/gtk/src/main.hg
+@@ -22,6 +22,7 @@
+ 
+ #include <sigc++/sigc++.h>
+ #include <gdkmm/types.h> //For GdkEventKey
++#include <glibmm/optioncontext.h>
+ 
+ _DEFS(gtkmm,gtk)
+ 
+diff --git a/gtk/src/papersize.hg b/gtk/src/papersize.hg
+index 41fcb3c..3914cd1 100644
+--- a/gtk/src/papersize.hg
++++ b/gtk/src/papersize.hg
+@@ -17,6 +17,9 @@
+ 
+ _DEFS(gtkmm,gtk)
+ 
++#include <glibmm/keyfile.h>
++#include <glibmm/listhandle.h>
++
+ namespace Gtk
+ {
+ 
+diff --git a/gtk/src/textattributes.hg b/gtk/src/textattributes.hg
+index b043f98..3966529 100644
+--- a/gtk/src/textattributes.hg
++++ b/gtk/src/textattributes.hg
+@@ -22,6 +22,8 @@
+ 
+ _DEFS(gtkmm,gtk)
+ 
++#include <glibmm/value.h>
++
+ namespace Gtk
+ {
+ 
+diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
+index a04d924..360b4ed 100644
+--- a/gtk/src/treemodel.hg
++++ b/gtk/src/treemodel.hg
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <glibmm/interface.h>
++#include <glibmm/arrayhandle.h>
+ #include <gtkmm/treeiter.h>
+ 
+ _DEFS(gtkmm,gtk)
+-- 
+cgit v0.10.2
+
diff --git a/dev-cpp/gtkmm/files/gtkmm-2.24.4-newer-glibmm.patch b/dev-cpp/gtkmm/files/gtkmm-2.24.4-newer-glibmm.patch
new file mode 100644
index 000000000000..54a1ee0b34f5
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-2.24.4-newer-glibmm.patch
@@ -0,0 +1,60 @@
+From 9d52f886ffe556f9615f98a280d3a036a9ecf28e Mon Sep 17 00:00:00 2001
+From: Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
+Date: Sun, 5 Jul 2015 15:41:11 +0200
+Subject: 	More fixes to suit newish glibmm.
+
+	* gtk/src/entrycompletion.hg: Add a missing double quote in
+	_WRAP_PROPERTY("text_column, int), to avoid a warning from gmmproc 2.41.0
+	or newer.
+	* gtk/src/printunixdialog.hg: get_selected_printer(): Ref-counting correction.
+	Fix a .->, typo to make the refreturn option actually be used. Necessary
+	with gmmproc 2.29.13 or newer. Discussed in bug #657751, comment 5.
+
+diff --git a/ChangeLog b/ChangeLog
+index 1d6d4d0..c61ffa3 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,14 @@
++2015-07-05  Kjell Ahlstedt  <kjell.ahlstedt@bredband.net>
++
++	More fixes to suit newish glibmm.
++
++	* gtk/src/entrycompletion.hg: Add a missing double quote in
++	_WRAP_PROPERTY("text_column, int), to avoid a warning from gmmproc 2.41.0
++	or newer.
++	* gtk/src/printunixdialog.hg: get_selected_printer(): Ref-counting correction.
++	Fix a .->, typo to make the refreturn option actually be used. Necessary
++	with gmmproc 2.29.13 or newer. Discussed in bug #657751, comment 5.
++
+ 2015-07-02  Kjell Ahlstedt  <kjell.ahlstedt@bredband.net>
+ 
+ 	Add #includes needed with glibmm newer than 2.31.0.
+diff --git a/gtk/src/entrycompletion.hg b/gtk/src/entrycompletion.hg
+index 3a32e4f..70c5cc7 100644
+--- a/gtk/src/entrycompletion.hg
++++ b/gtk/src/entrycompletion.hg
+@@ -218,7 +218,7 @@ dnl
+ 
+   _WRAP_PROPERTY("model", Glib::RefPtr<Gtk::TreeModel>)
+   _WRAP_PROPERTY("minimum_key_length", int)
+-  _WRAP_PROPERTY("text_column, int)
++  _WRAP_PROPERTY("text_column", int)
+   _WRAP_PROPERTY("inline_completion", bool)
+   _WRAP_PROPERTY("popup_completion", bool)
+   _WRAP_PROPERTY("popup_set_width", bool)
+diff --git a/gtk/src/printunixdialog.hg b/gtk/src/printunixdialog.hg
+index 87de89f..c05e5c3 100644
+--- a/gtk/src/printunixdialog.hg
++++ b/gtk/src/printunixdialog.hg
+@@ -71,7 +71,7 @@ public:
+   #m4 _CONVERSION(`GtkPrinter*',`Glib::RefPtr<const Printer>',`Glib::wrap($3)')
+ 
+   _WRAP_METHOD(Glib::RefPtr<Printer> get_selected_printer(), gtk_print_unix_dialog_get_selected_printer, refreturn)
+-  _WRAP_METHOD(Glib::RefPtr<const Printer> get_selected_printer() const, gtk_print_unix_dialog_get_selected_printer, refreturn. constversion)
++  _WRAP_METHOD(Glib::RefPtr<const Printer> get_selected_printer() const, gtk_print_unix_dialog_get_selected_printer, refreturn, constversion)
+ 
+   void add_custom_tab(const Widget& child, const Glib::ustring& tab_label);
+   _WRAP_METHOD(void add_custom_tab(const Widget& child, const Widget& tab_label), gtk_print_unix_dialog_add_custom_tab)
+-- 
+cgit v0.10.2
+
diff --git a/dev-cpp/gtkmm/files/gtkmm-2.24.4-papersize.patch b/dev-cpp/gtkmm/files/gtkmm-2.24.4-papersize.patch
new file mode 100644
index 000000000000..fb4d2b7dddd2
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-2.24.4-papersize.patch
@@ -0,0 +1,45 @@
+From 4fb3efa910a46364fa8ec4d60fcce557200e4dcb Mon Sep 17 00:00:00 2001
+From: Murray Cumming <murrayc@murrayc.com>
+Date: Wed, 14 Mar 2012 11:41:46 +0100
+Subject: PaperSize: Correct the PaperSizeTraits pre-declaration.
+
+* gtk/src/papersize.hg: PaperSizeTraits is a struct, not a class.
+clang++ noticed this while building Glom, though I have not run it on all of
+gtkmm.
+
+diff --git a/ChangeLog b/ChangeLog
+index ec2ce5a..73e1eac 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,4 +1,15 @@
++2012-03-14  Murray Cumming  <murrayc@murrayc.com>
++
++	PaperSize: Correct the PaperSizeTraits pre-declaration.
++
++	* gtk/src/papersize.hg: PaperSizeTraits is a struct, not a class.
++	clang++ noticed this while building Glom, though I have not run it on all of 
++	gtkmm.
++
+ 2.24.4:
++
++(Just regenerated with the correct glibmm version.)
++
+ 2.24.3:
+ 
+ 2013-04-04  Hubert Figuière  <hub@figuiere.net>
+diff --git a/gtk/src/papersize.hg b/gtk/src/papersize.hg
+index 2e5700d..41fcb3c 100644
+--- a/gtk/src/papersize.hg
++++ b/gtk/src/papersize.hg
+@@ -21,7 +21,7 @@ namespace Gtk
+ {
+ 
+ #ifndef DOXYGEN_SHOULD_SKIP_THIS
+-class PaperSizeTraits;
++struct PaperSizeTraits;
+ #endif
+ 
+ /** Common paper names, from PWG 5101.1-2002 PWG: Standard for Media Standardized Names
+-- 
+cgit v0.10.2
+
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
new file mode 100644
index 000000000000..85dd5f12f68b
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
@@ -0,0 +1,74 @@
+# 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-2.24.4-r2.ebuild,v 1.1 2015/07/07 19:02:09 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="http://www.gtkmm.org"
+
+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"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.34.1:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24.15:2[${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}]
+"
+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
+		dev-libs/libxslt
+		app-doc/doxygen )
+"
+
+src_prepare() {
+	# Apply fixes from 2.24 branch
+	epatch "${FILESDIR}"/${P}-papersize.patch
+	epatch "${FILESDIR}"/${P}-missing-includes.patch
+	epatch "${FILESDIR}"/${P}-newer-glibmm.patch
+
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed 1 failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed 2 failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		--enable-api-atkmm \
+		$(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog PORTING NEWS README"
+	einstalldocs
+}