Fix building with ncurses[tinfo], bug #459764

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x668310D9

4 files changed, 67 insertions, 13 deletions

diff --git a/games-mud/crystal/ChangeLog b/games-mud/crystal/ChangeLog
index 5e7279ee990a..ee1cf639d198 100644
--- a/games-mud/crystal/ChangeLog
+++ b/games-mud/crystal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-mud/crystal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/ChangeLog,v 1.13 2013/01/24 00:15:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/ChangeLog,v 1.14 2013/06/16 23:40:08 tristan Exp $
+
+  16 Jun 2013; Tristan Heaven <tristan@gentoo.org> crystal-0.2.4.ebuild,
+  +files/crystal-0.2.4-build.patch:
+  Fix building with ncurses[tinfo], bug #459764
 
   24 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> -crystal-0.2.2.ebuild,
   -files/crystal-0.2.2-64bit.patch, -files/crystal-0.2.2-gcc43.patch,
diff --git a/games-mud/crystal/Manifest b/games-mud/crystal/Manifest
index 4931db05e40d..729db59031da 100644
--- a/games-mud/crystal/Manifest
+++ b/games-mud/crystal/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX crystal-0.2.4-build.patch 908 SHA256 d44a9cecad28a5e048a4c57bc4a3c702656927aee68e03e13f61b0f1d841bfbc SHA512 d6747721c00aa05907b81e851d83babc17fe93f2d9dcc99c3b7018a1bc36e6fdd933af682ab3b0016ea0594a9358c0b470f9c1ce0bd204c369aa293e47d2e28b WHIRLPOOL f6794b02c340a13c35c6aa0b0b7ca7ece68638195e259bb0a33d44f54473e6adf3b46cc3d7c3dda3e1a9d9e0b7c09adc6c9f28e2bc6af6230427504044bad217
 AUX crystal-0.2.4-gcc43.patch 190 SHA256 fc1a5a9911f54da5120d65aabf542d083de65a1c044ce06cf98f69895fe96606 SHA512 e5ef0d40f5efc7b1df2f094b35b9e9f20c8eb2f3d14b2d8bbf53ab6c9ad9a967c9494bf3918c4bfcfd4f6291dc038b0e29672d9f649d962b816df9be6f779a07 WHIRLPOOL 24bd649c1169739fc1bd052e8b2a6281d9d50312d3540d24584602721ca77fb6d878a3b6fc49d7ddfaf35b060c9ae92bc23efbdc5a2c5482f68199ce7f176c58
-DIST crystal-0.2.4.tar.gz 146962 SHA256 1f5843034d897977430cf1d84040cd6e50bcc1d1b7fdda4e9f07f4ea6d6db6ce
-EBUILD crystal-0.2.4.ebuild 939 SHA256 0aa6442c42fbc7839ba6eda7993e3571a087dc3a991c69d402686508ff0addac SHA512 469c67325a4d7106fdda0006ca7327519c7119aad2babd332550a02084ecb8b8df7b6aa79dcea7f0342ca832e8a2ea56124751186fb26a0d1f895c22651d306e WHIRLPOOL ec4248f112a77f9ea551e785ed9c931065cf814043517e9dadcc565f0a09f6b79b836200b7bc1c125a6798dec591abd6589b02dcefab2babb489cf66360e673d
-MISC ChangeLog 1910 SHA256 de7ed79b8ab27b2beefb9f98f38704e4e83fa805690e485fab24ee709c078d40 SHA512 5891cc8fa25c2b35a8996e6eac2d3504b081488c56412cdc93086847f6c94500536474f9c8a51874c9f61da801093ba881a4842b72b9ce2812bf407a6990d483 WHIRLPOOL 9af2d14b763a46f9f7d87234c75ab51b3fa5600df48e57ca93232995d27a4c394c2db571dd87f76b54854300d27d6f64a6f815a13890b090186103c8d0ee7cc0
+DIST crystal-0.2.4.tar.gz 146962 SHA256 1f5843034d897977430cf1d84040cd6e50bcc1d1b7fdda4e9f07f4ea6d6db6ce SHA512 8493b0d84db610606ce97e918cfa418123c39e5afffb4bf880aa905c46dc13d0b7ff0366b497e020276afadf9db951fcd6fa7aa0e25f5357574fa465ee152916 WHIRLPOOL 50e202e6becf025289cb042d86b970bbf8d5a2aaf7c86ce372f4697ff61af21af9c94f281b763045e607ce28f60fd78c6e2c1279746023f1ed53d7031c0fd47e
+EBUILD crystal-0.2.4.ebuild 951 SHA256 edd3882ff0ba60598cc11b9575e6a450d463a0a2a663aa57901fe44e8cdec649 SHA512 ea9fa0073c517aea55676e30e76f899d00b25a9fea6031b43599c8d65e94c37ad766f1d0805df9a063fa2c5d36b299adb3aa681a15ff700653b349c5897611c9 WHIRLPOOL c542549edeefaecd972aaddf381efa49b01058de74a675088eebe408c3e379a3ff3c8676ad51c27d58aee93d10c61117fffefa9c7c2a2686ead54202280b397c
+MISC ChangeLog 2066 SHA256 095da92d67c820e36281c27fd17dba4a94f81969bb8366b67fc92213eb71cbcc SHA512 ec56cb36b1ff8b36e40c31a492374dfe00f642a4a75c2b690710f5fd16725fe8be0909f502d3753eb33b929030253b2c0cbc0a059e7ce8b36d2aa054efb131d9 WHIRLPOOL 2a1dfea08702d4db19acb2ac40d87ecae07c44a57012736e737d8620b1b3013fdf59db445487be29da776753c88e6a459555e113e61f43e9d2c5b0282fbb2c07
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRvkzZAAoJEN3Y2YlmgxDZ/FwP/iyL90ajDbhmyhfJjCy0MHML
+vhlb/nIZTSoHml/YbjUa5dbWhqJEidKVDpGO9iQFwgS5G1yfgLSjhGOzTl/zR6bj
+a8kZRwWsdmcwZYrBbUxPZolv2hmT95bHeoTjbj526pApz7KmPmP6k+ZPU6id0bXl
+h0QFn1ViNQgvDzvZt4kqrGphvceLMEsOFbFqHGOVCYqRscCxViVj7fmaP1Zn/vKz
+e3zHoRrbCfraK56losPke6cm4HbfA91wwrEELNIfSe8++XHXxCRPRFIsIV97rsUn
+BX0f8SYHcYUwozhDpSTwQs5bubGwhWMw4/tIIm008zw8mXNT2zd+AYzRagaHhrB+
+0NIZEehAOaDUePoKeol+Liv1J+yx4IfExmPwSKCFXdYSLYyBlR9ka+6mLoNlvBqT
+k5WuYvoBpxhMtJutMnKf0HsLq5LLBilSau1Vk45u8iuuRIFSTKgcaWLBp6WppCoq
+JKQq6TylFB6/OCfl1R4xkVSvePjauv0DIOLcZD6bUlhogI2y6Qcy+ufh55OB62dX
+inZwlkJKYt7zupFGdZIvLmgY47aGxt4zoy7R8dop5A0QMaTIfbAsYk86D3vYQhMw
+k5T8F2cL32m5RNYZxZmNcoLJ49juaca9K79BPJDUEst0bwpmDheJgGktdqnQdx2P
+d9rK28OZGI1KwWbU575j
+=/w92
+-----END PGP SIGNATURE-----
diff --git a/games-mud/crystal/crystal-0.2.4.ebuild b/games-mud/crystal/crystal-0.2.4.ebuild
index d7ff7f3e4de9..1a63218530f4 100644
--- a/games-mud/crystal/crystal-0.2.4.ebuild
+++ b/games-mud/crystal/crystal-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/crystal-0.2.4.ebuild,v 1.4 2012/03/06 20:37:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/crystal-0.2.4.ebuild,v 1.5 2013/06/16 23:40:08 tristan Exp $
 
 EAPI=2
-inherit eutils games
+inherit autotools eutils games
 
 DESCRIPTION="The crystal MUD client"
 HOMEPAGE="http://www.evilmagic.org/crystal/"
@@ -14,19 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="sys-libs/zlib
+RDEPEND="sys-libs/zlib
 	sys-libs/ncurses
 	dev-libs/openssl
 	virtual/libiconv"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-build.patch
 	# avoid colliding with xscreensaver (bug #281191)
-	sed -i \
-		-e '/^man_MANS/s/crystal/crystal-mud/' \
-		Makefile.in \
-		|| die "sed failed"
 	mv crystal.6 crystal-mud.6
+	eautoreconf
 }
 
 src_configure() {
diff --git a/games-mud/crystal/files/crystal-0.2.4-build.patch b/games-mud/crystal/files/crystal-0.2.4-build.patch
new file mode 100644
index 000000000000..147447f3c9a8
--- /dev/null
+++ b/games-mud/crystal/files/crystal-0.2.4-build.patch
@@ -0,0 +1,28 @@
+--- configure.in
++++ configure.in
+@@ -31,7 +31,9 @@
+ AC_PROG_CXX
+ AC_CHECK_FUNCS(select socket strerror strstr)
+ 
+-AC_CHECK_LIB(curses, main, [LIBS=" -lcurses "], AC_CHECK_LIB(ncurses, main, [LIBS=" -lncurses "], AC_MSG_ERROR([No curses])))
++PKG_CHECK_MODULES([NCURSES], [ncurses])
++AC_SUBST([NCURSES_CFLAGS])
++AC_SUBST([NCURSES_LIBS])
+ 
+ AC_CHECK_LIB(z, main, [LIBS=$LIBS" -lz "; AC_DEFINE(HAVE_ZLIB)], AC_MSG_WARN([No zlib - MCCP support will not be built]))
+ 
+--- Makefile.am
++++ Makefile.am
+@@ -5,7 +5,11 @@
+ 		common.h crystal.h grid.h io.h telnet.h wcwidth.c \
+ 	scripting.cc scripting.h
+ 
+-man_MANS = crystal.6
++crystal_CPPFLAGS = $(NCURSES_CFLAGS)
++
++crystal_LDADD = $(NCURSES_LIBS)
++
++man_MANS = crystal-mud.6
+ 
+ DEBDIST = README.Debian debian/changelog.real debian/compat debian/control debian/copyright debian/crystal-default.ex debian/crystal.substvars debian/docs debian/rules debian/watch.ex
+