Version bump, atkmm has now its own package. Remove old and make gtkmm-1.2.9-r2.ebuild repoman compliant (set RDEPEND).

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

6 files changed, 79 insertions, 103 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 8989d9d3b6d6..fb00f832b537 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.181 2010/10/09 22:56:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.182 2010/10/30 21:05:21 pacho Exp $
+
+*gtkmm-2.22.0 (30 Oct 2010)
+
+  30 Oct 2010; Pacho Ramos <pacho@gentoo.org> gtkmm-1.2.9-r2.ebuild,
+  -files/gtkmm-2.12.7-gtk2_14-compatibility.patch, -gtkmm-2.16.0.ebuild,
+  +gtkmm-2.22.0.ebuild:
+  Version bump, atkmm has now its own package. Remove old and make
+  gtkmm-1.2.9-r2.ebuild repoman compliant (set RDEPEND).
 
   09 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> gtkmm-2.20.3.ebuild:
   ppc64 stable wrt #324077
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index d9763a7d7cdb..c3edc9a7b6bb 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,18 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
-AUX gtkmm-2.12.7-gtk2_14-compatibility.patch 2205 RMD160 3d65c0edd8a697648bf941da7ad48879008d1665 SHA1 150a24d053a7f8dbc7900e3de455bc630facd376 SHA256 093b450d90c7c672f0235fa005a0a6197b7b3a45b9a45410c6e906b580df9088
 AUX gtkmm-2.2.12-gcc41.patch 3418 RMD160 7893ea3ea8aebfcc8b8c296d1ccb407658dc6d56 SHA1 e2fb943fa1277da0735bbd08acbd6602aca0e6a4 SHA256 28b21d7ba79a19cea0df01546b58dcbe5a0577b2d9c7c07bde8010cb2b1e7158
 DIST gtkmm-1.2.9.tar.gz 716656 RMD160 d5248981343fea5f3c0b7e59b190f7fe9273021a SHA1 42c87bba55fa72452bf3fcc18b169478a825fbf6 SHA256 fb8e59cee2d9825e4060b72937461bde488f673362bab258f6fe78e9db93925c
-DIST gtkmm-2.16.0.tar.bz2 9313258 RMD160 db9ce4005b7f6aecd88715c02f0ab9c43932e063 SHA1 e8cde1ebf651458c815d5e896bbae2ae4bf33d67 SHA256 9994e6a92f7086adb58aba0431f29a766218f806b9db95359dad59a0615f95bf
 DIST gtkmm-2.18.2.tar.bz2 12215352 RMD160 775b15bebd884a9dec084d7e4faa8510c013a6f7 SHA1 ed58c6d8d0be82fc326cd67a8c2cf1762c30245e SHA256 dfc003e22ecdc046cbae731b24e077ed87efa0f9ca57a0735dfe716c560b474e
 DIST gtkmm-2.2.12.tar.bz2 3846586 RMD160 009c6af3c638f2e55eaf82e5d9cdf468ca0a62ad SHA1 ea6f130f68b837bd042e8e84ab6708467dd8ba08 SHA256 8aa93a899f7aa55617041107dd3290ccbd3b2b81348a745a66557b159617bb57
 DIST gtkmm-2.20.3.tar.bz2 12554334 RMD160 b0f26cb06443e642e43435cec9ff66a5972fc8d7 SHA1 ad53f52f18cc3021b7fd6cd06f965471039d5333 SHA256 311d2156f15cdbdce22cb2af6e606a3f621d7dfebea6f7b1be0132e81af90585
-EBUILD gtkmm-1.2.9-r2.ebuild 1381 RMD160 b60bac2742371d7933e62a0656aa2b1d97113ad9 SHA1 fa39331e5d6b2ea0c8b5e2d2421b1e466470a613 SHA256 73ae87e764c6e556d8594e0e17531f8c54bf8c796f8af4ab4e9c3f2a1db87fea
-EBUILD gtkmm-2.16.0.ebuild 947 RMD160 86d973fcef4cd253da5222a37617f544c37afb0a SHA1 79b2a08325a0cf0193eb59c5c866ed4630576e73 SHA256 3f92dc73395ebc19312fd15cf57204479f70a464c8370c7e14c387ff53c0a1a8
+DIST gtkmm-2.22.0.tar.bz2 11496369 RMD160 5eacf79b3c2acd09ba36a3e8643da90282cec579 SHA1 4a43945ecf20d0db7679daf95d504c2e97fb0a72 SHA256 8478d80d8d4793c2e1c459a71bad6a767a43eaf2664da06a9bd65a2b98bb07b1
+EBUILD gtkmm-1.2.9-r2.ebuild 1402 RMD160 71b3f1a08beab3b4e2cba5582c47fcb54a5f263c SHA1 a337599e92416c3b2f982d2427d44646fad4b24f SHA256 14eed5af2acda6e220bfeef66618a1032e8c87d1d59bf02cc10a5744770acb73
 EBUILD gtkmm-2.18.2.ebuild 1300 RMD160 250933b33ba6310c9ae5da28a69a7bfe2490b986 SHA1 b6a20a92e8f760c1b582a75eaa399bed73ad3e11 SHA256 46906887a9c66786d41bc88c06682c03e0f7a233adf8d40469b5a7aa6893d46a
 EBUILD gtkmm-2.2.12.ebuild 696 RMD160 0e82e332757fe5ee3351c95067ebcbfc5d7c0814 SHA1 33e63d772ec1ba56b5a17b36b60bca1b01748c0a SHA256 3b5c0822d282ea2ed69fd74512e056577317dcb9c66798d0f22c92a5ebebfee7
 EBUILD gtkmm-2.20.3.ebuild 1301 RMD160 aae01f2d04f6a1e05bef795cc96ce9a4bf43af74 SHA1 4b8aded2b9a5ae2f5388e8a1439639fed77b2448 SHA256 cda92e1f8f8fca690dc148f9496d203a9b020ddab0893b78e81d07a734c57c44
-MISC ChangeLog 24415 RMD160 bdd570e7af8fa0ff995f14c865434e276796ed3d SHA1 e93ba8f5dd51fb441adc742c5a049f3714df5454 SHA256 bece445fd86ebb94e1e94ca857dfce89fd59b8e66e921f0dab0eacfa3ef64812
+EBUILD gtkmm-2.22.0.ebuild 1305 RMD160 94eefb1fd30b34ef801b74ac6fe533f600ad3744 SHA1 d758b34f704c61922c062a2f0127d7da2d0b6b48 SHA256 d9582311df88b2cdd42061a6fc7e3b3139fcfa4444cc8b90d23fb33d56f6b1af
+MISC ChangeLog 24731 RMD160 e5cbe0935a1bcdb5efa379f30b615809a906176a SHA1 d02cd6938b892eaadabce008c833382220324c78 SHA256 9196e3376ed3fbeeef04fa2cf00f4bb2ea1cffafca5cab9e660ca053700410ad
 MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzMiJcACgkQCaWpQKGI+9Q6kACfbKMyXPV116Z+0KL6jgDZ0EEg
+O+MAn1csJ8Z+Fhl9FE0prPfUwBs472Ah
+=LWFX
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch b/dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch
deleted file mode 100644
index aeb3a7acfc9b..000000000000
--- a/dev-cpp/gtkmm/files/gtkmm-2.12.7-gtk2_14-compatibility.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-http://svn.gnome.org/viewvc/gtkmm/trunk/gtk/src/toolbar.ccg?r1=869&r2=999&view=patch
-with the same repeated for gtk/gtkmm generated sources
-
-Fixes build against gtk+-2.14 to allow gtkmm to be stabled later than gtk+
-
---- trunk/gtk/src/toolbar.ccg	2007/07/12 12:41:04	869
-+++ trunk/gtk/src/toolbar.ccg	2008/07/03 15:09:41	999
-@@ -20,13 +20,6 @@
-  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--//Define this to make sure that we don't use any of the deprecated GtkToolbar API.
--//Normally we just deprecate it in gtkmm too,
--//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
--//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then.
--
--#define GTK_DISABLE_DEPRECATED
--
- #include <glib.h>
- #include <gtkmm/button.h>
- #include <gtkmm/togglebutton.h>
-@@ -96,7 +89,7 @@
- Tooltips* Toolbar::get_tooltips_object() const
- {
-   //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
--  return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
-+  return 0; //Glib::wrap((GtkTooltips*)gobj()->_tooltips);
- }
- #endif //GTKMM_DISABLE_DEPRECATED
- 
---- trunk/gtk/gtkmm/toolbar.cc	2007/07/12 12:41:04	869
-+++ trunk/gtk/gtkmm/toolbar.cc	2008/07/03 15:09:41	999
-@@ -20,13 +20,6 @@
-  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--//Define this to make sure that we don't use any of the deprecated GtkToolbar API.
--//Normally we just deprecate it in gtkmm too,
--//but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
--//In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then.
--
--#define GTK_DISABLE_DEPRECATED
--
- #include <glib.h>
- #include <gtkmm/button.h>
- #include <gtkmm/togglebutton.h>
-@@ -96,7 +89,7 @@
- Tooltips* Toolbar::get_tooltips_object() const
- {
-   //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
--  return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
-+  return 0; //Glib::wrap((GtkTooltips*)gobj()->_tooltips);
- }
- #endif //GTKMM_DISABLE_DEPRECATED
- 
diff --git a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
index ae802c1c89d6..3669f34a63f1 100644
--- a/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.16 2008/07/11 09:00:23 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-1.2.9-r2.ebuild,v 1.17 2010/10/30 21:05:21 pacho Exp $
 
 inherit eutils
 
@@ -17,6 +17,7 @@ IUSE="debug"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	=dev-libs/libsigc++-1.0*"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-cpp/gtkmm/gtkmm-2.16.0.ebuild b/dev-cpp/gtkmm/gtkmm-2.16.0.ebuild
deleted file mode 100644
index 0ede5a3005b3..000000000000
--- a/dev-cpp/gtkmm/gtkmm-2.16.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.16.0.ebuild,v 1.9 2009/10/26 18:12:51 armin76 Exp $
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for GTK+2"
-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"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-cpp/glibmm-2.19
-	>=x11-libs/gtk+-2.15.5
-	>=dev-cpp/cairomm-1.2.2
-	>=dev-cpp/pangomm-2.14.0
-	>=dev-libs/atk-1.9.1"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-api-atkmm
-		$(use_enable doc docs)
-		$(use_enable examples demos)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if ! use test; then
-		# don't waste time building tests
-		sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die "sed failed"
-	fi
-}
diff --git a/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild b/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild
new file mode 100644
index 000000000000..d12b95d17a90
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.22.0.ebuild,v 1.1 2010/10/30 21:05:21 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="C++ interface for GTK+2"
+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 ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-cpp/glibmm-2.24
+	>=x11-libs/gtk+-2.20.0
+	>=dev-cpp/atkmm-2.22.0
+	>=dev-cpp/cairomm-1.2.2
+	>=dev-cpp/pangomm-2.26
+	dev-libs/libsigc++:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		media-gfx/graphviz
+		dev-libs/libxslt
+		app-doc/doxygen )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog PORTING NEWS README"
+	G2CONF="${G2CONF}
+		--enable-api-atkmm
+		--disable-maintainer-mode
+		$(use_enable doc documentation)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	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
+}