Add patch to fix compilation with gcc-4.1 by Ryan Hill <dirtyepic DOT sk AT gmail DOT com>; bug #126556

Package-Manager: portage-2.1_pre7-r5

4 files changed, 64 insertions, 13 deletions

diff --git a/net-p2p/dctc/ChangeLog b/net-p2p/dctc/ChangeLog
index 7520dad67007..605b3d6ac235 100644
--- a/net-p2p/dctc/ChangeLog
+++ b/net-p2p/dctc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/dctc
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/ChangeLog,v 1.29 2004/11/06 16:50:41 squinky86 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/ChangeLog,v 1.30 2006/04/14 05:38:46 halcy0n Exp $
+
+  14 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/dctc-0.85.9-gcc41.patch, dctc-0.85.9.ebuild:
+  Add patch to fix compilation with gcc-4.1 by Ryan Hill <dirtyepic DOT sk AT
+  gmail DOT com>; bug #126556
 
   06 Nov 2004; Jon Hood <squinky86@gentoo.org> dctc-0.85.9.ebuild:
   Fix homepage irt #70088, thanks Daniel Armyr <daniel.armyr@home.se>.
diff --git a/net-p2p/dctc/Manifest b/net-p2p/dctc/Manifest
index 0b1c84ad5b95..b3421cf78930 100644
--- a/net-p2p/dctc/Manifest
+++ b/net-p2p/dctc/Manifest
@@ -1,15 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 aeee845792bbc538cbe4508363e6b05b ChangeLog 4141
-MD5 7d5ff3899e99a7c56d5ec92f37c6fbfa dctc-0.85.9.ebuild 1019
+MD5 bd74f4bd505af36a31163a8fac438528 ChangeLog 4350
+RMD160 06a8054e11c06873d2050e131163d18610ee060a ChangeLog 4350
+SHA256 43b992aa637f96fafa7d8009495b695393ad583c75f1b9c74d36d359ea745cc3 ChangeLog 4350
+MD5 31771f4bf659bc23b533e66288c34241 dctc-0.85.9.ebuild 1091
+RMD160 c88489418a44a6b7c995d78cedb5d9084f34af86 dctc-0.85.9.ebuild 1091
+SHA256 3ef29aaa3c95b78023b59c258a1856308023c95d33119189ab4427424fae2ffe dctc-0.85.9.ebuild 1091
 MD5 a9a75b4c6fc9a0acbd7f829bcc9ff807 files/dctc-0.85.6-passive.patch 1090
+RMD160 a08f6ed7570ed6e0cfe554b03d20dd92ff2eee5c files/dctc-0.85.6-passive.patch 1090
+SHA256 b8ac42672e3286bb6e3ffdbd300884acc64f93ed2ff80c2359a26ebf0e0ccc9e files/dctc-0.85.6-passive.patch 1090
+MD5 6956e270bdb8da1eedcce9abc4252e7f files/dctc-0.85.9-gcc41.patch 1395
+RMD160 03c9557e16dcb268e3c47f267c84e96000518fad files/dctc-0.85.9-gcc41.patch 1395
+SHA256 b0ccf2e044c1679d7bbbc24d1e48141c6fe814bf055cb5a77f0b20ed19ab1951 files/dctc-0.85.9-gcc41.patch 1395
 MD5 55a4f13a20fa8dacae106d42ec1f8f8c files/digest-dctc-0.85.9 63
+RMD160 bdcf6a6346358c54b456fc2bbb57853aa22141cf files/digest-dctc-0.85.9 63
+SHA256 8a185a9b28688c9e6673504552f40e38ca75cdfb7d11f023a4a009cc2f5d0432 files/digest-dctc-0.85.9 63
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
+SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFC0X6EI1lqEGTUzyQRAt1fAJsGqGOcWAplP7dTZ6uf29siQAG6aQCcD7T2
-9xCVerLskM3vo80qK9l90hg=
-=uLJy
+iD8DBQFEPzVwCRZPokWLroQRAkmUAKDYAc5KnEGB09sVzRl1siZAo7PNDQCgpEKk
+WQe8fpcWW4j+MYLrJpMu9rY=
+=nlA+
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/dctc/dctc-0.85.9.ebuild b/net-p2p/dctc/dctc-0.85.9.ebuild
index a1e2dcfbc927..e30b81ca1a26 100644
--- a/net-p2p/dctc/dctc-0.85.9.ebuild
+++ b/net-p2p/dctc/dctc-0.85.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.9.ebuild,v 1.12 2005/07/10 20:00:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/dctc/dctc-0.85.9.ebuild,v 1.13 2006/04/14 05:38:46 halcy0n Exp $
 
-inherit eutils
+inherit eutils autotools
 
 IUSE=""
 
@@ -21,13 +21,17 @@ DEPEND="=dev-libs/glib-2*
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	epatch "${FILESDIR}"/dctc-0.85.6-passive.patch
+	epatch "${FILESDIR}"/dctc-0.85.9-gcc41.patch
+
+	eautoreconf
+
 	# fix for #26708 (db4 support)
 	local dbfunc="`grep '^#define.*db_env_create' /usr/include/db.h | awk '{print $NF}'`"
 	if [ "${dbfunc}" != "db_env_create" ] ; then
 		sed -i "s:db_env_create:${dbfunc}:g" configure
 	fi
-
-	epatch ${FILESDIR}/dctc-0.85.6-passive.patch
 }
 
 src_install() {
diff --git a/net-p2p/dctc/files/dctc-0.85.9-gcc41.patch b/net-p2p/dctc/files/dctc-0.85.9-gcc41.patch
new file mode 100644
index 000000000000..a8713fdcb5f8
--- /dev/null
+++ b/net-p2p/dctc/files/dctc-0.85.9-gcc41.patch
@@ -0,0 +1,29 @@
+diff -Naur dctc-0.85.9-orig/configure.in dctc-0.85.9/configure.in
+--- dctc-0.85.9-orig/configure.in	2006-03-18 14:46:18.000000000 -0600
++++ dctc-0.85.9/configure.in	2006-03-18 14:46:46.000000000 -0600
+@@ -29,7 +29,7 @@
+ 			AC_MSG_RESULT($cc_version, bad)
+ 			bad_cc="yes"
+ 			;;
+-		2.95.*|3.*)
++		2.95.*|3.*|4.*)
+ 			AC_MSG_RESULT($cc_version, ok)
+ 			bad_cc="no"
+ 			;;
+diff -Naur dctc-0.85.9-orig/src/user_manage.h dctc-0.85.9/src/user_manage.h
+--- dctc-0.85.9-orig/src/user_manage.h	2006-03-18 14:46:18.000000000 -0600
++++ dctc-0.85.9/src/user_manage.h	2006-03-18 14:48:09.000000000 -0600
+@@ -27,11 +27,11 @@
+ extern GPtrArray *hub_user_list;    /* list of all users connected to the hub */
+ extern GPtrArray *hub_op_list;      /* list of all ops connected to the hub (ops are also in the user_list) */
+ 
+-extern GPtrArray *hub_user_xtra_info;			/* array of extra data stored for each hub user */
++static GPtrArray *hub_user_xtra_info;			/* array of extra data stored for each hub user */
+                                     /* the nth pointer of this array is for the nth user of the hub_user_list */
+ 												/* a user having no extra info has a null pointer as extra info */
+ 
+-extern GPtrArray *hub_user_uinfo;     /* it is the result of /UINFO command for each user */
++static GPtrArray *hub_user_uinfo;     /* it is the result of /UINFO command for each user */
+ 
+ typedef enum
+ {