Version bump, remove old.

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

7 files changed, 23 insertions, 164 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 6fad87fcecd7..123e4ae537ad 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.205 2011/07/01 10:36:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.206 2011/07/07 12:18:16 pacho Exp $
+
+*gtkmm-2.24.1 (07 Jul 2011)
+
+  07 Jul 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/gtkmm-1.2.9-gcc3.1-gentoo.patch,
+  -files/gtkmm-1.2.9-gcc3.4-gentoo.patch, -files/gtkmm-1.2.9-gcc4.3.patch,
+  -files/gtkmm-1.2.9-gcc4.patch, +gtkmm-2.24.1.ebuild, -gtkmm-3.0.0.ebuild:
+  Version bump, remove old.
 
   01 Jul 2011; Markos Chandras <hwoarang@gentoo.org> gtkmm-2.24.0.ebuild:
   Stable on amd64 wrt bug #372353
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 4709cb227954..3025a13045ea 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,34 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX gtkmm-1.2.9-gcc3.1-gentoo.patch 518 RMD160 2c516c51c0b97d26638150a9741f9f196a0b037e SHA1 d6330370dac2f9a6cf08db9be3d5c6ee36c28b5e SHA256 be2e4bb78de8d55824a3564427e6078bb65a525ed05164128b4857dffc487705
-AUX gtkmm-1.2.9-gcc3.4-gentoo.patch 2197 RMD160 a3ababae65054054ff790dadf825fc7dd263926a SHA1 fe9376c71de04a23fc0413befee521d6cae8cc38 SHA256 918f1f1774901699a4c64749e4dc2965895b018c47c707308b65033db9586ceb
-AUX gtkmm-1.2.9-gcc4.3.patch 538 RMD160 1355108436b34d25a0b66c043354f8079953a567 SHA1 aea11193c3da443853091261b3af3c1df016fd43 SHA256 26a75270f3e70b975effc966721be5fcc1000519ad5dca395b7dbb934a0be468
-AUX gtkmm-1.2.9-gcc4.patch 1382 RMD160 681cb464e36f0ad7d89029fd384bb7496c48eeb3 SHA1 c0c4c2370d5552394926a03ba6b1ede093a8f4fe SHA256 45a907630a651e8bd1355b837253a75ecd6e1e8f9e80d8e6668669a85c2d5a41
 DIST gtkmm-2.22.0.tar.bz2 11496369 RMD160 5eacf79b3c2acd09ba36a3e8643da90282cec579 SHA1 4a43945ecf20d0db7679daf95d504c2e97fb0a72 SHA256 8478d80d8d4793c2e1c459a71bad6a767a43eaf2664da06a9bd65a2b98bb07b1
 DIST gtkmm-2.24.0.tar.bz2 15227037 RMD160 42180542de0309c488a867d4569867e06b4036a9 SHA1 9b9e68360fb3f5faa7f221acba56f0d75a8198d2 SHA256 8cbae7254746bc7df7cce882d9b9a916c4e00dba7bdacd1c50b5d096a484cf56
-DIST gtkmm-3.0.0.tar.bz2 16550072 RMD160 ea6d52556242a49675b2d0b9a86b9c7f16c29c32 SHA1 8ebc7e4c945687b8c70f6c4832f1dc6252685281 SHA256 567582948d4c47c29aa751162adc714644f50958d3d3e427c7a8c3818cd643f9
+DIST gtkmm-2.24.1.tar.xz 10768452 RMD160 080e6027b96aa45f39ec80c55d3dd0cee146b0a5 SHA1 bf40d6d387d06632a1a263afd7c81b0da0cd1ef3 SHA256 abecc601b9eb415acfb93fdac4c63479c21ef6fbed064e3ba0cc59e81ca40eae
 DIST gtkmm-3.0.1.tar.bz2 16486895 RMD160 1e1a02c8bc06fc1e2dba123d0b078faad4cd26a2 SHA1 f9ff284b64eab881862b932a5ee860fa5bb13e6e SHA256 fb2d982095919e58ab5757042bf72e2a6243e77825c8ae6f46c41ab66cb68498
 EBUILD gtkmm-2.22.0.ebuild 1297 RMD160 71eba46f8e6997266c19a389acbb73f6ef255152 SHA1 08f9ac39fcc40a54d16b9ed0a3a96893f51ca704 SHA256 337c75726ce22a913c66d12b843424c5eb33249944c13c08cc4d01f3ace1186a
 EBUILD gtkmm-2.24.0.ebuild 1629 RMD160 0acf65f7d8fea10f67a03aa2c4faa5bf1d74f7d6 SHA1 c939f9846eae3bb5aedc205880d48584619f8d07 SHA256 74cf5afe83dc0feb94254c9e848585488dab64f809188cffc22db99b6c40a718
-EBUILD gtkmm-3.0.0.ebuild 1461 RMD160 c0282732678bc435f368478a02cb6425eecfa495 SHA1 fd6962a02af7fc9342730e824f4a2e777cc693ab SHA256 2dfa82ff6242019f6abf67e2d35b18fed7c145386714290d242fd5707034ad01
+EBUILD gtkmm-2.24.1.ebuild 1362 RMD160 7defbb5db2d629eea60d63727f06ce5f033aa920 SHA1 93fa3bf76727dba59747ed9b0a5365032b573406 SHA256 9832a4606517a0b04adf2f670d22686b9015af9935b8b8967a26eecd8bc5d84a
 EBUILD gtkmm-3.0.1.ebuild 1461 RMD160 2a4815f6c3bacbccca36efad4c000c95c322b9fc SHA1 a4fd7e6d50a517d8dd5c73ee1f82c2f00a5c4c07 SHA256 77862e99d76036eda40ab648e5b47b815d42a6eb6379adb0a83945567607cfaf
-MISC ChangeLog 27578 RMD160 2e088292711b40175b576444c6ed816324c642dc SHA1 1cc0fdde59887d52a246d4c593b57c07aafcd7a2 SHA256 646ab4bab63b2d7c56370ca3dcbc65c82baae6f17836b53aa8d4059b79ca2075
+MISC ChangeLog 27872 RMD160 73143ea5ee1ba831f6e0e5bc0f44f4fc1adfc709 SHA1 efe2c85f07d555c8c1c27fafcb396c030a89bf4f SHA256 ea9544fe232aa5259a45645fc5fb03f6174e298b702f506ddf0e3b76736404cc
 MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJODaMWAAoJEPqDWhW0r/LCPGUP/3d65KG9G5Ug3QByg8RLzwQa
-fnMUbQFpiZVgF+oOSn28HF8pv39LRTTiBxIwqdqeB6uDgbLWFrW+V0WSsV2pXy1p
-yypKrHpNgSAGcXBKn3ZEJLZ07gijhCNc1GB6YtVuIR1Zt+cm8CEQ2nK9/bjgUkwF
-SOrw16z5jAtsUQkaHTfInXagWbzCXIxhAXgsslMLJNI3SPE+cWYgtx0SmaJc18ye
-TnWsLK/0inb4Kl73aEn7pIRYQP2q+IuApLUzLRP/0jdwJ3JkDm5UTWDaTwoS18Ui
-C08aVD7PEU4dL13q22WHYqbaq7he8FmtUN1wxeTFFZcFIBSN/56KK3t/xQi41sHt
-M3TysJ1d7fD762yRcFUz2WXw5yuZ9IGIJuzeL69hxY/6G6gloFAtGKwPjkZP7MrJ
-kG5Z4Fsgkq7JOglJWyB2gM08Y6JhEnXNGZgTt7jy5PJlJW0mt775N6CS1tVRTpyl
-NgCFrbDsVIvMWF9MwOAvbRafE9Zj0hCNqNu1Z1C+ddd5Cce/gVBaHHSX5LdrXsEx
-AGe1XqPVbXKRAFMEvo9ebuAZXuvtgEjEUuH3GR/2A6FlWgd8WHZLjBKalgLKrmBm
-/Wg8GXc5q/qPh3dTaX+2GjZd+tpTzXnwGQPqmW0o00hvu2VvIMdN0v1BJV+p8Suf
-YSVzapVWG5VfnuaW9AP+
-=xDFZ
+iEYEARECAAYFAk4VpA4ACgkQCaWpQKGI+9RdzACggOKRLFIJOYlE8O6MpYelHFbz
+wccAn0gdWYcPL2aLB4SQbTvCR/9GOSXb
+=POzX
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.1-gentoo.patch b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.1-gentoo.patch
deleted file mode 100644
index 7829a9b03a3b..000000000000
--- a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.1-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gtkmm-1.2.9.original/src/editable.gen_h gtkmm-1.2.9/src/editable.gen_h
---- gtkmm-1.2.9.original/src/editable.gen_h	Thu Nov  1 11:19:56 2001
-+++ gtkmm-1.2.9/src/editable.gen_h	Wed May 22 11:13:19 2002
-@@ -147,7 +147,7 @@
- namespace Gtk
- {
- 
--  string Editable::get_chars (int start_pos = 0, int end_pos = - 1) const
-+  string Editable::get_chars (int start_pos, int end_pos) const
-   {
-       gchar *chars = gtk_editable_get_chars (GTK_EDITABLE (gtkobj ()), start_pos, end_pos);
-       string ret_val = chars;
diff --git a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.4-gentoo.patch b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.4-gentoo.patch
deleted file mode 100644
index 1e9ac1f8159a..000000000000
--- a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc3.4-gentoo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ruN gtkmm-1.2.9.orig/src/build_sources/proxy.h.m4 gtkmm-1.2.9/src/build_sources/proxy.h.m4
---- gtkmm-1.2.9.orig/src/build_sources/proxy.h.m4	2004-05-23 16:31:57.125073328 +0200
-+++ gtkmm-1.2.9/src/build_sources/proxy.h.m4	2004-05-23 16:38:47.675660152 +0200
-@@ -174,20 +174,20 @@
-           data.callback=&callback;
-           data.obj=this;
-           SigC::ScopeNode* node=tmp->receiver();
--          obj->register_data(node);
-+          this->obj->register_data(node);
-           return tmp;
-         }
- 
-       RType emit(ARG_BOTH($1))
-         {
-           return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
--            (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
-+            (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
-         }
- 
-       RType operator()(ARG_BOTH($1))
-         {
-           return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
--            (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
-+            (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
-         }
- 
-   };
-diff -ruN gtkmm-1.2.9.orig/src/curve.gen_h gtkmm-1.2.9/src/curve.gen_h
---- gtkmm-1.2.9.orig/src/curve.gen_h	2004-05-23 16:31:57.111075456 +0200
-+++ gtkmm-1.2.9/src/curve.gen_h	2004-05-23 16:41:01.224357664 +0200
-@@ -143,8 +143,8 @@
-       int i;
-       Iterator iter;
-       for (iter=b,i=0;iter!=e;++iter,i++);
--      gfloat data[]=new gfloat[i];
--      get_vector(n,data);
-+      gfloat *data=new gfloat[i];
-+      get_vector(i,data);
-       for (iter=b,i=0;iter!=e;++iter,i++)
-         (*iter)=data[i];
-       delete [] data;
-diff -ruN gtkmm-1.2.9.orig/src/gtk--/base.h gtkmm-1.2.9/src/gtk--/base.h
---- gtkmm-1.2.9.orig/src/gtk--/base.h	2004-05-23 16:31:57.121073936 +0200
-+++ gtkmm-1.2.9/src/gtk--/base.h	2004-05-23 16:35:27.421103472 +0200
-@@ -90,6 +90,8 @@
- 
- struct _GtkObject;
- 
-+namespace Gtk { Gtk::Object *wrap (GtkObject *o); }
-+
- namespace Gtk
- {
- 
-@@ -482,7 +484,7 @@
-   value_type operator*() const
-   {
-     if (node && node->data)
--      return Gtk::wrap(static_cast<impl*>((*node).data));
-+    	return static_cast<value_type>(Gtk::wrap(static_cast<GtkObject*>((*node).data)));
-     return 0;
-   }
- 
diff --git a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch
deleted file mode 100644
index 4b9777bfb329..000000000000
--- a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gtkmmproc/gtkmmproc.cc~ 2007-04-01 20:46:07.000000000 +0000
-+++ src/gtkmmproc/gtkmmproc.cc  2007-04-01 20:46:11.000000000 +0000
-@@ -1,5 +1,6 @@
- // $Id: gtkmm-1.2.9-gcc4.3.patch,v 1.1 2008/07/11 09:00:23 remi Exp $
- 
-+#include <cstdlib>
- #include <stdio.h>
- #include <iostream>
- #include <string>
---- src/gtkmmproc/fixate.cc~    2007-04-01 20:46:21.000000000 +0000
-+++ src/gtkmmproc/fixate.cc     2007-04-01 20:46:26.000000000 +0000
-@@ -1,3 +1,4 @@
-+#include <cstdlib>
- #include <stdio.h>
- #include <string>
- #include <string.h>
-
diff --git a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.patch b/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.patch
deleted file mode 100644
index a5b52edaa818..000000000000
--- a/dev-cpp/gtkmm/files/gtkmm-1.2.9-gcc4.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur gtkmm-1.2.9-orig/src/clist.gen_h gtkmm-1.2.9/src/clist.gen_h
---- gtkmm-1.2.9-orig/src/clist.gen_h	2005-11-29 19:02:52.000000000 +0000
-+++ gtkmm-1.2.9/src/clist.gen_h	2005-11-29 19:03:43.000000000 +0000
-@@ -60,8 +60,8 @@
- class Cell 
-   {
-     protected:
--      friend class CList;
-+      friend class Gtk::CList;
-       friend class Row;
- 
-       GtkCList    *parent_;
-       GtkCListRow *row__;
-diff -ur gtkmm-1.2.9-orig/src/radiobutton.gen_h gtkmm-1.2.9/src/radiobutton.gen_h
---- gtkmm-1.2.9-orig/src/radiobutton.gen_h	2005-11-29 19:02:52.000000000 +0000
-+++ gtkmm-1.2.9/src/radiobutton.gen_h	2005-11-29 19:04:10.000000000 +0000
-@@ -36,7 +36,7 @@
-   //- It should not be called with new.
-   class Group
-     {
--      friend class RadioButton;
-+      friend class Gtk::RadioButton;
-       GSList *group_;
-       void* operator new(size_t);
-       void add(RadioButton& item);
-diff -ur gtkmm-1.2.9-orig/src/radiomenuitem.gen_h gtkmm-1.2.9/src/radiomenuitem.gen_h
---- gtkmm-1.2.9-orig/src/radiomenuitem.gen_h	2005-11-29 19:02:52.000000000 +0000
-+++ gtkmm-1.2.9/src/radiomenuitem.gen_h	2005-11-29 19:04:22.000000000 +0000
-@@ -34,7 +34,7 @@
-   //- It should not be called with new.
-   class Group 
-     {
--      friend class RadioMenuItem;
-+      friend class Gtk::RadioMenuItem;
-       GSList *group_;
-       void* operator new(size_t);
-       void add(RadioMenuItem& item);
diff --git a/dev-cpp/gtkmm/gtkmm-3.0.0.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.1.ebuild
index 4ad99332c230..995a429f1fd1 100644
--- a/dev-cpp/gtkmm/gtkmm-3.0.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.1.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/dev-cpp/gtkmm/gtkmm-3.0.0.ebuild,v 1.4 2011/04/29 00:57:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.24.1.ebuild,v 1.1 2011/07/07 12:18:16 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -12,21 +12,20 @@ DESCRIPTION="C++ interface for GTK+2"
 HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
-SLOT="3.0"
+SLOT="2.4"
 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"
 
-RDEPEND="
-	>=dev-cpp/glibmm-2.27.93:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=x11-libs/gdk-pixbuf-2.22.1:2
+RDEPEND=">=dev-cpp/glibmm-2.24:2
+	>=x11-libs/gtk+-2.24:2
 	>=dev-cpp/atkmm-2.22.2
-	>=dev-cpp/cairomm-1.9.2.2
+	>=dev-cpp/cairomm-1.2.2
 	>=dev-cpp/pangomm-2.27.1:1.4
 	dev-libs/libsigc++:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? (
+		>=dev-cpp/mm-common-0.9.3
 		media-gfx/graphviz
 		dev-libs/libxslt
 		app-doc/doxygen )"
@@ -54,9 +53,3 @@ src_prepare() {
 			|| die "sed 2 failed"
 	fi
 }
-
-src_install() {
-	gnome2_src_install
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}