Fix building against sys-libs/ncurses[tinfo] (bug #527876).
authorJeroen Roovers <jer@gentoo.org>
Mon, 10 Nov 2014 08:43:22 +0000 (08:43 +0000)
committerJeroen Roovers <jer@gentoo.org>
Mon, 10 Nov 2014 08:43:22 +0000 (08:43 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

games-puzzle/tetrinet/ChangeLog
games-puzzle/tetrinet/Manifest
games-puzzle/tetrinet/files/tetrinet-0.11-build.patch
games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch
games-puzzle/tetrinet/tetrinet-0.11.ebuild

index 9ba042119ef91f8a0a495145078e1944472f0851..9be80173ff19d6f3cee4e3927e2ebceebf53057c 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/tetrinet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/ChangeLog,v 1.11 2010/07/14 17:38:21 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/ChangeLog,v 1.12 2014/11/10 08:43:21 jer Exp $
+
+  10 Nov 2014; Jeroen Roovers <jer@gentoo.org> tetrinet-0.11.ebuild,
+  files/tetrinet-0.11-build.patch, files/tetrinet-0.11-no-ipv6.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #527876).
 
   14 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org> tetrinet-0.11.ebuild,
   +files/tetrinet-0.11-build.patch:
index 23cdcdd5491c94bb4c883482c91ab1d38d3a2060..c108c96cf63f866148a0efc06052a7fbe850c366 100644 (file)
@@ -1,6 +1,16 @@
-AUX tetrinet-0.11-build.patch 2957 RMD160 97138364a69769bdf35b332103ca287fa19ea73d SHA1 93f4413f2468d33a0415ca347d51df45d7f955ba SHA256 c433279501c9a06ee8e885c728de51fe47b10dcdd5c8506a61b49e1910a66f03
-AUX tetrinet-0.11-no-ipv6.patch 181 RMD160 3180df978a28cc0628852fb98fec86752b82efb6 SHA1 0a9b665d146a7381c8a7a3b70bbd24cd134e1914 SHA256 fd28bf5b2b58e1274afa4258076ce765b055d535220ac2fdb23eec8625a773b6
-DIST tetrinet-0.11.tar.bz2 38607 RMD160 709376da9f0a06dacd3f11b572bdce11dd159ebd SHA1 2fb2bfcfe1fc2af82b01b66e2b28a77ad1262c17 SHA256 a7a32da072d0a7bb9f1a61ced5641336924c314692ed8ac3394147f3716b972c
-EBUILD tetrinet-0.11.ebuild 790 RMD160 b5ed425bfdf14f8d4b46e993a02969cf003b74d2 SHA1 89f1f18241c94fbf7515a66eb1b77a6a8bd898f1 SHA256 078386b384d5aa8ca339c3dd73a6bc7b9359838cc5e0f20073216714ac17feb6
-MISC ChangeLog 1457 RMD160 6b643b39fb34b40905de7ff0e566be20820f00bc SHA1 2b1b140fab5a0b643cb546dea80c934f9e3cc0aa SHA256 2c72f0bd849bdb9ed36f3f8c4e847f800b1aa9dc8f3e5c99f4172273ea1aff35
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX tetrinet-0.11-build.patch 2331 SHA256 1ebadb8011e4ad3015b994f8de1da656b8f7d1669437efbd0d0bb3b5b7843070 SHA512 e56a43ef53d9df84c4ba49b39ba2d77f99de1b616f9e81e105d4c49553b909f418f74cb13d431dbd658c41c99388321e0806dbeb63294817ec85f7148f2d2ae0 WHIRLPOOL 7f1518db81e8e677b1739524b944569a59f1bfd7e139847077305cfa0c1c69ad732c86f41b9c3aed0e14d2d105856de8ece48fb2685d914dd99199970cd26c93
+AUX tetrinet-0.11-no-ipv6.patch 185 SHA256 ad1d66cb1289030900cdf54f9706ed5078be4552ed5e4092248f3e309bcb1874 SHA512 1851623b20e2685548650d54f290a49f9572b65a2293848c0d83a6fdc1c1256ebcdd0f737b2f32f7fb4bd921aa69c17e7120cfc8acb1d8c5a97342741964890f WHIRLPOOL 340f01e3a0d88d417b0d06400a465fa1e3e7b72af84d7b0bc60292e86a65c1ade406bfc9fb1b22d11781df8d72d00b524f8059de4ec560e0813fa99537d72c2b
+DIST tetrinet-0.11.tar.bz2 38607 SHA256 a7a32da072d0a7bb9f1a61ced5641336924c314692ed8ac3394147f3716b972c SHA512 8123a8c50a3c1b6326d3209272a60c8050afd2a9eb455814fd676d8c4de922f8b81a88df9e4825d1ff5e0c8b8a7ac46ebe9ce68994587f829e047a3d889880fa WHIRLPOOL c0331f1fb42560a46711c6545f0df4b2bdca7bc1694a0c3ff0f1fc14f4cd483dc13b993b8488909eff9ddc94cc7b8c7ed93da64227bfe70dd6da1afeefb2fea1
+EBUILD tetrinet-0.11.ebuild 839 SHA256 72b03c4ecb2a791e8daef4802cb68287b96fb236f832878617ead4ccebda71f2 SHA512 ed5f4629ae1b5c8ea6b6e137c514c5e1b90138163a115c3f4cf3ca8bb600150cd6e2b17a1ef017e609dc4851f9dc6d8f61c9f93a0ccac6e4f914353c214631a9 WHIRLPOOL 145bdfb423ed0edf0da47304c05ac2261661bc74eff29ca698c9fe29418b443150297f3dc462838f16edf424550c43afbf0c7047200340eb2467fcdf52e2a634
+MISC ChangeLog 1653 SHA256 a74491e5ae8396dea957631ad41e44ac50fa4a181091e2137153b784948b2d4b SHA512 1e66a8e33470ed0e29a6d7e287200ffa0fe1163d9ee20d97a4781debdcef0e2ef4cf4d6ec8d0d38dbd9a174f7d60f733a26e7aed9a7a1adeade70c850036f44f WHIRLPOOL 4ae580f6f1aec29fad908a380e5ab40f75a3005750e089ddde85ebb874c7dea615e262b84d6459ccaeb82acf27702c41f8807f57ba2b744d5752d1d69e17b4b5
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlRgeqoACgkQVWmRsqeSphMxJQCcCEPcT9a7RbsS0rKm+89Ac+ly
+AfwAnAgAYtZ4eeuhlCnBetUCDPtSy5FX
+=kNui
+-----END PGP SIGNATURE-----
index 719691cad4e9da3b24103ec5c480ef41900c383c..0540b7bc8ce91888b537b47a99a4e7e702d211a4 100644 (file)
@@ -1,6 +1,5 @@
-diff -ru tetrinet-0.11.orig/Makefile tetrinet-0.11/Makefile
---- tetrinet-0.11.orig/Makefile        2003-09-07 12:29:29.000000000 -0400
-+++ tetrinet-0.11/Makefile     2010-07-14 13:23:52.526003482 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -1,6 +1,4 @@
 -CC = cc
 -
@@ -14,7 +13,7 @@ diff -ru tetrinet-0.11.orig/Makefile tetrinet-0.11/Makefile
  
  tetrinet: $(OBJS)
 -      $(CC) -o $@ $(OBJS) -lncurses
-+      $(CC) $(LDFLAGS) -o $@ $(OBJS) -lncurses
++      $(CC) $(LDFLAGS) -o $@ $(OBJS) $(shell ${PKG_CONFIG} --libs ncurses)
  
  tetrinet-server: server.c sockets.c tetrinet.c tetris.c server.h sockets.h tetrinet.h tetris.h
 -      $(CC) $(CFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
@@ -22,9 +21,8 @@ diff -ru tetrinet-0.11.orig/Makefile tetrinet-0.11/Makefile
  
  .c.o:
        $(CC) $(CFLAGS) -c $<
-diff -ru tetrinet-0.11.orig/sockets.c tetrinet-0.11/sockets.c
---- tetrinet-0.11.orig/sockets.c       2003-09-09 15:15:04.000000000 -0400
-+++ tetrinet-0.11/sockets.c    2010-07-14 13:18:28.999213319 -0400
+--- a/sockets.c
++++ b/sockets.c
 @@ -66,7 +66,7 @@
      if (c == 0xFF)
        ptr--;
@@ -43,9 +41,8 @@ diff -ru tetrinet-0.11.orig/sockets.c tetrinet-0.11/sockets.c
        if (!logfile)
            logfile = fopen(logname, "a");
        if (logfile) {
-diff -ru tetrinet-0.11.orig/tetrinet.c tetrinet-0.11/tetrinet.c
---- tetrinet-0.11.orig/tetrinet.c      2003-09-07 12:29:29.000000000 -0400
-+++ tetrinet-0.11/tetrinet.c   2010-07-14 13:22:33.529265565 -0400
+--- a/tetrinet.c
++++ b/tetrinet.c
 @@ -21,7 +21,7 @@
  /*************************************************************************/
  
@@ -74,9 +71,8 @@ diff -ru tetrinet-0.11.orig/tetrinet.c tetrinet-0.11/tetrinet.c
                i++;
                if (i >= ac) {
                    fprintf(stderr, "Option -log requires an argument\n");
-diff -ru tetrinet-0.11.orig/tetrinet.h tetrinet-0.11/tetrinet.h
---- tetrinet-0.11.orig/tetrinet.h      2003-09-07 12:12:51.000000000 -0400
-+++ tetrinet-0.11/tetrinet.h   2010-07-14 13:18:20.061828023 -0400
+--- a/tetrinet.h
++++ b/tetrinet.h
 @@ -74,7 +74,7 @@
  /* Externs */
  
index 5b0cb82f75c03cfa8469d9924f58dfc7b4d4cf50..addfd9a0047c38abcd03e3036a2089f753d4f9f2 100644 (file)
@@ -1,5 +1,5 @@
---- sockets.c
-+++ sockets.c
+--- a/sockets.c
++++ b/sockets.c
 @@ -188,7 +188,7 @@
        return -1;
      }
index 9232850d4fa36c6fe82b1efafe2be9e8d2ab6331..fe258210bec93dc9c7f776fca92bc611bf97b9d1 100644 (file)
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 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.14 2010/07/14 17:38:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.15 2014/11/10 08:43:21 jer Exp $
 
-EAPI=2
-inherit eutils flag-o-matic games
+EAPI=5
+inherit eutils flag-o-matic games toolchain-funcs
 
 DESCRIPTION="console based tetrinet inc. standalone server"
 HOMEPAGE="http://tetrinet.or.cz/"
@@ -14,18 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="ipv6"
 
-DEPEND=">=sys-libs/ncurses-5"
+RDEPEND=">=sys-libs/ncurses-5"
+DEPEND="
+       ${RDEPEND}
+       virtual/pkgconfig
+"
 
 src_prepare() {
        epatch \
                "${FILESDIR}"/${P}-no-ipv6.patch \
                "${FILESDIR}"/${P}-build.patch
 
-       use ipv6 && append-flags -DHAVE_IPV6
+       use ipv6 && append-cflags -DHAVE_IPV6
+       tc-export PKG_CONFIG
 }
 
 src_install() {
-       dogamesbin tetrinet tetrinet-server || die "dogamesbin failed"
+       dogamesbin tetrinet tetrinet-server
        dodoc README TODO tetrinet.txt
        prepgamesdirs
 }