gnome-extra/gcalctool: Fix compatibility with gtk+ 2.12 (bug #193701)

Package-Manager: portage-2.1.3.10

5 files changed, 79 insertions, 5 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index b631372dd444..1dc58afe1d75 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.138 2007/09/22 08:06:24 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.139 2007/09/29 10:12:56 remi Exp $
+
+*gcalctool-5.9.14-r1 (29 Sep 2007)
+
+  29 Sep 2007; Rémi Cardona <remi@gentoo.org>
+  +files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch,
+  +gcalctool-5.9.14-r1.ebuild:
+  Fix compatibility with gtk+ 2.12 (bug #193701)
 
   22 Sep 2007; Tom Gall <tgall@gentoo.org> gcalctool-5.9.14.ebuild:
   stable on ppc64
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index 52c7c25a2ada..428d2125caea 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -2,20 +2,28 @@ AUX gcalctool-5.8.25-hex-float.patch 1348 RMD160 a1a54229d445ed5e307d0179387994c
 MD5 e41a33c11e2fe5c0ceffc5a62e3fa6af files/gcalctool-5.8.25-hex-float.patch 1348
 RMD160 a1a54229d445ed5e307d0179387994cb4ff6615d files/gcalctool-5.8.25-hex-float.patch 1348
 SHA256 abb3f55d61875ecc9628b0ba5fcf717e7bfebf0ca9e255486f3c9e557ab04f96 files/gcalctool-5.8.25-hex-float.patch 1348
+AUX gcalctool-5.9.14-gtk+-2.12.0-compat.patch 501 RMD160 a600b64adccb056a1b8b7f7309d19a1edbedd900 SHA1 c44148bcb43274d923f58bf44ceac081a0338328 SHA256 2bbab865ba6057ed684101776d03c25543b21ededf28523f9d9016f01a3cfead
+MD5 c064ecbb324311706119ece295f4e990 files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch 501
+RMD160 a600b64adccb056a1b8b7f7309d19a1edbedd900 files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch 501
+SHA256 2bbab865ba6057ed684101776d03c25543b21ededf28523f9d9016f01a3cfead files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch 501
 DIST gcalctool-5.8.25.tar.bz2 1146544 RMD160 78fb68e274e1e43fbc82ce6301b1595a798bedaa SHA1 dbab85591c72b3403bf58f5bac8be35b926ebb6b SHA256 a7942e8be300fdeea061ac5ed50b7f0b81e5bf7f598713317aff85b85b5345a3
 DIST gcalctool-5.9.14.tar.bz2 1189518 RMD160 a790a820c1b2e7321badc2ef3aef4f814159baac SHA1 299489f6090c3f88cca754e8a513b8a8e3d16cf9 SHA256 f94a63f6860bfd3d868d8419de2a9d709381eeb44d8535565629525dbc9729c5
 EBUILD gcalctool-5.8.25-r1.ebuild 1070 RMD160 64a061ce3506212dded7badcc1df3200048e9812 SHA1 b76d1e5d6d0aa7c79df4c6c0a3284c39eaf0bc9b SHA256 2d56e7ba4ddb6202298e5965222ee7335b4459c81f365255be2e86578a681ac2
 MD5 2afd934f781ddb0d7d37a23f2942f33b gcalctool-5.8.25-r1.ebuild 1070
 RMD160 64a061ce3506212dded7badcc1df3200048e9812 gcalctool-5.8.25-r1.ebuild 1070
 SHA256 2d56e7ba4ddb6202298e5965222ee7335b4459c81f365255be2e86578a681ac2 gcalctool-5.8.25-r1.ebuild 1070
+EBUILD gcalctool-5.9.14-r1.ebuild 1020 RMD160 df529f7d66598156d9be43c7529f0d4c9262bf30 SHA1 0a93f8ec66b8d9b2676a172818d48acfbca1d606 SHA256 9da10204fb817c4a0c8bb952d28cad83d605b51c4b51afa42c75a17973bf3f82
+MD5 40e57db997285d887cac5253481be4f9 gcalctool-5.9.14-r1.ebuild 1020
+RMD160 df529f7d66598156d9be43c7529f0d4c9262bf30 gcalctool-5.9.14-r1.ebuild 1020
+SHA256 9da10204fb817c4a0c8bb952d28cad83d605b51c4b51afa42c75a17973bf3f82 gcalctool-5.9.14-r1.ebuild 1020
 EBUILD gcalctool-5.9.14.ebuild 876 RMD160 02ec690275e5dfd25f3e24935e8a5f0de2ee14e7 SHA1 5ce7159774821c00a60b81512ce27535a253f3c2 SHA256 a092f131eaf9f7c294fa715f6d6db41c041fb1714095460c2dfb315cbf666b04
 MD5 bcbc99bd13a6c5f87cfb6847253342fa gcalctool-5.9.14.ebuild 876
 RMD160 02ec690275e5dfd25f3e24935e8a5f0de2ee14e7 gcalctool-5.9.14.ebuild 876
 SHA256 a092f131eaf9f7c294fa715f6d6db41c041fb1714095460c2dfb315cbf666b04 gcalctool-5.9.14.ebuild 876
-MISC ChangeLog 16317 RMD160 6bbeaf451847d7874aa08ffe3e13422ac337a5a5 SHA1 dcab09d3f21c0899e57b5238597abc9c9a53da2e SHA256 0bb164553528ca58c59cd9f5757ab035003d3175b34c1f533ceb3157fea914b3
-MD5 6e0a5c218d50dc2707482ac2be9a8ab0 ChangeLog 16317
-RMD160 6bbeaf451847d7874aa08ffe3e13422ac337a5a5 ChangeLog 16317
-SHA256 0bb164553528ca58c59cd9f5757ab035003d3175b34c1f533ceb3157fea914b3 ChangeLog 16317
+MISC ChangeLog 16532 RMD160 a3bbfe9dc8dc345952d0b88cafbaa35579b7db1e SHA1 2b33aeaf4fb31f9a2b6402e0fded215072e6bad0 SHA256 161281e4b91fe81337f7af016e7fe1379ff7f0341a34af4ff1389f43be2b5e99
+MD5 516f9163f1c968a5401ee5b2189baf0b ChangeLog 16532
+RMD160 a3bbfe9dc8dc345952d0b88cafbaa35579b7db1e ChangeLog 16532
+SHA256 161281e4b91fe81337f7af016e7fe1379ff7f0341a34af4ff1389f43be2b5e99 ChangeLog 16532
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -26,3 +34,6 @@ SHA256 eb0c4c426c285d395f907bb36f09f6f0f6cc418e03ad803fb42aba54564abb24 files/di
 MD5 88901534df8b7f70263068ace4104a55 files/digest-gcalctool-5.9.14 256
 RMD160 6287f69244f56b4504d2f032286d4058ed9fa7f5 files/digest-gcalctool-5.9.14 256
 SHA256 c9fc710198c412d1d26de66e0d95eeb1c94c11eb33a68837ac85d081b5ecb60c files/digest-gcalctool-5.9.14 256
+MD5 88901534df8b7f70263068ace4104a55 files/digest-gcalctool-5.9.14-r1 256
+RMD160 6287f69244f56b4504d2f032286d4058ed9fa7f5 files/digest-gcalctool-5.9.14-r1 256
+SHA256 c9fc710198c412d1d26de66e0d95eeb1c94c11eb33a68837ac85d081b5ecb60c files/digest-gcalctool-5.9.14-r1 256
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-5.9.14-r1 b/gnome-extra/gcalctool/files/digest-gcalctool-5.9.14-r1
new file mode 100644
index 000000000000..fc5f8de7dd8a
--- /dev/null
+++ b/gnome-extra/gcalctool/files/digest-gcalctool-5.9.14-r1
@@ -0,0 +1,3 @@
+MD5 dd51bc2fa9e53a3b6d7b3264e1059296 gcalctool-5.9.14.tar.bz2 1189518
+RMD160 a790a820c1b2e7321badc2ef3aef4f814159baac gcalctool-5.9.14.tar.bz2 1189518
+SHA256 f94a63f6860bfd3d868d8419de2a9d709381eeb44d8535565629525dbc9729c5 gcalctool-5.9.14.tar.bz2 1189518
diff --git a/gnome-extra/gcalctool/files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch b/gnome-extra/gcalctool/files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch
new file mode 100644
index 000000000000..ff134afee76c
--- /dev/null
+++ b/gnome-extra/gcalctool/files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch
@@ -0,0 +1,14 @@
+--- gcalctool/Makefile.am.orig	2007-09-27 18:05:53.000000000 -0500
++++ gcalctool/Makefile.am	2007-09-27 18:06:10.000000000 -0500
+@@ -2,11 +2,6 @@
+ 
+ INCLUDES = \
+ 	-I$(includedir) \
+-	-DG_DISABLE_DEPRECATED \
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED \
+-	-DGNOME_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ 	-DPACKAGE_PIXMAP_DIR=\""$(prefix)/$(DATADIRNAME)/pixmaps"\" \
diff --git a/gnome-extra/gcalctool/gcalctool-5.9.14-r1.ebuild b/gnome-extra/gcalctool/gcalctool-5.9.14-r1.ebuild
new file mode 100644
index 000000000000..d42317367c9f
--- /dev/null
+++ b/gnome-extra/gcalctool/gcalctool-5.9.14-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.9.14-r1.ebuild,v 1.1 2007/09/29 10:12:56 remi Exp $
+
+inherit eutils autotools gnome2
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="http://calctool.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2
+	>=dev-libs/atk-1.5
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gconf-2
+	!<gnome-extra/gnome-utils-2.3"
+DEPEND="${RDEPEND}
+	  sys-devel/gettext
+	  app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${P}-gtk+-2.12.0-compat.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-gnome"
+}