add patch for detecting tcl/tk85 (bug #267451)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 34 insertions, 8 deletions

diff --git a/games-roguelike/zangband/ChangeLog b/games-roguelike/zangband/ChangeLog
index eb1de69c910e..0dd6c3c1f851 100644
--- a/games-roguelike/zangband/ChangeLog
+++ b/games-roguelike/zangband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/zangband
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.15 2009/08/02 04:45:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/ChangeLog,v 1.16 2009/08/06 20:15:22 mr_bones_ Exp $
+
+  06 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  zangband-2.7.4c.ebuild, +files/zangband-2.7.4c-tk85.patch:
+  add patch for detecting tcl/tk85 (bug #267451)
 
   02 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
   zangband-2.7.4c.ebuild:
diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest
index 7139e7ca58ca..692f58bda965 100644
--- a/games-roguelike/zangband/Manifest
+++ b/games-roguelike/zangband/Manifest
@@ -1,6 +1,7 @@
+AUX zangband-2.7.4c-tk85.patch 1429 RMD160 2f19fa35cbbb2b6f42315cad7f8ff4196b6dc586 SHA1 ed5ebe7488e8a1d275851011d71cc1376b532f41 SHA256 d5af4f1366d3539da7225ee8a115a9dd62afd7ba9ed3aecf0ca90c29233bf580
 DIST zangband-2.7.4b.tar.gz 2765148 RMD160 e3443a8eecaa616d2329114aa7f3f08351e36b6f SHA1 408c13158baacc0d4345d40029936084818eca39 SHA256 64e99e4a1aa3881909b8b02d6942fe408c278902a5e8c75b59713e515388fea0
 DIST zangband-2.7.4c.tar.gz 2821355 RMD160 50d2f0d6cf7f71302b0f7efcc819ddb4da86cd30 SHA1 476c6cd7555b76626a4a1e05e979ff7976f92875 SHA256 3033fc52d0daab6098394a8caaa6572ba64585d7b9deb62800328ca7ba592cdc
 EBUILD zangband-2.7.4b.ebuild 1717 RMD160 86307b2382bb3583d54826a20d12733dc39270f5 SHA1 2850b248808af0631790aa2e94a016f0f79ff8cc SHA256 8b51ef6a6d87863c3af9f5653cdd2b4012802627776c61a913350dd727ee20bc
-EBUILD zangband-2.7.4c.ebuild 1686 RMD160 3f3e9dad9d5b9e511f7afe54283a3dde949647d2 SHA1 d7ece885737283f090d15e3b5232bdc5502a4e93 SHA256 042e3e9e3a0c73cdb9dc93edbc86c72ebdb7ea9c34eb121895cf169005753e2d
-MISC ChangeLog 2654 RMD160 2fef481c4c532777a6603579754ae06bdc005d20 SHA1 a6a91e1b2c3b9fbab108dea597ee301ab7873964 SHA256 62a6225f5db584ee60c3f3586e6f79f703b6935c7065cd4c7ddf9c9d63c491e2
+EBUILD zangband-2.7.4c.ebuild 1666 RMD160 98b2bcccd93bfeeb9eb51229e3462b36d8ba7378 SHA1 23bd644eaba6e357b740b38d9f62b54b351cb1eb SHA256 7f708366f85865b6c20260f108d8e1d516316547d7709a75bba17f3a1e4bc648
+MISC ChangeLog 2820 RMD160 aefac478adc51ad4a6df79bf2af83453be0d34bb SHA1 d18b515f2715e0fe7f5874b1e8d2abd119625205 SHA256 1d1a48ea34b8e921afa0fa4531111c841427ae561f1fb4d5469b1b53a520198d
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
new file mode 100644
index 000000000000..0613ecb557f5
--- /dev/null
+++ b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
@@ -0,0 +1,19 @@
+--- configure.in.orig	2009-08-06 16:07:20.968296247 -0400
++++ configure.in	2009-08-06 16:08:23.466167799 -0400
+@@ -141,12 +141,12 @@
+ ])
+ 
+ if test "x$with_tcltk" != "xno" ; then
+-	AC_SEARCH_LIBS([Tcl_Init], [tcl84 tcl8.4 tcl83 tcl8.3],
+-	AC_SEARCH_LIBS([Tk_Init], [tk84 tk8.4 tk83 tk8.3],
+-	    [AC_SEARCH_HEADERS(/usr/local/include/tcl.h /usr/local/include/tcl/tcl.h /usr/include/tcl.h /usr/include/tcl8.4/tcl.h /usr/local/include/tcl8.4/tcl.h /usr/include/tcl8.3/tcl.h /usr/local/include/tcl8.3/tcl.h
++	AC_SEARCH_LIBS([Tcl_Init], [tcl85 tcl8.5 tcl84 tcl8.4 tcl83 tcl8.3],
++	AC_SEARCH_LIBS([Tk_Init], [tk85 tk8.5 tk84 tk8.4 tk83 tk8.3],
++	    [AC_SEARCH_HEADERS(/usr/local/include/tcl.h /usr/local/include/tcl/tcl.h /usr/include/tcl.h /usr/include/tcl8.5/tcl.h /usr/include/tcl8.4/tcl.h /usr/local/include/tcl8.4/tcl.h /usr/include/tcl8.3/tcl.h /usr/local/include/tcl8.3/tcl.h
+ 		    ,BASE_TCL_DIR)
+ 		
+-		AC_SEARCH_HEADERS("$BASE_TCL_DIR/tk.h" /usr/local/include/tk.h /usr/local/include/tcl/tk.h /usr/include/tk.h /usr/include/tk8.4/tk.h /usr/local/include/tk8.4/tk.h /usr/include/tk8.3/tk.h /usr/local/include/tk8.3/tk.h
++		AC_SEARCH_HEADERS("$BASE_TCL_DIR/tk.h" /usr/local/include/tk.h /usr/local/include/tcl/tk.h /usr/include/tk.h /usr/include/tk8.5/tk.h /usr/include/tk8.4/tk.h /usr/local/include/tk8.4/tk.h /usr/include/tk8.3/tk.h /usr/local/include/tk8.3/tk.h
+ 		    ,BASE_TK_DIR)
+ 		
+         dnl Checks for libraries.
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index 85a2060e99c1..2d33433babe9 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.6 2009/08/02 04:45:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/zangband/zangband-2.7.4c.ebuild,v 1.7 2009/08/06 20:15:22 mr_bones_ Exp $
 
 EAPI=2
-inherit games
+inherit autotools games
 
 DESCRIPTION="An enhanced version of the Roguelike game Angband"
 HOMEPAGE="http://www.zangband.org/"
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="~ppc ~x86 ~x86-fbsd"
 IUSE="tk"
 
-# Dropping X use keyword:
-#  it had to be $(use_with X x11)
-#  but ebuild fails to link without-x11
 RDEPEND="tk? (
 		dev-lang/tcl
 		dev-lang/tk )
@@ -26,6 +23,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tk85.patch
+	eautoreconf
+}
+
 src_configure() {
 	egamesconf \
 		--datadir="${GAMES_DATADIR_BASE}" \