You should not use with helpers; More fixes for 64bit

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

4 files changed, 49 insertions, 13 deletions

diff --git a/sci-chemistry/azara/ChangeLog b/sci-chemistry/azara/ChangeLog
index 67d19b793764..da4dba5baef1 100644
--- a/sci-chemistry/azara/ChangeLog
+++ b/sci-chemistry/azara/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/azara
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/ChangeLog,v 1.7 2010/12/12 18:14:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/ChangeLog,v 1.8 2010/12/13 07:10:24 jlec Exp $
+
+*azara-2.8-r4 (13 Dec 2010)
+
+  13 Dec 2010; Justin Lecher <jlec@gentoo.org> -azara-2.8-r3.ebuild,
+  +azara-2.8-r4.ebuild, files/2.8-64bit.patch:
+  You should not use with helpers; More fixes for 64bit
 
 *azara-2.8-r3 (12 Dec 2010)
 
diff --git a/sci-chemistry/azara/Manifest b/sci-chemistry/azara/Manifest
index 7f61db3c0d52..88ad81097016 100644
--- a/sci-chemistry/azara/Manifest
+++ b/sci-chemistry/azara/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2.8-64bit.patch 2117 RMD160 f19603155be6869dafebade09cde92f42311fb34 SHA1 39526d868a6a2e027b511c50fdef7032fe88a1b6 SHA256 3fcf843307f3f594d01519a086ee2ccc571b0abee954cfc5b5a7bc35d3c862ff
+AUX 2.8-64bit.patch 2919 RMD160 97cf192f9270a56c2c7dd2cca5bba1f4d7a519ad SHA1 f28884f3ca8c694e1687c60f104f8527779d6ff3 SHA256 857d4200ab3f59c535e620a577788995dec5aa889cdf73582d6bee374a9df50d
 AUX 2.8-impl-dec.patch 5172 RMD160 c2edc07cacc737044cb3f2c839a5cfac7a602476 SHA1 d7c3d1acd23d66b0e34e4375a8d460c80de019ab SHA256 a99cd51a1cdbc010760bb35ffc5f74c0f70ce10c874e4392f0e1dffc5559b410
 AUX 2.8-prll.patch 8764 RMD160 d1c212fdc07d4babc2bc046e6a3be09adc993615 SHA1 619ca46fe79e490a798935cb47db08930a4a423b SHA256 79a8efb86f1a8162c943a02dae2ba49688648dac07525aec3516fe619e4937ba
 AUX 2.8-python.patch 962 RMD160 f8b2ef61a64dd1b5742db0ee6e7982bfbc64449a SHA1 c542811b02bb6e46a15c469f31ffc1c41ad69b73 SHA256 74c04c60763f3dc0286fea59f8fe96aa5d83258fab6f9447f91b8ebf4eaac16e
 DIST azara-2.8-src.tgz 638120 RMD160 4abf47088694e2f4f2822ec2666cac6ced47f1e2 SHA1 f1ef1d06b836b68c1d8d47f2e069c161f22355d9 SHA256 1f9b86d368ca3b4818c88490c40b2055c7a6d1732e746e4c117e045a73269a98
-EBUILD azara-2.8-r3.ebuild 2255 RMD160 f81c01ee77520acf77140c31eb1a52d2f0b662d7 SHA1 1a94eea79f5562274933505cd008dfeec7f1eb7b SHA256 911bf4082695c55d01b39fb97e97241e502939bcbc9648decfe6bb8084e60e11
-MISC ChangeLog 1711 RMD160 6f97d8acbe3e2a38eae6c98b38924b04b0588e10 SHA1 21fff9ac07e118e5076777fa25a71fdd950f4bb0 SHA256 e73324589244566e1ce6a7dfa46390d521a2febc97418c96b94a31fbcb3b82ad
+EBUILD azara-2.8-r4.ebuild 2242 RMD160 963c983e8f32132dfa3029d21e27831d850ff3c7 SHA1 04db9dee65fec606569115dc8ca87828f03fc533 SHA256 af8017fa871ce7a69b3a4035f8805d1a0bd69baceb5cbb574068bba1e4cfcd48
+MISC ChangeLog 1913 RMD160 a30763df268f1f6ff9865a546d540915939747f3 SHA1 9908b9271b1619e2e5595d040a77b682daa6db89 SHA256 b73fd70bea753a2c9e40cc9b98db234b038cdb37c0a9782a41198244f615cf5e
 MISC metadata.xml 266 RMD160 c4ea712c395727d72dcc61aad6b907800ce85df1 SHA1 ce0c21096152fff128b3f40131f8807e60f31163 SHA256 6e5273c55b0d4eab8e747f62c5a527b4e5021594f134546c8355d10d3f99c8ad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0FERsACgkQgAnW8HDreRYQkACfX06Yr0ra8YXuklnkE9kBLNou
-okcAoLwTRc1LcWbGm78qR+xrKRqqJn6f
-=KxnZ
+iEYEARECAAYFAk0FxuUACgkQgAnW8HDreRa/jACeO+KgKQrXtN2MdI6rGfrW0gu+
+c7MAniTLLOVa8BwfeCakF2D52ATgaZ0U
+=TPvC
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/azara/azara-2.8-r3.ebuild b/sci-chemistry/azara/azara-2.8-r4.ebuild
index 82625a2822a8..1ef5fdbdfcdd 100644
--- a/sci-chemistry/azara/azara-2.8-r3.ebuild
+++ b/sci-chemistry/azara/azara-2.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/azara-2.8-r3.ebuild,v 1.1 2010/12/12 18:14:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/azara-2.8-r4.ebuild,v 1.1 2010/12/13 07:10:24 jlec Exp $
 
 EAPI="3"
 
@@ -79,7 +79,7 @@ src_install() {
 	dohtml -r html/* || die
 
 	installation() {
-		insinto "${EPREFIX}/$(python_get_sitedir)"
+		insinto $(python_get_sitedir)
 		doins lib/DataRows.so || die
 	}
 	use python && python_execute_function installation
diff --git a/sci-chemistry/azara/files/2.8-64bit.patch b/sci-chemistry/azara/files/2.8-64bit.patch
index a2f804c41498..c65e075c1d30 100644
--- a/sci-chemistry/azara/files/2.8-64bit.patch
+++ b/sci-chemistry/azara/files/2.8-64bit.patch
@@ -1,5 +1,5 @@
 diff --git a/global/par.c b/global/par.c
-index ac87c88..1d171de 100644
+index ac87c88..fecfe35 100644
 --- a/global/par.c
 +++ b/global/par.c
 @@ -562,9 +562,9 @@ static Status get_varian_header(FILE *fp, String error_msg)
@@ -32,7 +32,7 @@ index ac87c88..1d171de 100644
      short status;
      FILE *fp;
  
-@@ -605,12 +605,14 @@ static Status check_varian_header(String error_msg)
+@@ -605,17 +605,19 @@ static Status check_varian_header(String error_msg)
      FCLOSE(fp);
  
      /* numbers in parentheses are offsets into header */
@@ -43,9 +43,9 @@ index ac87c88..1d171de 100644
 -    tbytes = get_varian_long(16);   /* number of bytes per trace */
 -    /*bbytes = get_varian_long(20);*/   /* number of bytes per block */
 +    nblocks = get_varian_int(0);   /* number of blocks in file */
-+    printf("nblocks = %ld\n", nblocks);
++    printf("nblocks = %d\n", nblocks);
 +    ntraces = get_varian_int(4);   /* number of traces per block */
-+    printf("ntraces = %ld\n", ntraces);
++    printf("ntraces = %d\n", ntraces);
 +    np = get_varian_int(8);	    /* number of elements per trace */
 +    ebytes = get_varian_int(12);   /* number of bytes per element */
 +    tbytes = get_varian_int(16);   /* number of bytes per trace */
@@ -53,3 +53,33 @@ index ac87c88..1d171de 100644
  	    /* short starting at 24 is software version */
      status = get_varian_short(26);  /* status of whole file */
  	    /* long starting at 28 is number of block headers */
+ 
+-    if (ntraces != 1L)
++    if (ntraces != 1)
+ 	RETURN_ERROR_MSG("can only process Varian data with #traces = 1");
+ 
+     if (np != npoints[0])
+@@ -646,12 +648,12 @@ static Status check_varian_header(String error_msg)
+ 
+     if (integer)
+     {
+-	if (ebytes == 2L)
++	if (ebytes == 2)
+ 	{
+ 	    if (status & (1<<2))
+ 		RETURN_ERROR_MSG("Varian header has inconsistent byte information");
+ 	}
+-	else if (ebytes == 4L)
++	else if (ebytes == 4)
+ 	{
+ 	    if (!(status & (1<<2)))
+ 		RETURN_ERROR_MSG("Varian header has inconsistent byte information");
+@@ -666,7 +668,7 @@ static Status check_varian_header(String error_msg)
+     }
+     else /* !integer, i.e. floating point */
+     {
+-	if (ebytes != 4L)
++	if (ebytes != 4)
+ 	    RETURN_ERROR_MSG("Varian header has inconsistent byte information");
+     }
+