add upstream compile fixes needed for AIX

(Portage version: 2.1.7.17/cvs/Linux x86_64)

8 files changed, 170 insertions, 4 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index c9ab1ed229b2..4eeaa462ada9 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cvs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.139 2010/02/25 08:16:36 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.140 2010/03/11 10:32:40 haubi Exp $
+
+  11 Mar 2010; Michael Haubenwallner <haubi@gentoo.org>
+  cvs-1.11.22.1-r1.ebuild, +files/cvs-1.11.22.1-hash-nameclash.patch,
+  cvs-1.12.12-r7.ebuild, +files/cvs-1.12.12-hash-nameclash.patch,
+  cvs-1.12.13.1.ebuild, +files/cvs-1.12.13.1-gl-mempcpy.patch,
+  +files/cvs-1.12.13.1-hash-nameclash.patch:
+  add upstream compile fixes needed for AIX
 
   25 Feb 2010; Markus Duft <mduft@gentoo.org> cvs-1.11.22.1-r1.ebuild:
   Added necessary build-bits for interix/prefix.
diff --git a/dev-util/cvs/cvs-1.11.22.1-r1.ebuild b/dev-util/cvs/cvs-1.11.22.1-r1.ebuild
index 86dddce4bd52..d7f5db6c475c 100644
--- a/dev-util/cvs/cvs-1.11.22.1-r1.ebuild
+++ b/dev-util/cvs/cvs-1.11.22.1-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.22.1-r1.ebuild,v 1.3 2010/02/25 08:16:36 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.11.22.1-r1.ebuild,v 1.4 2010/03/11 10:32:40 haubi Exp $
 
 EAPI=3
 
+inherit eutils
+
 DESCRIPTION="Concurrent Versions System - source code revision control tools"
 HOMEPAGE="http://www.cvshome.org/"
 SRC_URI="mirror://gnu/non-gnu/cvs/source/nightly-snapshots/stable/${P}.tar.bz2
@@ -25,6 +27,10 @@ src_unpack() {
 	find "${S}" -type f -name getdate -exec rm \{\} \;
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+}
+
 src_configure() {
 	[[ ${CHOST} == *-interix* ]] && export ac_cv_header_inttypes_h=no
 
diff --git a/dev-util/cvs/cvs-1.12.12-r7.ebuild b/dev-util/cvs/cvs-1.12.12-r7.ebuild
index add52a4171b8..02e35f2e0aee 100644
--- a/dev-util/cvs/cvs-1.12.12-r7.ebuild
+++ b/dev-util/cvs/cvs-1.12.12-r7.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/dev-util/cvs/cvs-1.12.12-r7.ebuild,v 1.1 2010/02/21 03:06:44 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r7.ebuild,v 1.2 2010/03/11 10:32:40 haubi Exp $
 
 EAPI=3
 
@@ -35,6 +35,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-block-requests.patch
 	epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
 	epatch "${FILESDIR}"/${P}-install-sh.patch
+	epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
 	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
 }
 
diff --git a/dev-util/cvs/cvs-1.12.13.1.ebuild b/dev-util/cvs/cvs-1.12.13.1.ebuild
index 00644ff6f07a..50777c2e4195 100644
--- a/dev-util/cvs/cvs-1.12.13.1.ebuild
+++ b/dev-util/cvs/cvs-1.12.13.1.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/dev-util/cvs/cvs-1.12.13.1.ebuild,v 1.6 2010/02/21 03:06:44 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13.1.ebuild,v 1.7 2010/03/11 10:32:40 haubi Exp $
 
 EAPI=3
 
@@ -41,6 +41,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
 	epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
 	epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
+	epatch "${FILESDIR}"/${PN}-1.12.13.1-hash-nameclash.patch # for AIX
+	epatch "${FILESDIR}"/${PN}-1.12.13.1-gl-mempcpy.patch # for AIX
 	# Applied by upstream:
 	#epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
 	#epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
diff --git a/dev-util/cvs/files/cvs-1.11.22.1-hash-nameclash.patch b/dev-util/cvs/files/cvs-1.11.22.1-hash-nameclash.patch
new file mode 100644
index 000000000000..e6be37cadf94
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.11.22.1-hash-nameclash.patch
@@ -0,0 +1,41 @@
+http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
+fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
+
+--- src/hash.h.orig	2010-03-10 18:47:20 +0100
++++ src/hash.h	2010-03-10 18:47:40 +0100
+@@ -27,26 +27,26 @@
+ };
+ typedef enum ntype Ntype;
+ 
+-struct node
++struct hashnode
+ {
+     Ntype type;
+-    struct node *next;
+-    struct node *prev;
+-    struct node *hashnext;
+-    struct node *hashprev;
++    struct hashnode *next;
++    struct hashnode *prev;
++    struct hashnode *hashnext;
++    struct hashnode *hashprev;
+     char *key;
+     void *data;
+     void (*delproc) ();
+ };
+-typedef struct node Node;
++typedef struct hashnode Node;
+ 
+-struct list
++struct hashlist
+ {
+     Node *list;
+     Node *hasharray[HASHSIZE];
+-    struct list *next;
++    struct hashlist *next;
+ };
+-typedef struct list List;
++typedef struct hashlist List;
+ 
+ List *getlist PROTO((void));
+ Node *findnode PROTO((List * list, const char *key));
diff --git a/dev-util/cvs/files/cvs-1.12.12-hash-nameclash.patch b/dev-util/cvs/files/cvs-1.12.12-hash-nameclash.patch
new file mode 100644
index 000000000000..0a33eea873ff
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.12-hash-nameclash.patch
@@ -0,0 +1,42 @@
+http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
+fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
+
+--- src/hash.h.orig	2005-02-01 22:56:48 +0100
++++ src/hash.h	2010-03-10 19:00:11 +0100
+@@ -27,26 +27,26 @@
+ };
+ typedef enum ntype Ntype;
+ 
+-struct node
++struct hashnode
+ {
+     Ntype type;
+-    struct node *next;
+-    struct node *prev;
+-    struct node *hashnext;
+-    struct node *hashprev;
++    struct hashnode *next;
++    struct hashnode *prev;
++    struct hashnode *hashnext;
++    struct hashnode *hashprev;
+     char *key;
+     void *data;
+-    void (*delproc) (struct node *);
++    void (*delproc) (struct hashnode *);
+ };
+-typedef struct node Node;
++typedef struct hashnode Node;
+ 
+-struct list
++struct hashlist
+ {
+     Node *list;
+     Node *hasharray[HASHSIZE];
+-    struct list *next;
++    struct hashlist *next;
+ };
+-typedef struct list List;
++typedef struct hashlist List;
+ 
+ List *getlist (void);
+ Node *findnode (List * list, const char *key);
diff --git a/dev-util/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch b/dev-util/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch
new file mode 100644
index 000000000000..7ad7533b0a57
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.13.1-gl-mempcpy.patch
@@ -0,0 +1,24 @@
+http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/lib/mempcpy.c?r1=1.2&r2=1.3&pathrev=MAIN
+fixed in cvs-HEAD after cvs-1.12.13a
+
+--- lib/mempcpy.c	2005/05/23 17:44:31	1.2
++++ lib/mempcpy.c	2007/08/22 12:48:42	1.3
+@@ -1,5 +1,5 @@
+ /* Copy memory area and return pointer after last written byte.
+-   Copyright (C) 2003 Free Software Foundation, Inc.
++   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -15,9 +15,9 @@
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+ 
+-/* Specification.  */
+-#include "mempcpy.h"
++#include <config.h>
+ 
++/* Specification.  */
+ #include <string.h>
+ 
+ /* Copy N bytes of SRC to DEST, return pointer to bytes after the
diff --git a/dev-util/cvs/files/cvs-1.12.13.1-hash-nameclash.patch b/dev-util/cvs/files/cvs-1.12.13.1-hash-nameclash.patch
new file mode 100644
index 000000000000..d9c3358faf46
--- /dev/null
+++ b/dev-util/cvs/files/cvs-1.12.13.1-hash-nameclash.patch
@@ -0,0 +1,43 @@
+http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
+fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
+
+--- src/hash.h.orig	2010-03-11 10:12:19 +0100
++++ src/hash.h	2010-03-11 10:12:40 +0100
+@@ -32,27 +32,27 @@
+ };
+ typedef enum ntype Ntype;
+ 
+-struct node
++struct hashnode
+ {
+     Ntype type;
+-    struct node *next;
+-    struct node *prev;
+-    struct node *hashnext;
+-    struct node *hashprev;
++    struct hashnode *next;
++    struct hashnode *prev;
++    struct hashnode *hashnext;
++    struct hashnode *hashprev;
+     char *key;
+     void *data;
+     size_t len;			/* Length of DATA.  */
+-    void (*delproc) (struct node *);
++    void (*delproc) (struct hashnode *);
+ };
+-typedef struct node Node;
++typedef struct hashnode Node;
+ 
+-struct list
++struct hashlist
+ {
+     Node *list;
+     Node *hasharray[HASHSIZE];
+-    struct list *next;
++    struct hashlist *next;
+ };
+-typedef struct list List;
++typedef struct hashlist List;
+ 
+ List *getlist (void);
+ Node *findnode (List *list, const char *key);