fixing bug #153294, and droping ~alpha and ~ppc64 for this bump

(Portage version: 2.1.2_rc2)

4 files changed, 83 insertions, 1 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index b12038ec3541..fb80dc69ad94 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.101 2006/11/20 13:10:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.102 2006/11/21 08:16:05 remi Exp $
+
+*gtkmm-2.10.2-r1 (21 Nov 2006)
+
+  21 Nov 2006; Remi Cardona <remi@gentoo.fr>
+  +files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch,
+  +gtkmm-2.10.2-r1.ebuild:
+  Patch for bug #153294 (remove atkmm from gtkmm-2.4.pc if -accessibility is set)
+  Submitted patch upstream : http://bugzilla.gnome.org/show_bug.cgi?id=366930
 
   20 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> gtkmm-2.10.2.ebuild:
   Remove ~x86-fbsd keyword till I can get glibmm to build.
diff --git a/dev-cpp/gtkmm/files/digest-gtkmm-2.10.2-r1 b/dev-cpp/gtkmm/files/digest-gtkmm-2.10.2-r1
new file mode 100644
index 000000000000..72e29b80a7b5
--- /dev/null
+++ b/dev-cpp/gtkmm/files/digest-gtkmm-2.10.2-r1
@@ -0,0 +1,3 @@
+MD5 b29ec706e544002d312cbefa0a65c446 gtkmm-2.10.2.tar.bz2 7056116
+RMD160 7c9dc8d9d45efc073c6036bd3a5e3c04518ccee2 gtkmm-2.10.2.tar.bz2 7056116
+SHA256 57e95e857dc37be8a2813e618f627f4986c073aa8b6f1ce9bcd07193545f358b gtkmm-2.10.2.tar.bz2 7056116
diff --git a/dev-cpp/gtkmm/files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch b/dev-cpp/gtkmm/files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch
new file mode 100644
index 000000000000..689e182106a0
--- /dev/null
+++ b/dev-cpp/gtkmm/files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch
@@ -0,0 +1,27 @@
+diff -Nru configure.in.old configure.in
+--- configure.in	2006-09-21 21:48:20.000000000 +0200
++++ configure.in	2006-11-19 00:15:40.000000000 +0100
+@@ -452,7 +452,11 @@
+ 	atk/atkmm/Makefile
+ 	atk/atkmm/private/Makefile
+   ])
++  GTKMM_PC_ATKMM_DEP="atkmm-1.6"
++else
++  GTKMM_PC_ATKMM_DEP=""
+ fi
++AC_SUBST(GTKMM_PC_ATKMM_DEP)
+ 
+ #Allow us to test for atkmm support in Makefile.am files:
+ AM_CONDITIONAL(GTKMM_ATKMM_ENABLED, test "x$gtkmm_enable_api_atkmm" = "xyes")
+diff -Nru gtk/gtkmm-2.4.pc.in.old gtk/gtkmm-2.4.pc.in
+--- gtk/gtkmm-2.4.pc.in	2004-04-11 23:00:53.000000000 +0200
++++ gtk/gtkmm-2.4.pc.in	2006-11-19 00:16:04.000000000 +0100
+@@ -5,7 +5,7 @@
+ 
+ Name: gtkmm
+ Description: C++ wrapper for GTK+
+-Requires: glibmm-2.4 gdkmm-2.4 pangomm-1.4 atkmm-1.6 gtk+-2.0
++Requires: glibmm-2.4 gdkmm-2.4 pangomm-1.4 @GTKMM_PC_ATKMM_DEP@ gtk+-2.0
+ Version: @VERSION@
+ Libs: -L${libdir} -lgtkmm-2.4
+ Cflags: -I${includedir}/gtkmm-2.4 -I${libdir}/gtkmm-2.4/include
diff --git a/dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild b/dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild
new file mode 100644
index 000000000000..61718a0bdd39
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild,v 1.1 2006/11/21 08:16:05 remi Exp $
+
+inherit gnome2 autotools
+
+DESCRIPTION="C++ interface for GTK+2"
+HOMEPAGE="http://gtkmm.sourceforge.net/"
+
+LICENSE="LGPL-2.1"
+SLOT="2.4"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86"
+IUSE="accessibility doc examples"
+
+RDEPEND=">=dev-cpp/glibmm-2.12.1
+	>=x11-libs/gtk+-2.10.0
+	>=dev-cpp/cairomm-1.1.12
+	>=dev-libs/libsigc++-2.0
+	accessibility? ( >=dev-libs/atk-1.9.1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
+
+gnome2_src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# fix bug #153294
+	epatch ${FILESDIR}/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch
+	eautoconf
+
+	# Prevent scrollkeeper access violations
+	gnome2_omf_fix
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} \
+			$(use_enable accessibility api-atkmm) \
+			$(use_enable doc docs) \
+			$(use_enable examples)
+			$(use_enable examples demos)"
+}