Version bump for bug fixes and translation updates. Remove old

(Portage version: 2.1.5.2)

6 files changed, 11 insertions, 114 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 4e2172543b45..be5fc35a91a1 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.156 2008/04/10 22:25:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.157 2008/06/01 23:51:54 leio Exp $
+
+*gcalctool-5.22.2 (01 Jun 2008)
+
+  01 Jun 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/gcalctool-5.8.25-hex-float.patch,
+  -files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch,
+  -gcalctool-5.9.14.ebuild, -gcalctool-5.9.14-r1.ebuild,
+  -gcalctool-5.22.0.ebuild, +gcalctool-5.22.2.ebuild:
+  Version bump for bug fixes and translation updates. Remove old
 
 *gcalctool-5.22.1 (10 Apr 2008)
 
diff --git a/gnome-extra/gcalctool/files/gcalctool-5.8.25-hex-float.patch b/gnome-extra/gcalctool/files/gcalctool-5.8.25-hex-float.patch
deleted file mode 100644
index 058585d5bfc1..000000000000
--- a/gnome-extra/gcalctool/files/gcalctool-5.8.25-hex-float.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcalctool-5.8.25.orig/gcalctool/ce_tokeniser.l gcalctool-5.8.25/gcalctool/ce_tokeniser.l
---- gcalctool-5.8.25.orig/gcalctool/ce_tokeniser.l	2005-12-19 10:46:57.000000000 -0500
-+++ gcalctool-5.8.25/gcalctool/ce_tokeniser.l	2007-02-10 20:36:06.000000000 -0500
-@@ -102,7 +102,7 @@ MPstr_to_num(yytext, v->base, celval.int
- return tINUMBER;
- }
- 
--{DIGIT}*{DECIMAL}{DIGIT}+ {
-+{HEX}*{DECIMAL}{HEX}+ {
- if (strlen(yytext) > 40) parser_state.error = -PARSER_ERR_TOO_LONG_NUMBER;
- check_numbase(yytext);
- MPstr_to_num(yytext, v->base, celval.int_t);
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcalctool-5.8.25.orig/gcalctool/functions.c gcalctool-5.8.25/gcalctool/functions.c
---- gcalctool-5.8.25.orig/gcalctool/functions.c	2006-11-02 13:02:44.000000000 -0500
-+++ gcalctool-5.8.25/gcalctool/functions.c	2007-02-10 20:36:06.000000000 -0500
-@@ -1447,8 +1447,8 @@ do_shift()     /* Perform bitwise shift 
-             int n = char_val(e->button.value[0]);
-             int ret = usable_num(MPval);
- 
--            if (ret) {
--	        update_statusbar(_("No sane value to store"), 
-+            if (ret || !is_integer(MPval)) {
-+	        update_statusbar(_("No sane value to do bitwise shift"), 
-                                  "gtk-dialog-error");
- 	        return;
-             } 
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
deleted file mode 100644
index ff134afee76c..000000000000
--- a/gnome-extra/gcalctool/files/gcalctool-5.9.14-gtk+-2.12.0-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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.22.0.ebuild b/gnome-extra/gcalctool/gcalctool-5.22.2.ebuild
index ed535b24c328..995e57e09227 100644
--- a/gnome-extra/gcalctool/gcalctool-5.22.0.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.22.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.22.0.ebuild,v 1.1 2008/03/23 21:03:31 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.22.2.ebuild,v 1.1 2008/06/01 23:51:54 leio Exp $
 
 inherit gnome2 eutils
 
diff --git a/gnome-extra/gcalctool/gcalctool-5.9.14-r1.ebuild b/gnome-extra/gcalctool/gcalctool-5.9.14-r1.ebuild
deleted file mode 100644
index 626dbe4b28b0..000000000000
--- a/gnome-extra/gcalctool/gcalctool-5.9.14-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 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.8 2008/04/20 02:10:12 vapier 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"
-}
diff --git a/gnome-extra/gcalctool/gcalctool-5.9.14.ebuild b/gnome-extra/gcalctool/gcalctool-5.9.14.ebuild
deleted file mode 100644
index db2092c7f21f..000000000000
--- a/gnome-extra/gcalctool/gcalctool-5.9.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.ebuild,v 1.10 2007/09/22 08:06:24 tgall Exp $
-
-inherit 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"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-gnome"
-}