Fix hex floating point input; bug #152021

Package-Manager: portage-2.1.2-r9

5 files changed, 106 insertions, 5 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 691d7275f453..54a300e890bf 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,12 @@
 # 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.121 2007/02/09 23:46:59 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.122 2007/02/11 02:08:00 dang Exp $
+
+*gcalctool-5.8.25-r1 (11 Feb 2007)
+
+  11 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gcalctool-5.8.25-hex-float.patch, +gcalctool-5.8.25-r1.ebuild:
+  Fix hex floating point input; bug #152021
 
   09 Feb 2007; Roy Marples <uberlord@gentoo.org> gcalctool-5.8.25.ebuild:
   Added ~x86-fbsd keyword.
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index cf930bd8f1dd..36c2c7696df9 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gcalctool-5.8.25-hex-float.patch 1348 RMD160 a1a54229d445ed5e307d0179387994cb4ff6615d SHA1 74b6d89090f1c9862c217bdb72bb415190006b9d SHA256 abb3f55d61875ecc9628b0ba5fcf717e7bfebf0ca9e255486f3c9e557ab04f96
+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
 DIST gcalctool-5.6.31.tar.bz2 1101457 RMD160 4bd2454e35aa9dbca72d1b8a6c9772634734d72a SHA1 2b82b42031a7b248857166e3cdf8d133bccda712 SHA256 b9ae735e014bc5490e678c770547b855d8a8189d55b1298d8c17013cf1ef5edc
 DIST gcalctool-5.8.16.tar.bz2 1027561 RMD160 2daafee6bb398fb1fade5c8214b344cef5e9d11c SHA1 f0b71fd4e9842b6c49dd842b26529ee7ed558fbb SHA256 9c32e9a2d8f9b05164beb4494b410564f0269464d36caeb4ebbe4a3338b503be
 DIST gcalctool-5.8.20.tar.bz2 1067951 RMD160 98751562dd39814b722839aa2ecdc4d790ada782 SHA1 7dc0fda50732d3f4ed9e3fdc80a6e397299d73a5 SHA256 ebb2fe7e8db30d980e1073d665b1a3a260803b2bc309264621d17779cf455b83
@@ -19,14 +26,18 @@ EBUILD gcalctool-5.8.24.ebuild 984 RMD160 b48d0aa7cd093d965731e6da577ecee443e42b
 MD5 30b778c600ad33de8aa751d65d3b7193 gcalctool-5.8.24.ebuild 984
 RMD160 b48d0aa7cd093d965731e6da577ecee443e42b6c gcalctool-5.8.24.ebuild 984
 SHA256 5bb81171578a2e4efd9739930e3da6bae79106834cd1a0384603624c9b432063 gcalctool-5.8.24.ebuild 984
+EBUILD gcalctool-5.8.25-r1.ebuild 1078 RMD160 fffc2e309df1b0ae9e9b27d06af0150b8a46752c SHA1 1e8b5b56d39d2c1c7b6357378f8268cf136ce9c2 SHA256 8050ccc0a8c3ee5f2cd6b0c18316369502f29fda415f578bded0f66db368b8fd
+MD5 eb77bd96578e20cc544370e5ce1d1fa9 gcalctool-5.8.25-r1.ebuild 1078
+RMD160 fffc2e309df1b0ae9e9b27d06af0150b8a46752c gcalctool-5.8.25-r1.ebuild 1078
+SHA256 8050ccc0a8c3ee5f2cd6b0c18316369502f29fda415f578bded0f66db368b8fd gcalctool-5.8.25-r1.ebuild 1078
 EBUILD gcalctool-5.8.25.ebuild 989 RMD160 ee48f4f198e3e87dcdf05a283a7d5f072c8c6764 SHA1 5f7d9edb8afe78ec769de2f1dbe6c5ff22a28ee6 SHA256 60f531400edbaa69b7d88fee662d4272974ff2f97973ad16eacfb4028d19b944
 MD5 feee1c4909894b60dabd22186b1d7a89 gcalctool-5.8.25.ebuild 989
 RMD160 ee48f4f198e3e87dcdf05a283a7d5f072c8c6764 gcalctool-5.8.25.ebuild 989
 SHA256 60f531400edbaa69b7d88fee662d4272974ff2f97973ad16eacfb4028d19b944 gcalctool-5.8.25.ebuild 989
-MISC ChangeLog 14195 RMD160 95367b24f637e30ff157b042941ceae13d98c156 SHA1 47774f04f3cfe794c94d35cea9342c19a565b9b0 SHA256 bce00d186f65c4ae50562d2923b8e07a3dd9b63524732f4a6c5939b7d51ee2e1
-MD5 231c05fac4c7ffeced699d4a5cf80a7b ChangeLog 14195
-RMD160 95367b24f637e30ff157b042941ceae13d98c156 ChangeLog 14195
-SHA256 bce00d186f65c4ae50562d2923b8e07a3dd9b63524732f4a6c5939b7d51ee2e1 ChangeLog 14195
+MISC ChangeLog 14395 RMD160 0128e577e264589737499634cc7539652473ecec SHA1 5fd94e50d405b399fb815a2ae5c8ddd239388118 SHA256 f488398c7fef36597b6c2b1a9405582eccdca9b4061ece247b60a4c7942f7f2d
+MD5 35487a8d6690c41cf068450b49fdac60 ChangeLog 14395
+RMD160 0128e577e264589737499634cc7539652473ecec ChangeLog 14395
+SHA256 f488398c7fef36597b6c2b1a9405582eccdca9b4061ece247b60a4c7942f7f2d ChangeLog 14395
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -46,3 +57,13 @@ SHA256 74a942f3b30742e906292ea5087bb5a6ba89f386af80a87d67c46a91829ecfaf files/di
 MD5 8963f90942a834206969774de3fc0671 files/digest-gcalctool-5.8.25 256
 RMD160 d9c5bc439da6246b4f5c57632084d244ab8a025a files/digest-gcalctool-5.8.25 256
 SHA256 eb0c4c426c285d395f907bb36f09f6f0f6cc418e03ad803fb42aba54564abb24 files/digest-gcalctool-5.8.25 256
+MD5 8963f90942a834206969774de3fc0671 files/digest-gcalctool-5.8.25-r1 256
+RMD160 d9c5bc439da6246b4f5c57632084d244ab8a025a files/digest-gcalctool-5.8.25-r1 256
+SHA256 eb0c4c426c285d395f907bb36f09f6f0f6cc418e03ad803fb42aba54564abb24 files/digest-gcalctool-5.8.25-r1 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFznp7omPajV0RnrERAsCFAJ9T7mxRVJpBVQxdRVmeoEJn9lY38gCdFE+h
+/NTyNz+tuZDLE0XXcL+MIXU=
+=kPgT
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-5.8.25-r1 b/gnome-extra/gcalctool/files/digest-gcalctool-5.8.25-r1
new file mode 100644
index 000000000000..f249a1c5b54a
--- /dev/null
+++ b/gnome-extra/gcalctool/files/digest-gcalctool-5.8.25-r1
@@ -0,0 +1,3 @@
+MD5 28074081a9625b8b3d1f7499bc27bbfb gcalctool-5.8.25.tar.bz2 1146544
+RMD160 78fb68e274e1e43fbc82ce6301b1595a798bedaa gcalctool-5.8.25.tar.bz2 1146544
+SHA256 a7942e8be300fdeea061ac5ed50b7f0b81e5bf7f598713317aff85b85b5345a3 gcalctool-5.8.25.tar.bz2 1146544
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
new file mode 100644
index 000000000000..058585d5bfc1
--- /dev/null
+++ b/gnome-extra/gcalctool/files/gcalctool-5.8.25-hex-float.patch
@@ -0,0 +1,26 @@
+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/gcalctool-5.8.25-r1.ebuild b/gnome-extra/gcalctool/gcalctool-5.8.25-r1.ebuild
new file mode 100644
index 000000000000..d0e8afeff1bb
--- /dev/null
+++ b/gnome-extra/gcalctool/gcalctool-5.8.25-r1.ebuild
@@ -0,0 +1,45 @@
+# 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.8.25-r1.ebuild,v 1.1 2007/02/11 02:08:00 dang Exp $
+
+inherit eutils 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"
+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"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}"/${P}-hex-float.patch
+}
+
+src_install() {
+	gnome2_src_install
+
+	# remove symlink that conflicts with <2.3 gnome-utils
+	rm -f "${D}"/usr/bin/gnome-calculator
+}