Fix for build w/o tk, #319631; thanks Jonathan-Christofer Demay for digging out the patch

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 137 insertions, 13 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 72c3228caad9..bae1987b18e7 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.72 2010/04/28 19:58:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.73 2010/05/25 11:01:58 jlec Exp $
+
+  25 May 2010; Justin Lecher <jlec@gentoo.org> expect-5.44.1.15.ebuild,
+  +files/expect-5.44.1.15_with-tk-no.patch:
+  Fix for build w/o tk, #319631; thanks Jonathan-Christofer Demay for
+  digging out the patch
 
   28 Apr 2010; Justin Lecher <jlec@gentoo.org> expect-5.44.1.15.ebuild:
   Fix for changed path of example files, #316885, thanks Juergen Rose for
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index b1be548c033c..127ebbdfd2cd 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -9,6 +9,7 @@ AUX expect-5.43.0-missing-includes.patch 1767 RMD160 9f5e3f92da5f651111220abd6a2
 AUX expect-5.43.0-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002
 AUX expect-5.44.1.15-gfbsd.patch 659 RMD160 cf566cacac006231459cb13ae4ec53d362535317 SHA1 441465aaa7cb4481a934ea97c75e5630ee3053f7 SHA256 0b40a0798b7851a97b2e67043e1346d76c97b9f1084ca1d51d57f2d3f129fb01
 AUX expect-5.44.1.15-ldflags.patch 360 RMD160 07385db6345811c5f43316e508ea6e2677662197 SHA1 366ecf4a44558819fac92a6f7800961997d060d5 SHA256 2e9d3a614edc020044480ba78802696880be638f5b5dcb0fff02c632e0e738d2
+AUX expect-5.44.1.15_with-tk-no.patch 3471 RMD160 704da66e65df54f66567c62f7e98efea39a21737 SHA1 571d894e59267cd812d727ad3b6f5a4c7b4b98ab SHA256 41e889fc40d1a501285fe0acb1324d8be016654ee92b2a9dcdfe7bd2f3df06a0
 AUX expect.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca
 DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 SHA1 84ca72f0abd2b7a31ee332049b34575a286e8f27 SHA256 a2b64dbca4dc127dfcb6d7e16dd3c08ef8bba2056104ce89819d3e6f0e1df430
 DIST expect-5.43.0.tar.gz 525572 RMD160 2cc91f5bd42c7429550747c590085edb9a517a59 SHA1 854440d937c1d05103bf2d02f911005b739fa1e9 SHA256 4c9decec3c5541806f1758706fe649193d5c8afa2913a79361d9fa5f2c993ba1
@@ -17,13 +18,13 @@ EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 37e2632986cfa482437551c2e8842fa773505
 EBUILD expect-5.42.1-r2.ebuild 3182 RMD160 15ba15d1cf65267408c690390e8139576dc71509 SHA1 cce29a75c72bb943f3d55f2715c7eb1baffcbc4b SHA256 f9b02c01b8473854790f4f153ddf48b9ed63db4b3d76145001eda1c99e658553
 EBUILD expect-5.43.0-r1.ebuild 3820 RMD160 49a753c043884ebebe8018b964de122f111f7d78 SHA1 8bd6235c2e20d34664973bc4aec95f567f8d29c7 SHA256 de5dcecfa85e53ae9166711673bfba1bf308439b523e49faf7baae279fe1f25a
 EBUILD expect-5.43.0.ebuild 3539 RMD160 9b361ac2065c322c017271b7931c4c809bdcd9db SHA1 5d8a4211466e0d49d777afb1e11a5f305787788f SHA256 b68fcde292800697bb761562efc4682ac6fa8c77b6a807f639bbf404a9d3bac9
-EBUILD expect-5.44.1.15.ebuild 3178 RMD160 597579b83eec21b090ede348fff463191baac93f SHA1 94c453e7b7e2759f2b9f00abc0a2aa87c8a0cff8 SHA256 d0ea41741ad03027f3594c3137786fe8ac569540555729203536e709f0e88aa8
-MISC ChangeLog 10328 RMD160 133458502ad39752ec3d6785196a6b5f78a45ad4 SHA1 74573fb7358f1a50f6eae401ef91a9b74e943347 SHA256 d596a0af7eb74a8d6c7ec986c8e802980c11a50ee603a868adf633c56821d87c
+EBUILD expect-5.44.1.15.ebuild 3232 RMD160 7f11708b8633e54e125a09e8ff60d33e465ce7af SHA1 70267280021ef3672267b0a8cc15b7d0a1392a9d SHA256 f002dcd556dc567d7402f3e5baa80afb1641d999f955d7a4b3785b7113f159ee
+MISC ChangeLog 10539 RMD160 a018ec9905eea5222e1c0a59f4501e1c5c2376db SHA1 97b8a9478d0433f3ed532a675838dbaaced28303 SHA256 34909212385108c9f0d124b199da8f05cc97a9015a61754df93fc07d6b9050b6
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvYk1EACgkQgAnW8HDreRaUFQCgyA00wwvQtg8vPHtAfO5EXTyk
-NdoAn19urg/R9VgCs1OUaPMdOkzFUvE6
-=HnPl
+iEYEARECAAYFAkv7riwACgkQgAnW8HDreRZirACgs6CsHHP2dQ8u6Mi25vpjzWcB
+kS4AnjIchj8UPk9AX0YdNSwhbb6hlq2O
+=iJpZ
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.44.1.15.ebuild b/dev-tcltk/expect/expect-5.44.1.15.ebuild
index 4f9ba7bd77ba..9291bf9b22c0 100644
--- a/dev-tcltk/expect/expect-5.44.1.15.ebuild
+++ b/dev-tcltk/expect/expect-5.44.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.5 2010/04/28 19:58:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.6 2010/05/25 11:01:58 jlec Exp $
 
 EAPI="3"
 
@@ -37,6 +37,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-gfbsd.patch"
 	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch "${FILESDIR}/${P}_with-tk-no.patch"
 
 	eautoconf
 }
@@ -51,17 +52,17 @@ src_configure() {
 	tclv=$(grep TCL_VER ${EPREFIX}/usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
 	#tkv isn't really needed, included for symmetry and the future
 	#tkv=$(grep	 TK_VER ${EPREFIX}/usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/tcl${tclv}/include/generic"
+	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/tcl${tclv}/include/generic --with-tk=yes"
 
-#	if use X ; then
+	if use X ; then
 		#--with-x is enabled by default
 		#configure needs to find the file tkConfig.sh and tk.h
 		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
 		myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
-#	else
-#		#configure knows that tk depends on X so just disable X
-#		myconf="$myconf --without-x"
-#	fi
+	else
+		#configure knows that tk depends on X so just disable X
+		myconf="$myconf --with-tk=no"
+	fi
 
 	econf \
 		$myconf \
diff --git a/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch b/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch
new file mode 100644
index 000000000000..cea372daaacb
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.44.1.15_with-tk-no.patch
@@ -0,0 +1,117 @@
+This is a minimal patch that does not keep indentation consistent in tcl.m4
+Updating indentation would make the patch much bigger and less readable.
+
+Signed-off-by: Gilles Espinasse <g.esp@free.fr>
+
+Index: INSTALL
+===================================================================
+RCS file: /cvsroot/expect/expect/INSTALL,v
+retrieving revision 5.30
+diff -u -r5.30 INSTALL
+--- INSTALL	21 Jun 1999 18:41:41 -0000	5.30
++++ INSTALL	30 May 2009 11:51:21 -0000
+@@ -152,6 +152,7 @@
+ 
+ 	--with-tk=...		Specifies the directory containing Tk's
+ 				configure file (tkConfig.sh).
++				--with-tk=no disable Tk usage in expect
+ 
+ 	--with-tkinclude=...	Specifies the directory containing Tk's
+ 				private include files (such as tkInt.h)
+Index: Makefile.in
+===================================================================
+RCS file: /cvsroot/expect/expect/Makefile.in,v
+retrieving revision 5.45
+diff -u -r5.45 Makefile.in
+--- Makefile.in	3 Oct 2008 17:05:14 -0000	5.45
++++ Makefile.in	30 May 2009 11:51:21 -0000
+@@ -103,7 +103,11 @@
+ PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
+ 
+ lib_BINARIES	= $(PKG_LIB_FILE)
+-bin_BINARIES	= expect expectk
++bin_BINARIES	= expect
++ifneq ($(TK_BIN_DIR),)
++  bin_BINARIES	+= expectk
++endif
++
+ BINARIES	= $(lib_BINARIES) $(bin_BINARIES)
+ 
+ SHELL		= @SHELL@
+Index: tclconfig/tcl.m4
+===================================================================
+RCS file: /cvsroot/expect/expect/tclconfig/tcl.m4,v
+retrieving revision 1.3
+diff -u -r1.3 tcl.m4
+--- tclconfig/tcl.m4	25 Jan 2006 21:52:11 -0000	1.3
++++ tclconfig/tcl.m4	30 May 2009 11:51:23 -0000
+@@ -181,10 +181,12 @@
+ #
+ #	Adds the following arguments to configure:
+ #		--with-tk=...
++#		--with-tk=no disable Tk usage
+ #
+ #	Defines the following vars:
+ #		TK_BIN_DIR	Full path to the directory containing
+ #				the tkConfig.sh file
++#				Empty if Tk is disabled
+ #------------------------------------------------------------------------
+ 
+ AC_DEFUN(TEA_PATH_TKCONFIG, [
+@@ -201,6 +203,12 @@
+ 	    AC_HELP_STRING([--with-tk],
+ 		[directory containing tk configuration (tkConfig.sh)]),
+ 	    with_tkconfig=${withval})
++
++	if test x"${with_tkconfig}" = x"no" ; then
++	    AC_MSG_RESULT([Tk is disabled by --with-tk=no])
++	    unset TK_BIN_DIR
++	else
++
+ 	AC_MSG_CHECKING([for Tk configuration])
+ 	AC_CACHE_VAL(ac_cv_c_tkconfig,[
+ 
+@@ -309,6 +317,7 @@
+ 	    TK_BIN_DIR=${ac_cv_c_tkconfig}
+ 	    AC_MSG_RESULT([found ${TK_BIN_DIR}/tkConfig.sh])
+ 	fi
++	fi
+     fi
+ ])
+ 
+@@ -420,6 +429,7 @@
+ #------------------------------------------------------------------------
+ 
+ AC_DEFUN(TEA_LOAD_TKCONFIG, [
++    if test x"${with_tkconfig}" != x"no" ; then
+     AC_MSG_CHECKING([for existence of ${TK_BIN_DIR}/tkConfig.sh])
+ 
+     if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then
+@@ -501,6 +511,7 @@
+ 
+     AC_SUBST(TK_LIBS)
+     AC_SUBST(TK_XINCLUDES)
++    fi
+ ])
+ 
+ #------------------------------------------------------------------------
+@@ -3528,6 +3539,11 @@
+ #------------------------------------------------------------------------
+ 
+ AC_DEFUN(TEA_PUBLIC_TK_HEADERS, [
++    if test x"${with_tkconfig}" = x"no" ; then
++	TK_INCLUDES=""
++	AC_SUBST(TK_INCLUDES)
++    else
++
+     AC_MSG_CHECKING([for Tk public headers])
+ 
+     AC_ARG_WITH(tkinclude, [  --with-tkinclude      directory containing the public Tk header files.], with_tkinclude=${withval})
+@@ -3608,6 +3624,7 @@
+ 	fi
+ 	AC_MSG_RESULT([${INCLUDE_DIR_NATIVE}])
+     fi
++    fi
+ ])
+ 
+ #------------------------------------------------------------------------