Version bump, cleaning up configure stuff, needs to be sent upstream.

(Portage version: 2.1_pre10-r5)

6 files changed, 350 insertions, 2 deletions

diff --git a/dev-tcltk/tclcl/ChangeLog b/dev-tcltk/tclcl/ChangeLog
index ee830133d390..f9b3a4d835a3 100644
--- a/dev-tcltk/tclcl/ChangeLog
+++ b/dev-tcltk/tclcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tclcl
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/ChangeLog,v 1.11 2005/07/19 14:05:31 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/ChangeLog,v 1.12 2006/05/15 17:13:54 robbat2 Exp $
+
+*tclcl-1.17 (15 May 2006)
+
+  15 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/tclcl-1.17-configure-cleanup.patch, +tclcl-1.17.ebuild:
+  Version bump, cleaning up configure stuff, needs to be sent upstream.
 
   19 Jul 2005; David Holm <dholm@gentoo.org> tclcl-1.16.ebuild:
   Added to ~ppc.
diff --git a/dev-tcltk/tclcl/files/digest-tclcl-1.15 b/dev-tcltk/tclcl/files/digest-tclcl-1.15
index 9bcb39aab385..109a06e5c55f 100644
--- a/dev-tcltk/tclcl/files/digest-tclcl-1.15
+++ b/dev-tcltk/tclcl/files/digest-tclcl-1.15
@@ -1 +1,3 @@
 MD5 0b6403ea9303d776717855eb0828a408 tclcl-src-1.15.tar.gz 143000
+RMD160 9ae3aad5d53ba67df6a5e25f5f3813f4ad162029 tclcl-src-1.15.tar.gz 143000
+SHA256 9be16d5e7df7e201bab3611ac53c3d8894f95e6e0059477403ea8004fdd56a34 tclcl-src-1.15.tar.gz 143000
diff --git a/dev-tcltk/tclcl/files/digest-tclcl-1.16 b/dev-tcltk/tclcl/files/digest-tclcl-1.16
index 6540aeefd93e..621ffc7dc1ef 100644
--- a/dev-tcltk/tclcl/files/digest-tclcl-1.16
+++ b/dev-tcltk/tclcl/files/digest-tclcl-1.16
@@ -1 +1,3 @@
 MD5 2a25a4736c1bf4ec7f4e6343aa533bc6 tclcl-src-1.16.tar.gz 203269
+RMD160 3373ba084ed2a278f47d135af67957cf26856069 tclcl-src-1.16.tar.gz 203269
+SHA256 75efa77a0c6cd8a3bab65b794f87dceab25ed34183688bf2e564ee0cbadf8e1b tclcl-src-1.16.tar.gz 203269
diff --git a/dev-tcltk/tclcl/files/digest-tclcl-1.17 b/dev-tcltk/tclcl/files/digest-tclcl-1.17
new file mode 100644
index 000000000000..0d6f358ccf50
--- /dev/null
+++ b/dev-tcltk/tclcl/files/digest-tclcl-1.17
@@ -0,0 +1,3 @@
+MD5 39574568176c138f5d2f7fe8fba85a9c tclcl-1.17.tar.gz 157001
+RMD160 c2741cee05616f4b45e605e93896407592188855 tclcl-1.17.tar.gz 157001
+SHA256 9f5753e12d04df0781383f0141b9dfa732cefec27a01ab27b3af64ff0aa89180 tclcl-1.17.tar.gz 157001
diff --git a/dev-tcltk/tclcl/files/tclcl-1.17-configure-cleanup.patch b/dev-tcltk/tclcl/files/tclcl-1.17-configure-cleanup.patch
new file mode 100644
index 000000000000..1f51aad65157
--- /dev/null
+++ b/dev-tcltk/tclcl/files/tclcl-1.17-configure-cleanup.patch
@@ -0,0 +1,285 @@
+diff -Nuar tclcl-1.17.orig/conf/configure.in.audio tclcl-1.17/conf/configure.in.audio
+--- tclcl-1.17.orig/conf/configure.in.audio	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/conf/configure.in.audio	2006-05-15 09:57:52.141864653 -0700
+@@ -90,10 +90,10 @@
+ 	fi
+ fi
+ 
+-AC_TEST_CPP([#include <sys/audioio.h>], x=audio/audio-sun.o, x="")
++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sys/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
+ V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
+ 
+-AC_TEST_CPP([#include <sun/audioio.h>], x=audio/audio-sun.o, x="")
++AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <sun/audioio.h>]])],[x=audio/audio-sun.o],[x=""])
+ V_OBJ_AUDIO="$V_OBJ_AUDIO $x"
+ 
+ case "$target" in 
+diff -Nuar tclcl-1.17.orig/conf/configure.in.dynamic tclcl-1.17/conf/configure.in.dynamic
+--- tclcl-1.17.orig/conf/configure.in.dynamic	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/conf/configure.in.dynamic	2006-05-15 09:57:52.141864653 -0700
+@@ -59,7 +59,7 @@
+ 	# results, and the version is kept in special file).
+     
+ 	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-	    system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++	    system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	fi
+ 	if test "`uname -s`" = "AIX" ; then
+ 	    system=AIX-`uname -v`.`uname -r`
+@@ -311,7 +311,7 @@
+ 	hold_ldflags=$LDFLAGS
+ 	AC_MSG_CHECKING(for ld accepts -Bexport flag)
+ 	LDFLAGS="${LDFLAGS} -Wl,-Bexport"
+-	AC_TRY_LINK(, [int i;], found=yes, found=no)
++	AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],[found=yes],[found=no])
+ 	LDFLAGS=$hold_ldflags
+ 	AC_MSG_RESULT($found)
+ 	if test $found = yes; then
+diff -Nuar tclcl-1.17.orig/conf/configure.in.head tclcl-1.17/conf/configure.in.head
+--- tclcl-1.17.orig/conf/configure.in.head	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/conf/configure.in.head	2006-05-15 09:57:52.145864644 -0700
+@@ -32,12 +32,12 @@
+ fi
+ 
+ 
+-AC_CANONICAL_SYSTEM
++AC_CANONICAL_TARGET([])
+ 
+ AC_PROG_CC
+ AC_PROG_CXX
+-AC_STDC_HEADERS
+-AC_HAVE_HEADERS(string.h)
++AC_HEADER_STDC([])
++AC_CHECK_HEADERS([string.h])
+ 
+ V_INCLUDE=""
+ V_LIB=""
+@@ -76,8 +76,7 @@
+ else
+     if test "$CC" = gcc ; then
+ 	    AC_MSG_CHECKING(that $CXX can handle -O2)
+-	    AC_TRY_COMPILE(,
+-		#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
++	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[#if __GNUC__ < 2  || __GNUC_MINOR__ < 8
+ 		/* gcc */
+ 		error
+ 		#endif
+@@ -85,9 +84,9 @@
+ 		/* egcs */
+ 		int error;
+ 		#endif
+-	    ,AC_MSG_RESULT(yes)
+-	    OonS="-O2",			# Optimize on Steroids
+-	    AC_MSG_RESULT(no))
++	    ]])],[AC_MSG_RESULT(yes)
++	    OonS="-O2"],[# Optimize on Steroids
++	    AC_MSG_RESULT(no)])
+     fi
+ fi
+ 
+@@ -152,19 +151,16 @@
+ 
+ # Checking validity of STL
+ AC_MSG_CHECKING(standard STL is available)
+-AC_LANG_SAVE
+-AC_LANG_CPLUSPLUS
++
++AC_LANG_PUSH([C++])
+ enable_stl="no"
+-AC_TRY_COMPILE(
+-	#include <list>
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <list>
+ 	#include <hash_map>
+ 	template <class _T> class tlist : public list <_T> {};
+-	,
+-	return 0;
+-	,AC_MSG_RESULT(yes)
+-	enable_stl="yes",
+-	AC_MSG_RESULT(no))
+-AC_LANG_RESTORE
++	]], [[return 0;
++	]])],[AC_MSG_RESULT(yes)
++	enable_stl="yes"],[AC_MSG_RESULT(no)])
++AC_LANG_POP([C++])
+ 
+ # This can be extended to support compilation-time module selection
+ V_STLOBJ=""
+diff -Nuar tclcl-1.17.orig/conf/configure.in.int64_t tclcl-1.17/conf/configure.in.int64_t
+--- tclcl-1.17.orig/conf/configure.in.int64_t	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/conf/configure.in.int64_t	2006-05-15 09:57:52.145864644 -0700
+@@ -22,19 +22,17 @@
+ fi
+ 
+ AC_CACHE_CHECK([for __int64_t],int64_t_HAVE___INT64_T,[
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ main() { __int64_t x; exit (sizeof(x) >= 8 ? 0 : 1); }
+-],
+-int64_t_HAVE___INT64_T=yes,int64_t_HAVE___INT64_T=no,int64_t_HAVE___INT64_T=cross)])
++]])],[int64_t_HAVE___INT64_T=yes],[int64_t_HAVE___INT64_T=no],[int64_t_HAVE___INT64_T=cross])])
+ if test x"$int64_t_HAVE___INT64_T" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
+ 	INT64_T_ALTERNATIVE=__int64_t
+ fi
+ 
+ AC_CACHE_CHECK([for long long],int64_t_HAVE_LONG_LONG,[
+-AC_TRY_RUN([
++AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ main() { long long x; exit (sizeof(x) >= 8 ? 0 : 1); }
+-],
+-int64_t_HAVE_LONG_LONG=yes,int64_t_HAVE_LONG_LONG=no,int64_t_HAVE_LONG_LONG=cross)])
++]])],[int64_t_HAVE_LONG_LONG=yes],[int64_t_HAVE_LONG_LONG=no],[int64_t_HAVE_LONG_LONG=cross])])
+ if test x"$int64_t_HAVE_LONG_LONG" = x"yes" -a "x$INT64_T_ALTERNATIVE" = xnone; then
+ 	INT64_T_ALTERNATIVE="long long"
+ fi
+diff -Nuar tclcl-1.17.orig/conf/configure.in.nse tclcl-1.17/conf/configure.in.nse
+--- tclcl-1.17.orig/conf/configure.in.nse	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/conf/configure.in.nse	2006-05-15 09:57:52.145864644 -0700
+@@ -9,20 +9,20 @@
+ dnl
+ 
+ AC_MSG_CHECKING([for struct ether_header])
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdio.h>
+ #include <net/ethernet.h>
+-], [
++]], [[
+ int main()
+ {
+ 	struct ether_header etherHdr;
+ 
+ 	return 1;
+ }
+-], [
++]])],[
+ AC_DEFINE(HAVE_ETHER_HEADER_STRUCT)
+ AC_MSG_RESULT(found)
+-], [
++],[
+ AC_MSG_RESULT(not found)
+ ])
+  
+@@ -31,20 +31,20 @@
+ dnl Look for ether_addr
+ dnl
+ AC_MSG_CHECKING([for struct ether_addr])
+-AC_TRY_COMPILE([
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdio.h>
+ #include <net/ethernet.h>
+-], [
++]], [[
+ int main()
+ {
+ 	struct ether_addr etherAddr;
+ 
+ 	return 0;
+ }
+-], [
++]])],[
+ AC_DEFINE(HAVE_ETHER_ADDRESS_STRUCT)
+ AC_MSG_RESULT(found)
+-], [
++],[
+ AC_MSG_RESULT(not found)
+ ])
+ 
+@@ -57,14 +57,13 @@
+ dnl
+ dnl look for SIOCGIFHWADDR
+ dnl
+-AC_TRY_RUN(
+-#include <stdio.h>
++AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
+ #include <sys/ioctl.h>
+ int main()
+ {
+ 	int i = SIOCGIFHWADDR;
+ 	return 0;
+ }
+-, AC_DEFINE(HAVE_SIOCGIFHWADDR), , echo 1
+-)
++]])],[AC_DEFINE(HAVE_SIOCGIFHWADDR)],[],[echo 1
++])
+ 
+diff -Nuar tclcl-1.17.orig/conf/configure.in.perl tclcl-1.17/conf/configure.in.perl
+--- tclcl-1.17.orig/conf/configure.in.perl	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/conf/configure.in.perl	2006-05-15 09:57:52.145864644 -0700
+@@ -19,8 +19,8 @@
+ dnl
+ AC_DEFUN(CHECK_PERL_VERSION,
+ [
+-echo $[$1] -e "require $[$2]" 1>&AC_FD_CC
+-if $[$1] -e "require $[$2]" 2>&AC_FD_CC
++echo $[$1] -e "require $[$2]" 1>&AS_MESSAGE_LOG_FD()
++if $[$1] -e "require $[$2]" 2>&AS_MESSAGE_LOG_FD()
+ then
+     : good version
+ else
+diff -Nuar tclcl-1.17.orig/conf/configure.in.tail tclcl-1.17/conf/configure.in.tail
+--- tclcl-1.17.orig/conf/configure.in.tail	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/conf/configure.in.tail	2006-05-15 09:57:52.145864644 -0700
+@@ -144,7 +144,8 @@
+ 
+ dnl backwards compability---if nothing else, do Makefile
+ define([AcOutputFiles],ifdef([AcOutputFiles],AcOutputFiles,Makefile))
+-AC_OUTPUT(AcOutputFiles)
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
+ 
+ if test ! -d gen ; then 
+ 	echo "creating ./gen"
+diff -Nuar tclcl-1.17.orig/conf/configure.in.tcl tclcl-1.17/conf/configure.in.tcl
+--- tclcl-1.17.orig/conf/configure.in.tcl	2006-05-15 09:56:25.000000000 -0700
++++ tclcl-1.17/conf/configure.in.tcl	2006-05-15 09:57:52.145864644 -0700
+@@ -84,6 +84,9 @@
+ 		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include \
++		$d/lib/tcl$TCL_HI_VERS/include \
++		$d/lib/tcl$TCL_VERS/include \
++		$d/lib/tcl$TCL_ALT_VERS/include \
+ 		"
+ TCL_H_PLACES=" \
+ 		../include \
+@@ -134,7 +137,14 @@
+ 		/usr/include/tcl$TCL_VERS \
+ 		/usr/include/tcl$TCL_HI_VERS \
+ 		/usr/include/tcl$TCL_ALT_VERS \
+-		/usr/include/tcl"
++		/usr/include/tcl \
++		/usr/lib/tcl$TCL_VERS/include/unix \
++		/usr/lib/tcl$TCL_HI_VERS/include/unix \
++		/usr/lib/tcl$TCL_ALT_VERS/include/unix \
++		/usr/lib/tcl$TCL_VERS/include/generic \
++		/usr/lib/tcl$TCL_HI_VERS/include/generic \
++		/usr/lib/tcl$TCL_ALT_VERS/include/generic \
++		"
+ dnl /usr/include/tcl is for Debian Linux
+ dnl /usr/include/tcl-private/generic is for FC 4
+ TCL_LIB_PLACES_D="$d \
+diff -Nuar tclcl-1.17.orig/conf/configure.in.x11 tclcl-1.17/conf/configure.in.x11
+--- tclcl-1.17.orig/conf/configure.in.x11	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/conf/configure.in.x11	2006-05-15 09:57:52.145864644 -0700
+@@ -33,7 +33,7 @@
+ 
+ echo "checking for X11 header files"
+ if test "$x_includes" = NONE ; then
+-	AC_TEST_CPP([#include <X11/Intrinsic.h>],x_includes="",x_includes=NONE)
++	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <X11/Intrinsic.h>]])],[x_includes=""],[x_includes=NONE])
+ 	if test "$x_includes" = NONE ; then
+ 	        for i in $xincdirs ; do
+ 			if test -r $i/X11/Intrinsic.h; then
+diff -Nuar tclcl-1.17.orig/configure.in tclcl-1.17/configure.in
+--- tclcl-1.17.orig/configure.in	2005-10-02 14:26:19.000000000 -0700
++++ tclcl-1.17/configure.in	2006-05-15 09:58:33.000000000 -0700
+@@ -1,7 +1,8 @@
+ dnl 'autoconf' input file for the LBL C++ object Tcl library
+ dnl $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/files/tclcl-1.17-configure-cleanup.patch,v 1.1 2006/05/15 17:13:54 robbat2 Exp $ (LBL)
+ 
+-AC_INIT(Tcl.cc)
++AC_INIT
++AC_CONFIG_SRCDIR([Tcl.cc])
+ 
+ AC_CONFIG_HEADERS([config.h:config.h.in])
+ 
diff --git a/dev-tcltk/tclcl/tclcl-1.17.ebuild b/dev-tcltk/tclcl/tclcl-1.17.ebuild
new file mode 100644
index 000000000000..530b4605527d
--- /dev/null
+++ b/dev-tcltk/tclcl/tclcl-1.17.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclcl/tclcl-1.17.ebuild,v 1.1 2006/05/15 17:13:54 robbat2 Exp $
+
+inherit eutils autotools
+
+#MY_P="${PN}-src-${PV}"
+DESCRIPTION="Tcl/C++ interface library"
+HOMEPAGE="http://otcl-tclcl.sourceforge.net/tclcl/"
+SRC_URI="mirror://sourceforge/otcl-tclcl/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/tcl-8.4.5
+		>=dev-lang/tk-8.4.5
+		>=dev-tcltk/otcl-1.11"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.16-http.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.17-configure-cleanup.patch
+	cd ${S}
+	eautoconf
+	elibtoolize
+	libtoolize -f
+}
+
+src_compile() {
+	local tclv tkv myconf
+
+	tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
+	tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
+	myconf="--with-tcl-ver=${tclv} --with-tk-ver=${tkv}"
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dolib.a libtclcl.a
+	dobin tcl2c++
+	insinto /usr/include
+	doins *.h
+
+	dodoc FILES README VERSION
+	dohtml CHANGES.html
+}