Fix implicit declarations

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

3 files changed, 149 insertions, 2 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/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"
+