Version bump for bug fixes and translation updates. Remove old

Package-Manager: portage-2.1.5.2

7 files changed, 18 insertions, 126 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/Manifest b/gnome-extra/gcalctool/Manifest
index af560e4ef18f..39c268f441a7 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,23 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gcalctool-5.8.25-hex-float.patch 1348 RMD160 a1a54229d445ed5e307d0179387994cb4ff6615d SHA1 74b6d89090f1c9862c217bdb72bb415190006b9d SHA256 abb3f55d61875ecc9628b0ba5fcf717e7bfebf0ca9e255486f3c9e557ab04f96
-AUX gcalctool-5.9.14-gtk+-2.12.0-compat.patch 501 RMD160 a600b64adccb056a1b8b7f7309d19a1edbedd900 SHA1 c44148bcb43274d923f58bf44ceac081a0338328 SHA256 2bbab865ba6057ed684101776d03c25543b21ededf28523f9d9016f01a3cfead
 DIST gcalctool-5.20.2.tar.bz2 1343757 RMD160 e8dfca5d3751858420c8a03a1600afc3a020c4f4 SHA1 c33733a5885f33e21d64628393feaaf93b4db345 SHA256 b871c8b7fa2c4afa78b6a1708cffe04ae389ee20ff34e5fb2ddb4b78071edacd
-DIST gcalctool-5.22.0.tar.bz2 1550068 RMD160 84c5ca6cc1ef9ba6e85772dc3f22e845f7e75878 SHA1 dc95a3b375695b8c593d29faca86ea54e6363be5 SHA256 c9f675c14fdbaf1a2f61f3d457e3a941ae5257b111509ae73579325f7d010afb
 DIST gcalctool-5.22.1.tar.bz2 1488395 RMD160 e53335cdbb3c07ad6d311e15a8debda73e829fef SHA1 8436067dfb3e91338abf236c4b229ae435aa3681 SHA256 8678b134bf7c590dd7c10f2790b7a8cc736b99c160aab0d2cf8e8fe0aa9e869c
-DIST gcalctool-5.9.14.tar.bz2 1189518 RMD160 a790a820c1b2e7321badc2ef3aef4f814159baac SHA1 299489f6090c3f88cca754e8a513b8a8e3d16cf9 SHA256 f94a63f6860bfd3d868d8419de2a9d709381eeb44d8535565629525dbc9729c5
+DIST gcalctool-5.22.2.tar.bz2 1493482 RMD160 659df17e400690b30aee9ffc758bc86b0d699d7e SHA1 279306371d4ddb70b3cb9ef2033ac5262e83aa03 SHA256 2b02c28ab787ac3bf448ae2d3a8aad09fd4d8e937464af79917adc2ffbe8528e
 EBUILD gcalctool-5.20.2.ebuild 972 RMD160 3e6ec57a53b954af627b1b988955d4f03a150945 SHA1 0ba0b1b6f455d150fe160f3c5e86edadf6bc18d0 SHA256 9c5fda5ec9739bb06f8f7770ee55af57bfe549557f2caee72b29a33fb029b14d
-EBUILD gcalctool-5.22.0.ebuild 949 RMD160 2ac612f067b230f18ca43dffb4823c1455d26c46 SHA1 e8314ab777edcf5fb33437e37fb6ab80ec973b05 SHA256 9c9673aa1070300f148341a3e05deef1e548d5ee614aa614544d35456c0328d7
 EBUILD gcalctool-5.22.1.ebuild 948 RMD160 41e9a893438854dcd81f6d91659f3b730d526b17 SHA1 5991f21b595c27de74c466f3c67529e8f3ab091e SHA256 e631e7a565fe8b4610cbe7ab34db46066a6172e17ad32982f51115ca55bc2739
-EBUILD gcalctool-5.9.14-r1.ebuild 1012 RMD160 5f064707e9428e882d6f4a571b740496f11917df SHA1 b9da724b28b8f197decd8a776cc4d0597d3f178e SHA256 ae9efef8fae7ab4fc41809612f5823a5c5db556d2adad406b5f5e9dce57e5d0a
-EBUILD gcalctool-5.9.14.ebuild 876 RMD160 02ec690275e5dfd25f3e24935e8a5f0de2ee14e7 SHA1 5ce7159774821c00a60b81512ce27535a253f3c2 SHA256 a092f131eaf9f7c294fa715f6d6db41c041fb1714095460c2dfb315cbf666b04
-MISC ChangeLog 18776 RMD160 f62125caaf2be0fe7ed4d35e0a224759c16d6d7c SHA1 e51f8faab6807286b1db6142f735c616951d34c9 SHA256 13dad87f44cdea786dc1a55ecc3e90b478689f8d2515b3483868f70aff795b01
+EBUILD gcalctool-5.22.2.ebuild 949 RMD160 1919d0908b38f257b4c433bc670c947bd2991f31 SHA1 cd5693d71369e0a7cbadf2c64a7be7cc4843b7db SHA256 46bcf3079cc49eb241f7c0ded4ff9e50ffac38527c8f8570e1235dc82a499aa2
+MISC ChangeLog 19129 RMD160 c6d5745378512f9fa8859d19270a7db6f905c4f8 SHA1 00e9f84e2b05e5c28b691dbc2b210ca6dd8c3be5 SHA256 12212b26a363a08f91de02ebe6a463f51a6d44ced5d51452157d68f6d26df6e6
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFICqYlj9hvisErhMIRAjE+AJ4xeoqDmN0yYkQgUCZmvfdLN01mSACfQZ80
-jf9VpwNqhTaaMbitOcifyOY=
-=4OUf
+iEYEARECAAYFAkhDNiEACgkQkeYb6olFHJe+PACffnzvk6ieIYDCjFKK2Llsyt9G
+zmgAniAiu3a7UneOXAj/w/MprCse6MTE
+=n8Q7
 -----END PGP SIGNATURE-----
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"
-}