Adding amd64 multilib patch wrt bug #105258

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 46 insertions, 14 deletions

diff --git a/net-irc/ircd-hybrid/ChangeLog b/net-irc/ircd-hybrid/ChangeLog
index 630e6cc365c5..bf4e1ae22320 100644
--- a/net-irc/ircd-hybrid/ChangeLog
+++ b/net-irc/ircd-hybrid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/ircd-hybrid
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.19 2006/06/05 19:45:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.20 2006/06/30 14:54:22 jokey Exp $
+
+  30 Jun 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/7.2.1-amd64-multilib.patch, ircd-hybrid-7.2.1.ebuild:
+  Adding amd64 multilib patch wrt bug #105258
 
 *ircd-hybrid-7.2.1 (05 Jun 2006)
 
diff --git a/net-irc/ircd-hybrid/Manifest b/net-irc/ircd-hybrid/Manifest
index dee60de8b914..507393078d14 100644
--- a/net-irc/ircd-hybrid/Manifest
+++ b/net-irc/ircd-hybrid/Manifest
@@ -5,6 +5,10 @@ AUX 7.1.0-default-config.patch 1230 RMD160 a1a878bfc66babf0fd0ebd483068831de6e3c
 MD5 2cc5330c07947c6e3ac113d1e1e8bc6b files/7.1.0-default-config.patch 1230
 RMD160 a1a878bfc66babf0fd0ebd483068831de6e3cdd2 files/7.1.0-default-config.patch 1230
 SHA256 661e766f926eee089a3b003b2c6842f822737ee6697f8f0c710a2222b11307fb files/7.1.0-default-config.patch 1230
+AUX 7.2.1-amd64-multilib.patch 796 RMD160 929ccf25d5f78ab7c311f0c0211056021870ebfb SHA1 f8fd40c82528a3be7b556ff7959052ca5ed9ce9a SHA256 443b67f06df883d008c8e663c841fad70e2f914a4db0f65824f4329f7c924ac0
+MD5 51d78ac96c4dc37992b1a682a2846e7a files/7.2.1-amd64-multilib.patch 796
+RMD160 929ccf25d5f78ab7c311f0c0211056021870ebfb files/7.2.1-amd64-multilib.patch 796
+SHA256 443b67f06df883d008c8e663c841fad70e2f914a4db0f65824f4329f7c924ac0 files/7.2.1-amd64-multilib.patch 796
 AUX 7.2.1-default-config.patch 4085 RMD160 a800997efc5e06f4381a170bf716fc61a67e42f2 SHA1 a49f1f432c6b8dc056c69d78f45e69de3add1170 SHA256 f03aae716c3759be4acb06b68faf7994a52b7e34e626f3b6c60aef274a797082
 MD5 9dcacf1baaf5ac029a47629a8b837899 files/7.2.1-default-config.patch 4085
 RMD160 a800997efc5e06f4381a170bf716fc61a67e42f2 files/7.2.1-default-config.patch 4085
@@ -53,14 +57,14 @@ EBUILD ircd-hybrid-7.1.1.ebuild 3996 RMD160 fa0bd8086ac661002892f2a3710b250c72ad
 MD5 4239b9b0611d04c54373794cb77d8509 ircd-hybrid-7.1.1.ebuild 3996
 RMD160 fa0bd8086ac661002892f2a3710b250c72ad32f6 ircd-hybrid-7.1.1.ebuild 3996
 SHA256 2b8feaddd6c6dc1218c1a79d055bc30c2e10dcc12e9c30d8161d0fd8cdd33936 ircd-hybrid-7.1.1.ebuild 3996
-EBUILD ircd-hybrid-7.2.1.ebuild 4281 RMD160 517ab4171cd1d1f2ed1888b8c7f090d6e527de57 SHA1 9206172082d6bb6218092d43639d1a4ab31a19d8 SHA256 27c57d761263f4f755db117217f9ca187c31964629597b9f31af63037280ccbe
-MD5 b6539f96ffae86f9a18ff79bdee3cac7 ircd-hybrid-7.2.1.ebuild 4281
-RMD160 517ab4171cd1d1f2ed1888b8c7f090d6e527de57 ircd-hybrid-7.2.1.ebuild 4281
-SHA256 27c57d761263f4f755db117217f9ca187c31964629597b9f31af63037280ccbe ircd-hybrid-7.2.1.ebuild 4281
-MISC ChangeLog 3436 RMD160 986a8c196e1ac01cada41f68e17c5f4752dece6e SHA1 dea8b15025b827f89ec5d4aace93770529065ead SHA256 f79830565f3caf7987b94964ecc0c265658f679acf52fe5399d93fc659a4a849
-MD5 ca236a4f1771784994dc3b02d6311974 ChangeLog 3436
-RMD160 986a8c196e1ac01cada41f68e17c5f4752dece6e ChangeLog 3436
-SHA256 f79830565f3caf7987b94964ecc0c265658f679acf52fe5399d93fc659a4a849 ChangeLog 3436
+EBUILD ircd-hybrid-7.2.1.ebuild 4330 RMD160 9038e8a41cd45629a338f4e82732e49af6973336 SHA1 6e05e63b4c4f310e3fbdbe171a698efe77a83caa SHA256 b05a7d560a90aa54670c243484ebfb5ebbaa84743d5d55ee127cd08a1bbf71dd
+MD5 6bf7cc308249e7652cbb77a23a795c6a ircd-hybrid-7.2.1.ebuild 4330
+RMD160 9038e8a41cd45629a338f4e82732e49af6973336 ircd-hybrid-7.2.1.ebuild 4330
+SHA256 b05a7d560a90aa54670c243484ebfb5ebbaa84743d5d55ee127cd08a1bbf71dd ircd-hybrid-7.2.1.ebuild 4330
+MISC ChangeLog 3595 RMD160 0293f224ebb2b725c43b954d80be77e705fa0754 SHA1 30a5f64a74d8b6267e75c1adf781f58af3bdc927 SHA256 4aa1d75f53037adfcb920f943d7418c781d51e42f57a490dc13d35424e30adb8
+MD5 1b2c6c219f87836e2e2e94204b880967 ChangeLog 3595
+RMD160 0293f224ebb2b725c43b954d80be77e705fa0754 ChangeLog 3595
+SHA256 4aa1d75f53037adfcb920f943d7418c781d51e42f57a490dc13d35424e30adb8 ChangeLog 3595
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -78,9 +82,9 @@ MD5 5ff254cea2c069a8dc2460725f8714b6 files/digest-ircd-hybrid-7.2.1 247
 RMD160 0dae654f897e9b4d7905f73484a868254a476333 files/digest-ircd-hybrid-7.2.1 247
 SHA256 6118a5504ddcda69e0c112f12398bc43cc38febe3c2351818658a4e598e42c7b files/digest-ircd-hybrid-7.2.1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEhInsz974XjDVpbkRAhclAJwJ48t0wDHd/MUpis/3rVK3QzKlggCgj7k9
-UGWk6VVBHx6YgG3XuNx4veE=
-=qtFu
+iD8DBQFEpTuuz974XjDVpbkRAv+zAJ9fWFsl6K1Tip3cMhNHmVtnbLWpnACgnzNJ
+VdDQ+LJ5Fm6XmegIEko4vAc=
+=qJSa
 -----END PGP SIGNATURE-----
diff --git a/net-irc/ircd-hybrid/files/7.2.1-amd64-multilib.patch b/net-irc/ircd-hybrid/files/7.2.1-amd64-multilib.patch
new file mode 100644
index 000000000000..e2e056781788
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/7.2.1-amd64-multilib.patch
@@ -0,0 +1,23 @@
+diff -urN ircd-hybrid-7.2.1.orig/src/lex.yy.c ircd-hybrid-7.2.1/src/lex.yy.c
+--- ircd-hybrid-7.2.1.orig/src/lex.yy.c	2006-06-24 18:44:37.000000000 +0200
++++ ircd-hybrid-7.2.1/src/lex.yy.c	2006-06-24 18:45:39.000000000 +0200
+@@ -7,8 +7,9 @@
+ 
+ #if defined(__FreeBSD__)
+ #include <sys/cdefs.h>
++#define REALLOC_SUFFIX __unused
+ #else
+-#define __unused
++#define REALLOC_SUFFIX
+ #endif
+ 
+ #define FLEX_SCANNER
+@@ -247,7 +248,7 @@
+ YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+ 
+ static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused;
++static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) REALLOC_SUFFIX;
+ static void yy_flex_free YY_PROTO(( void * ));
+ 
+ #define yy_new_buffer yy_create_buffer
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild
index 1898973bea31..c4ac78fe8049 100644
--- a/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild
+++ b/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild,v 1.1 2006/06/05 19:45:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.2.1.ebuild,v 1.2 2006/06/30 14:54:22 jokey Exp $
 
 inherit eutils toolchain-funcs
 
@@ -37,6 +37,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/7.2.1-default-config.patch
+	epatch "${FILESDIR}"/7.2.1-amd64-multilib.patch
 }
 
 src_compile() {