Fix implicit declarations

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

4 files changed, 155 insertions, 7 deletions

diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index 81d7587974c9..49110289bd88 100644
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/ccp4-libs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.21 2011/01/10 21:16:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.22 2011/01/11 09:06:08 jlec Exp $
+
+  11 Jan 2011; Justin Lecher <jlec@gentoo.org> +files/6.1.3-impl-dec.patch,
+  ccp4-libs-6.1.3-r7.ebuild:
+  Fix implicit declarations
 
 *ccp4-libs-6.1.3-r7 (10 Jan 2011)
 
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index 8ce5274ef6d9..538c065dc9d6 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -6,19 +6,20 @@ AUX 6.1.3-ccif-shared.patch 1668 RMD160 803687b13dbe93aaeed8264a73dfe7303b5fcdfb
 AUX 6.1.3-dont-build-mmdb.patch 749 RMD160 2f4b04d07095d464f00522a935cb93c2dae40f4c SHA1 5b82f59ce190cb82601b7af55083b1a5689c9ae0 SHA256 cf73ff7c361ba7ed3e3084a4c298a1e45307a8b0ac7e2704628f3e0f345a9bde
 AUX 6.1.3-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
 AUX 6.1.3-glibc2.10.patch 1018 RMD160 577ee4a6174df36bb8bac82738523f5c757df4b9 SHA1 48ad6d0d024c43d64277e4decba420d51e75a510 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532
+AUX 6.1.3-impl-dec.patch 3957 RMD160 dbf3f5fd553a2f409a90affafa089574631155c8 SHA1 7192678802f339951cbc9ba2d61627f91ce58d69 SHA256 29b68e7ced2160ef880b03b9e7488e0d4ccf1717c5b87b582ab32f1a3eff6bce
 AUX 6.1.3-link-proberly.patch 8282 RMD160 c45d3d1931e6a083c0c96b819aff3f67873659b8 SHA1 b1be6f1f7162616a60f3e12fe02dbe4dd426e990 SHA256 f6623dfb0d270e5fbffe03f95b23c967ec8da34b3d0a1c5262941979a965f9ea
 AUX 6.1.3-noinstall.patch 5188 RMD160 d3b22f11d7c27b37243b003f03615af377c8e632 SHA1 d75402e7b23d3aa15e67cda6cec8c93864d509c2 SHA256 22d96aea9d3d5e6e090713e610b35bdb34eaff9157c41687b47294f0d62ccff7
 AUX 6.1.3-overflows.patch 904 RMD160 03d5f10e901734c6e21be3e68592711450df32cd SHA1 24a740658fae2f917061c2a032a43a60e75c5478 SHA256 e5c62922daf832b62e9ea1e14a2be0d54c88b035b78b5831eee07025dff9222a
 AUX 6.1.3-unbundle-libs.patch 9063 RMD160 326af0e6990134546fb2607dae707b94d4588149 SHA1 ef929532e45c12fb168e5fca4eb7fa8c857c376a SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
 EBUILD ccp4-libs-6.1.3-r5.ebuild 6735 RMD160 4c4e471799ae22091cb091011410afe05bb92261 SHA1 bd67d482656f2cbb0af005c3c4a02c48aa270e1f SHA256 7e16439607d588f533e4dde13cee62083e021f41beb7895b0fbfec9f68517959
-EBUILD ccp4-libs-6.1.3-r7.ebuild 10496 RMD160 599a460ba927c489373f1fd8ec0f92c9f514542e SHA1 81c60263fbcb2be70d696d61e0d382e8e63ffbd9 SHA256 949fd2bbef711cc60a0e66f4fdd2468bf7f929dbdae742a79e5289d24705af15
-MISC ChangeLog 3455 RMD160 52e2758b9ba63d957714ab0ecb18e62de77638b5 SHA1 03888e86d1e2e3aaa14acfda2499763afd4ace43 SHA256 7adb50d1ea8aa6b4729972403e86d1b6107ad88a16fc8b7d4334675e38deaf6c
+EBUILD ccp4-libs-6.1.3-r7.ebuild 10565 RMD160 62b495f73fa141ccfe35941d4656abcf0c6c68cd SHA1 0601ea617513560168f60f45f1266c3f9035516f SHA256 e228c3ca9f1ae66bedf47d094cdbc60893f1f2b7613a6f4c563e0b13bc481835
+MISC ChangeLog 3589 RMD160 5facf78980fce25d069a352a258e2f5339f9def7 SHA1 f75d6197cfb2be822ea3099e9a344e635204d9a8 SHA256 6b51b633779e238d7356c024e64501b20b3c2c9e544cfabb9f5ff35edeed1291
 MISC metadata.xml 306 RMD160 57ba72f54388a666851bda87e52d313d618084e3 SHA1 7d2f57cb3f35eb6d4567b211e01251b5945d4eb2 SHA256 af351be5ead71b377b6fa2fa118fb9aee74129afdc19f736b41596d3033106aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0rdxYACgkQgAnW8HDreRatuACgzE/p4RCj/oI6wqbQdsyFRqQh
-p4cAmwT/sXieaXCgNK7huwAP5BcfzvAw
-=5kwG
+iEYEARECAAYFAk0sHUwACgkQgAnW8HDreRbOGACgx8pOpuXp8SRt+KDcbSS8Y9ac
+tdgAoLFZ+aU4JG7+7b6B4h62Inb8LixX
+=b7Oz
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild
index 79712a4f1d78..57ae2726fbff 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild,v 1.1 2011/01/10 21:16:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r7.ebuild,v 1.2 2011/01/11 09:06:08 jlec Exp $
 
 EAPI="3"
 
@@ -100,6 +100,9 @@ src_prepare() {
 		-e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
 		-i configure || die
 
+	# Fix upstreams code
+	ccp_patch "${FILESDIR}"/${PV}-impl-dec.patch
+
 	einfo "Done." # done applying Gentoo patches
 	echo
 
diff --git a/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch b/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch
new file mode 100644
index 000000000000..8bfa7db8cbff
--- /dev/null
+++ b/sci-libs/ccp4-libs/files/6.1.3-impl-dec.patch
@@ -0,0 +1,140 @@
+diff --git a/lib/DiffractionImage/Bruker/FRM_LIB.c b/lib/DiffractionImage/Bruker/FRM_LIB.c
+index bfda882..f821e04 100755
+--- a/lib/DiffractionImage/Bruker/FRM_LIB.c
++++ b/lib/DiffractionImage/Bruker/FRM_LIB.c
+@@ -38,6 +38,8 @@ FRM_LIB: Routines for reading, writing, and handling frame files.
+ #include "sys/types.h"  /* _open, etc. */
+ #include "sys/stat.h"   /* _open, etc. */
+ 
++#include <unistd.h>
++
+ #ifndef _MSC_VER
+ int min(int a, int b)
+ 	{
+diff --git a/lib/DiffractionImage/MAR/mar300_header.c b/lib/DiffractionImage/MAR/mar300_header.c
+index 1a933de..1c40c32 100755
+--- a/lib/DiffractionImage/MAR/mar300_header.c
++++ b/lib/DiffractionImage/MAR/mar300_header.c
+@@ -23,6 +23,9 @@
+  */
+ #include "mar300_header.h"
+ 
++#include <sys/types.h>
++#include <unistd.h>
++
+ /*
+  * Local functions
+  */
+diff --git a/lib/DiffractionImage/MAR/mar345_header.c b/lib/DiffractionImage/MAR/mar345_header.c
+index a8351ea..16d0f7b 100755
+--- a/lib/DiffractionImage/MAR/mar345_header.c
++++ b/lib/DiffractionImage/MAR/mar345_header.c
+@@ -32,6 +32,9 @@
+  */
+ #include "mar345_header.h"
+ 
++#include <sys/types.h>
++#include <unistd.h>
++
+ /*
+  * Definitions
+  */
+diff --git a/lib/DiffractionImage/MAR/nb_header.c b/lib/DiffractionImage/MAR/nb_header.c
+index 07f2741..6364ca4 100755
+--- a/lib/DiffractionImage/MAR/nb_header.c
++++ b/lib/DiffractionImage/MAR/nb_header.c
+@@ -20,6 +20,8 @@
+ #include <io.h>
+ #endif
+ 
++#include <sys/types.h>
++#include <unistd.h>
+ /*
+  * mar software include files
+  */
+diff --git a/lib/DiffractionImage/MAR/swap.c b/lib/DiffractionImage/MAR/swap.c
+index 443bb8c..0d96b3f 100755
+--- a/lib/DiffractionImage/MAR/swap.c
++++ b/lib/DiffractionImage/MAR/swap.c
+@@ -10,6 +10,9 @@
+  *
+  **********************************************************************/
+ 
++#define _XOPEN_SOURCE
++#include <unistd.h>
++
+ void swaplong();
+ void swapshort();
+ 
+diff --git a/lib/ccif/f_interface.c b/lib/ccif/f_interface.c
+index 0f6a6b7..a09dc48 100755
+--- a/lib/ccif/f_interface.c
++++ b/lib/ccif/f_interface.c
+@@ -25,6 +25,7 @@
+ ********************************************************************/
+ 
+ #include "stdpccts.h"
++#include <sys/mman.h>
+ 
+ /* This file is terribly organised, and badly needs re-doing. There is probably
+  * scope for splitting this into three modules:
+diff --git a/lib/src/ccp4_general_f.c b/lib/src/ccp4_general_f.c
+index 8b5d04f..74ee3f7 100755
+--- a/lib/src/ccp4_general_f.c
++++ b/lib/src/ccp4_general_f.c
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <math.h>
++#include <time.h>
+ #include "ccp4_errno.h"
+ #include "ccp4_fortran.h"
+ #include "ccp4_parser.h"
+diff --git a/lib/src/ccp4_program.c b/lib/src/ccp4_program.c
+index 3e83d4d..bb3e975 100755
+--- a/lib/src/ccp4_program.c
++++ b/lib/src/ccp4_program.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include "ccp4_program.h"
+ #include "ccp4_parser.h"
+ #include "ccp4_utils.h"
+diff --git a/lib/src/fsplit.c b/lib/src/fsplit.c
+index ee8af24..c6fb3cd 100755
+--- a/lib/src/fsplit.c
++++ b/lib/src/fsplit.c
+@@ -50,6 +50,7 @@ static char sccsid[] = "@(#)fsplit.c	5.5 (Berkeley) 3/12/91";
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ /*
+  *	usage:		fsplit [-e efile] ... [file]
+diff --git a/src/clipper_progs/src/pirate/compress42.c b/src/clipper_progs/src/pirate/compress42.c
+index ea52e96..30dbd56 100755
+--- a/src/clipper_progs/src/pirate/compress42.c
++++ b/src/clipper_progs/src/pirate/compress42.c
+@@ -142,6 +142,7 @@
+ #include	<sys/types.h>
+ #include	<sys/stat.h>
+ #include	<errno.h>
++#include	<unistd.h>
+ 
+ #ifdef DIRENT
+ #	include	<dirent.h>
+diff --git a/src/mtz2cif_/mtz2cif.c b/src/mtz2cif_/mtz2cif.c
+index e224430..c7b82f4 100755
+--- a/src/mtz2cif_/mtz2cif.c
++++ b/src/mtz2cif_/mtz2cif.c
+@@ -28,6 +28,7 @@
+ #include "cmtzlib.h"
+ #include "ccp4_parser.h"
+ #include "ccp4_general.h"
++#include "ccp4_program.h"
+ #include "csymlib.h"
+ #include "mtz2cif_lib.h"
+