USE=-ipv6 compilation fix by Andrew Church, bug #203514

Package-Manager: portage-2.1.4

4 files changed, 44 insertions, 16 deletions

diff --git a/games-puzzle/tetrinet/ChangeLog b/games-puzzle/tetrinet/ChangeLog
index 46c8a8bb96c3..a895e48acfb3 100644
--- a/games-puzzle/tetrinet/ChangeLog
+++ b/games-puzzle/tetrinet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/tetrinet
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/ChangeLog,v 1.7 2007/02/22 01:16:54 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/ChangeLog,v 1.8 2008/01/15 10:27:47 nyhm Exp $
+
+  15 Jan 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/tetrinet-0.11-no-ipv6.patch, tetrinet-0.11.ebuild:
+  USE=-ipv6 compilation fix by Andrew Church, bug #203514
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-puzzle/tetrinet/Manifest b/games-puzzle/tetrinet/Manifest
index 1456121b1eb7..dcffdb3855c5 100644
--- a/games-puzzle/tetrinet/Manifest
+++ b/games-puzzle/tetrinet/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX tetrinet-0.11-no-ipv6.patch 181 RMD160 3180df978a28cc0628852fb98fec86752b82efb6 SHA1 0a9b665d146a7381c8a7a3b70bbd24cd134e1914 SHA256 fd28bf5b2b58e1274afa4258076ce765b055d535220ac2fdb23eec8625a773b6
+MD5 0191d4cfe6ae9b7517d2442d7691fed4 files/tetrinet-0.11-no-ipv6.patch 181
+RMD160 3180df978a28cc0628852fb98fec86752b82efb6 files/tetrinet-0.11-no-ipv6.patch 181
+SHA256 fd28bf5b2b58e1274afa4258076ce765b055d535220ac2fdb23eec8625a773b6 files/tetrinet-0.11-no-ipv6.patch 181
 DIST tetrinet-0.11.tar.bz2 38607 RMD160 709376da9f0a06dacd3f11b572bdce11dd159ebd SHA1 2fb2bfcfe1fc2af82b01b66e2b28a77ad1262c17 SHA256 a7a32da072d0a7bb9f1a61ced5641336924c314692ed8ac3394147f3716b972c
-EBUILD tetrinet-0.11.ebuild 869 RMD160 6cc889f607bc87a70c44d40ad7ea9bb716d115ef SHA1 d13e3d82f5b0c554f2ab5343efcb655929e29c2a SHA256 da785abba88c4dd304bfeace597fd55f0fec1ea6f7dc2a773c1539c0961fd4da
-MD5 f81a8c034809a14c0a5f32e10a230213 tetrinet-0.11.ebuild 869
-RMD160 6cc889f607bc87a70c44d40ad7ea9bb716d115ef tetrinet-0.11.ebuild 869
-SHA256 da785abba88c4dd304bfeace597fd55f0fec1ea6f7dc2a773c1539c0961fd4da tetrinet-0.11.ebuild 869
-MISC ChangeLog 903 RMD160 4360fbe70ee79dc0c75107eed75c75b8559f42e4 SHA1 bba48fe5e178a83dc6ea2c446203d84ad2c108df SHA256 bd923d819a1f0492633d98e744a57a13d68b3ebd634a4a76148926ae7865d2d9
-MD5 91fea07c39511e7cc3c99733370a7333 ChangeLog 903
-RMD160 4360fbe70ee79dc0c75107eed75c75b8559f42e4 ChangeLog 903
-SHA256 bd923d819a1f0492633d98e744a57a13d68b3ebd634a4a76148926ae7865d2d9 ChangeLog 903
+EBUILD tetrinet-0.11.ebuild 856 RMD160 c28f4ff5e9c62c83915e3a53327c7671cead96db SHA1 2dfc5c38424038011e09ab54d176e59954289cf6 SHA256 97e3ebb43f06726c0cb65c45262bb57eacb26b2817813570e919a46735fa100f
+MD5 9a8b71f8e0d0dca71c9d08f047d128d0 tetrinet-0.11.ebuild 856
+RMD160 c28f4ff5e9c62c83915e3a53327c7671cead96db tetrinet-0.11.ebuild 856
+SHA256 97e3ebb43f06726c0cb65c45262bb57eacb26b2817813570e919a46735fa100f tetrinet-0.11.ebuild 856
+MISC ChangeLog 1069 RMD160 e7d4e71df951922de60e6b8764399ca6c67f77f9 SHA1 f94ea95c5ee036fc0b13d4878b40bd4e30870128 SHA256 8b05022637f23d280cca5da7ebf8f690b28ab85aa2ff13c91ff28e0fb70f988d
+MD5 56970a50511c4e86c5002bef95547849 ChangeLog 1069
+RMD160 e7d4e71df951922de60e6b8764399ca6c67f77f9 ChangeLog 1069
+SHA256 8b05022637f23d280cca5da7ebf8f690b28ab85aa2ff13c91ff28e0fb70f988d ChangeLog 1069
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -14,3 +21,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 bef82acf8a975af16ba972555ad5f113 files/digest-tetrinet-0.11 241
 RMD160 be92e2f5be39a841718938ef5379cc4531c7795f files/digest-tetrinet-0.11 241
 SHA256 7069798a41d78123da365398b8a678aa2a51ea51b5ec1537aed8c40963ce6fdd files/digest-tetrinet-0.11 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHjIqpdz7hIScOURERAuEaAJ92wiQZBxkXZ8V6oN5ivmxg1QO5agCfTZn9
+ZH7K/2wxoq8Sla8/U5k1wu4=
+=pvXT
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch b/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch
new file mode 100644
index 000000000000..5b0cb82f75c0
--- /dev/null
+++ b/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch
@@ -0,0 +1,11 @@
+--- sockets.c
++++ sockets.c
+@@ -188,7 +188,7 @@
+ 	return -1;
+     }
+     if (ipbuf)
+-	memcpy(retbuf, &sa.sin_addr, 4);
++	memcpy(ipbuf, &sa.sin_addr, 4);
+ #endif
+ 
+     return sock;
diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
index 9b4d3e26923c..508b2690f45d 100644
--- a/games-puzzle/tetrinet/tetrinet-0.11.ebuild
+++ b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.10 2006/12/06 17:27:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.11 2008/01/15 10:27:47 nyhm Exp $
 
-inherit flag-o-matic games
+inherit eutils flag-o-matic games
 
 DESCRIPTION="console based tetrinet inc. standalone server"
 HOMEPAGE="http://tetrinet.or.cz/"
@@ -10,17 +10,16 @@ SRC_URI="http://tetrinet.or.cz/download/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ppc"
+KEYWORDS="~amd64 ppc x86"
 IUSE="ipv6"
 
 RDEPEND=">=sys-libs/ncurses-5"
 
 src_unpack() {
 	unpack ${A}
-	return 0
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-ipv6.patch
 
-	# for now, make sure IPv6 is always on #32860
 	use ipv6 && append-flags -DHAVE_IPV6
 	sed -i \
 		-e 's/-DHAVE_IPV6//' \