Added fix for bug #140987.

Package-Manager: portage-2.1.1_pre3-r4

6 files changed, 122 insertions, 17 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/Manifest b/sci-calculators/hexcalc/Manifest
index 0741d77a5183..886a72cde0f3 100644
--- a/sci-calculators/hexcalc/Manifest
+++ b/sci-calculators/hexcalc/Manifest
@@ -1,22 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3dcdf37dbe57791330df7fc58f12d9d3 ChangeLog 1020
-RMD160 001d9b1591580ee414369c931132524f45d2497f ChangeLog 1020
-SHA256 e92e2679bbefaa5f6abf05c28be26e36195c376cdbad6a031d2390fdd37f3332 ChangeLog 1020
-MD5 b5cbe5cbac74c77b72e4aecd8903e29e files/digest-hexcalc-1.11 57
-RMD160 c6cd8e36042d64f653cdc8b7edd5af56b5611608 files/digest-hexcalc-1.11 57
-SHA256 8147a622455e3b59bc67ed48e1aa7500f3dc71fd8bc59c8537cd41529f71cb73 files/digest-hexcalc-1.11 57
+AUX hexcalc-order.diff 981 RMD160 b82020792a97c20c510245e70f9244c1ef3baea7 SHA1 7f35ac69aa73a68dc9df601bc3c650ff899f661c SHA256 c53b4f5a74d63612b3682223eaf966e3ab247a98a51ee329ffbd30ea0f265ed9
+MD5 0e3116f49abf3fc0b9ac0a89fb437876 files/hexcalc-order.diff 981
+RMD160 b82020792a97c20c510245e70f9244c1ef3baea7 files/hexcalc-order.diff 981
+SHA256 c53b4f5a74d63612b3682223eaf966e3ab247a98a51ee329ffbd30ea0f265ed9 files/hexcalc-order.diff 981
+DIST hexcalc.tar.Z 18033 RMD160 8a31ed80478e79995d76d8e64a9671fc84ad161c SHA1 7212f58cea26252db6b9233b3931a0474874465c SHA256 726dae5803538cdae658e6b8b9184ec34f23af7fdfdc4412fecae040d66c5480
+EBUILD hexcalc-1.11-r1.ebuild 777 RMD160 167351d829773eede9e29706a07d0608b26e69eb SHA1 1bf9240d442c50beeff78aecfaf7eaf6ac0ca8e2 SHA256 130d33720a673f1171c99dacd0065862855e198416712aae33c83bf0f188f1e4
+MD5 fa28fba54d4355052bca89b3d033d8f1 hexcalc-1.11-r1.ebuild 777
+RMD160 167351d829773eede9e29706a07d0608b26e69eb hexcalc-1.11-r1.ebuild 777
+SHA256 130d33720a673f1171c99dacd0065862855e198416712aae33c83bf0f188f1e4 hexcalc-1.11-r1.ebuild 777
+EBUILD hexcalc-1.11.ebuild 678 RMD160 9bbffa20254ed36f685900444c5e23f15b555dec SHA1 cf81bf52c6dca89d713d55dfe7efd7b6a2de3e65 SHA256 f019d0b46c4224f9749347942c78793c3e03eb39395c49b00af5e3d4ec3dcb0c
 MD5 59696e8d4a910033fa48ae22b7205536 hexcalc-1.11.ebuild 678
 RMD160 9bbffa20254ed36f685900444c5e23f15b555dec hexcalc-1.11.ebuild 678
 SHA256 f019d0b46c4224f9749347942c78793c3e03eb39395c49b00af5e3d4ec3dcb0c hexcalc-1.11.ebuild 678
+MISC ChangeLog 1184 RMD160 043dad2491b041e9fffa861590bf82b38bb577bd SHA1 72846b34cc2399091146180ac7e6337e5a422fa4 SHA256 1e80d83784135b02c17ea9fc5ad8b93629171f84a8738f3ad1ab7c1d1ddc01b0
+MD5 0ed187d85fbaea4a90a2a773517f0fb6 ChangeLog 1184
+RMD160 043dad2491b041e9fffa861590bf82b38bb577bd ChangeLog 1184
+SHA256 1e80d83784135b02c17ea9fc5ad8b93629171f84a8738f3ad1ab7c1d1ddc01b0 ChangeLog 1184
+MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD4tWhcsIHjyDViGQRAnmEAKCbPJWcXBlIYZ1+3OEtHIkOzCIijQCgteqB
-AHQqw0+FFSlpQY/GH5qJdLo=
-=SAEi
------END PGP SIGNATURE-----
+MD5 1ae9abb34237f3041703047a5883e9b0 files/digest-hexcalc-1.11 217
+RMD160 3bc07c2381f37ad7c81925ed329a349f85f26ba5 files/digest-hexcalc-1.11 217
+SHA256 0e58654f3401a8ba369518f6b91167d6828bb2ba9f84b0aab5c7216c23925377 files/digest-hexcalc-1.11 217
+MD5 1ae9abb34237f3041703047a5883e9b0 files/digest-hexcalc-1.11-r1 217
+RMD160 3bc07c2381f37ad7c81925ed329a349f85f26ba5 files/digest-hexcalc-1.11-r1 217
+SHA256 0e58654f3401a8ba369518f6b91167d6828bb2ba9f84b0aab5c7216c23925377 files/digest-hexcalc-1.11-r1 217
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
+}