summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-04-23 14:19:41 +0000
committerJustin Lecher <jlec@gentoo.org>2010-04-23 14:19:41 +0000
commit1adb65d3ef38fd9aadb1cf6237bdd75386675e78 (patch)
tree35baa3cd5b4b4a9e878567b5a215ea93375a6a5b /sci-chemistry
parentMigrate to EAPI3, add keywords/patch as testing in the prefix overlay (diff)
downloadhistorical-1adb65d3ef38fd9aadb1cf6237bdd75386675e78.tar.gz
historical-1adb65d3ef38fd9aadb1cf6237bdd75386675e78.tar.bz2
historical-1adb65d3ef38fd9aadb1cf6237bdd75386675e78.zip
fix instance of cast from pointer to integer of different size, stolen from fink
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/molmol/ChangeLog7
-rw-r--r--sci-chemistry/molmol/Manifest11
-rw-r--r--sci-chemistry/molmol/files/cast.patch13
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2-r2.ebuild4
4 files changed, 28 insertions, 7 deletions
diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index 457597cafeb4..077529eca7a7 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-chemistry/molmol
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.19 2010/03/30 19:55:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.20 2010/04/23 14:19:41 jlec Exp $
+
+ 23 Apr 2010; Justin Lecher <jlec@gentoo.org> molmol-2k_p2-r2.ebuild,
+ +files/cast.patch:
+ fix instance of cast from pointer to integer of different size, stolen
+ from fink
*molmol-2k_p2-r2 (30 Mar 2010)
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index d2b2ba60bcc8..33e59553bac9 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,20 +1,21 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX cast.patch 411 RMD160 7e0116c023a036f525224f3c8279604ece264b3e SHA1 28045ffc4a997d11ca613e732c30c4c179f82d85 SHA256 7e41c78a6625e229828c5f84dd726a04cdc12aea4d674c506a6dd3c4c22b99ec
AUX ldflags.patch 435 RMD160 17c6cfc1539c0d774531c950d82f1fb28f366aea SHA1 e9e736664e773b32f2ae861f65fc0670d3625998 SHA256 cbae8934e2be43ceac0f541ed14e843ed76baf86219e0f669eab0af6d5714c64
AUX pjf_RH9_molmol2k2.diff 3138 RMD160 1792aa433a21c2f64880b244d11b6bbd2552c95b SHA1 e654f3105d496538af42a8282f1d55c272ff3d4d SHA256 5b7c3ede5714b123824cc0b8533f679d22d1c5219bf88e8d6a4cebe8e245aeb9
AUX prefix.patch 513 RMD160 23239041256a23c6223daab56e1aa59b5e911afa SHA1 5f3707fec532b15579020b5f21112d3fa2d41924 SHA256 efcb5d3fa7258cf88f02b63d1df3100eb0b73848c0ebabb59c84cb9ea082d8e7
DIST molmol-2k.2.0-doc.tar.gz 1062297 RMD160 08b3e21ab6eb7c9044e59373334181ff91ca8a53 SHA1 b47551283fa19f57f4d5edcbd52f725055d80b7f SHA256 07e1c3fd04ffe7c9e9d91eaefa0bf72e6d0913a981eec3bf0879bfc65537a6be
DIST molmol-2k.2.0-src.tar.gz 1088805 RMD160 b1de89953631dd9b11928751d7853cb511bf45f0 SHA1 09482a1dea601563ca64e773dc0ec47019e22c63 SHA256 1104dcb1b2517581c7d6b1695ff2e92f4076ad34afc48dd896eec38e5acf2287
EBUILD molmol-2k_p2-r1.ebuild 1909 RMD160 9dd6b12cce618759517e7dedd43839534961b475 SHA1 1d3fb5372f52b191144eb08f31385188cc10df9b SHA256 15cf929c2d200c0fff5b8163b51dc85a1e8f01380c9cf1b23d1e6354af624d9b
-EBUILD molmol-2k_p2-r2.ebuild 2053 RMD160 0bbd282f0a53c27a015793dfebf323c81d1bddd2 SHA1 2fe41689ac5ca8d55900d446d2bf10bf98437cf0 SHA256 3e91f513df391e5588ef9d7cc82389758610f1ea1b1f27de33db6824f1b55222
+EBUILD molmol-2k_p2-r2.ebuild 2087 RMD160 24cdc1ba927961e1910873714323f363e5042b70 SHA1 28ff34c801218d54057c3b8339dae4c83fbf33d3 SHA256 eb21ed27e6f006460a8cbd9384a778a7c2b85a78c0a1677cbf34622154eeda0f
EBUILD molmol-2k_p2.ebuild 1866 RMD160 db4e7aee4a4877160716fd2563d3c9e2f5a96a1a SHA1 d303302cd6c9dfd87cafb9b32ad1d7bd6a48a31c SHA256 9fe0415aed3b93c6548b896fb96a8e77e8e97d29d8e71db57976729dc8c535e6
-MISC ChangeLog 2702 RMD160 8c0cd9ec09518f1a36e276ba0daa271d59264d8c SHA1 bdd52812ec7acfa1af31b4d3ac60c19e99e2ce72 SHA256 2be753a09811c02c8eee9125bd3e485cb5c73b8374326df59e24f49d214da92e
+MISC ChangeLog 2880 RMD160 9b4ac9164ec3ba3bbea6e63f6ec6d0b7d8dc7072 SHA1 de37f24840505d75210f461ed8714dc7829ee62f SHA256 5744b248fdac407495e702862c358a10cbef02a6011e85a0caea4f00b6fdd171
MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkuyVzkACgkQgAnW8HDreRbOmACfZ+XJ9Knn/irnlClgePIq2Fn0
-FOwAoKipip2pCbZXvh2DP8m7N4qMQvJb
-=ju59
+iEYEARECAAYFAkvRrIMACgkQgAnW8HDreRZRZwCgnopH7d/99GrOGfd3ZKX4EX43
+CEYAnRhNqq0gAjkbs18u3QGcGFpd1jth
+=Pjui
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/molmol/files/cast.patch b/sci-chemistry/molmol/files/cast.patch
new file mode 100644
index 000000000000..643b92d2a4cf
--- /dev/null
+++ b/sci-chemistry/molmol/files/cast.patch
@@ -0,0 +1,13 @@
+diff --git a/src/data/DataDist.c b/src/data/DataDist.c
+index 7f7121f..d303e9e 100644
+--- a/src/data/DataDist.c
++++ b/src/data/DataDist.c
+@@ -89,7 +89,7 @@ hashInter(void *p, unsigned size)
+ {
+ TabEntryInter *entryP = p;
+
+- return ((unsigned) entryP->atom1P + (unsigned) entryP->atom2P) % size;
++ return ((unsigned)(uintptr_t) entryP->atom1P + (unsigned)(uintptr_t) entryP->atom2P) % size;
+ }
+
+ static int
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
index 5e6d3ba2cae3..3278d5632256 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r2.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/molmol/molmol-2k_p2-r2.ebuild,v 1.1 2010/03/30 19:55:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild,v 1.2 2010/04/23 14:19:41 jlec Exp $
EAPI="3"
@@ -59,6 +59,8 @@ src_prepare() {
-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-e "s:^CC.*:CC = $(tc-getCC):" \
"${S}"/makedef
+
+ epatch "${FILESDIR}"/cast.patch
}
src_compile() {