Added fix for bug #140987.

(Portage version: 2.1.1_pre3-r4)

5 files changed, 101 insertions, 1 deletions

diff --git a/sci-calculators/hexcalc/ChangeLog b/sci-calculators/hexcalc/ChangeLog
index 281bd1be28fc..14f79fa71393 100644
--- a/sci-calculators/hexcalc/ChangeLog
+++ b/sci-calculators/hexcalc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-calculators/hexcalc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.6 2006/02/03 04:01:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.7 2006/07/25 18:07:34 josejx Exp $
+
+*hexcalc-1.11-r1 (25 Jul 2006)
+
+  25 Jul 2006; Joseph Jezak <josejx@gentoo.org> +files/hexcalc-order.diff,
+  +hexcalc-1.11-r1.ebuild:
+  Added fix for bug #140987.
 
   03 Feb 2006; Joseph Jezak <josejx@gentoo.org> hexcalc-1.11.ebuild:
   Added missing rman dep for modular X.
diff --git a/sci-calculators/hexcalc/files/digest-hexcalc-1.11 b/sci-calculators/hexcalc/files/digest-hexcalc-1.11
index bbe71cb5cb2e..54ae894e313e 100644
--- a/sci-calculators/hexcalc/files/digest-hexcalc-1.11
+++ b/sci-calculators/hexcalc/files/digest-hexcalc-1.11
@@ -1 +1,3 @@
 MD5 f9342ec1a1f5f1263f33b325e56f78a2 hexcalc.tar.Z 18033
+RMD160 8a31ed80478e79995d76d8e64a9671fc84ad161c hexcalc.tar.Z 18033
+SHA256 726dae5803538cdae658e6b8b9184ec34f23af7fdfdc4412fecae040d66c5480 hexcalc.tar.Z 18033
diff --git a/sci-calculators/hexcalc/files/digest-hexcalc-1.11-r1 b/sci-calculators/hexcalc/files/digest-hexcalc-1.11-r1
new file mode 100644
index 000000000000..54ae894e313e
--- /dev/null
+++ b/sci-calculators/hexcalc/files/digest-hexcalc-1.11-r1
@@ -0,0 +1,3 @@
+MD5 f9342ec1a1f5f1263f33b325e56f78a2 hexcalc.tar.Z 18033
+RMD160 8a31ed80478e79995d76d8e64a9671fc84ad161c hexcalc.tar.Z 18033
+SHA256 726dae5803538cdae658e6b8b9184ec34f23af7fdfdc4412fecae040d66c5480 hexcalc.tar.Z 18033
diff --git a/sci-calculators/hexcalc/files/hexcalc-order.diff b/sci-calculators/hexcalc/files/hexcalc-order.diff
new file mode 100644
index 000000000000..9fdc9e91cdac
--- /dev/null
+++ b/sci-calculators/hexcalc/files/hexcalc-order.diff
@@ -0,0 +1,51 @@
+--- hexcalc.c	1989-11-22 16:29:06.000000000 -0500
++++ /home/jjezak/hexcalc.c	2006-07-18 17:36:40.000000000 -0400
+@@ -37,6 +37,7 @@
+ #endif	
+ 
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	<ctype.h>
+ #include	<X11/IntrinsicP.h>
+ #include	<X11/StringDefs.h>
+@@ -509,14 +508,16 @@
+ 
+ 		switch(topOp) {
+ 		case '+' :
+-			ac = PopArg()  + PopArg();
++			temp = PopArg();
++			ac = PopArg() + temp;
+ 			break;
+ 		case '-' :
+ 			temp = PopArg();
+ 			ac = PopArg() - temp;
+ 			break;
+ 		case '*' :
+-			ac = PopArg()  * PopArg();
++			temp = PopArg();
++			ac = temp * PopArg();
+ 			break;
+ 		case '/' :
+ 			temp = PopArg();
+@@ -528,15 +529,18 @@
+ 			break;
+ 			
+ 		case '|' :
+-			ac = PopArg() | PopArg();
++			temp = PopArg();
++			ac = temp | PopArg();
+ 			break;
+ 
+ 		case '&' :
+-			ac = PopArg() & PopArg();
++			temp = PopArg();
++			ac = temp & PopArg();
+ 			break;
+ 
+ 		case '^' :
+-			ac = PopArg() ^ PopArg();
++			temp = PopArg();
++			ac = temp ^ PopArg();
+ 			break;
+ 
+ 		case '<' :
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r1.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r1.ebuild
new file mode 100644
index 000000000000..a0069a2dcb04
--- /dev/null
+++ b/sci-calculators/hexcalc/hexcalc-1.11-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r1.ebuild,v 1.1 2006/07/25 18:07:34 josejx Exp $
+
+inherit eutils
+
+DESCRIPTION="A simple hex calculator for X"
+HOMEPAGE="ftp://ftp.x.org/R5contrib/"
+SRC_URI="ftp://ftp.x.org/R5contrib/${PN}.tar.Z"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="|| ( x11-libs/libXaw virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-misc/imake app-text/rman ) virtual/x11 )"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-order.diff
+}
+
+src_compile() {
+	xmkmf || die
+	make || die
+}
+
+src_install() {
+
+	dobin hexcalc
+	mv hexcalc.man hexcalc.1
+	doman hexcalc.1
+}