Fixed to work with tcl-8.5, bug #173542.

(Portage version: 2.1.2.9)

6 files changed, 59 insertions, 30 deletions

diff --git a/dev-tcltk/tls/ChangeLog b/dev-tcltk/tls/ChangeLog
index d08a8d9f5791..aef83915b49f 100644
--- a/dev-tcltk/tls/ChangeLog
+++ b/dev-tcltk/tls/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/tls
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/ChangeLog,v 1.16 2007/03/31 02:06:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/ChangeLog,v 1.17 2007/07/21 03:46:48 matsuu Exp $
+
+*tls-1.5.0-r1 (21 Jul 2007)
+
+  21 Jul 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/tls-1.5.0-bad-version.patch, -tls-1.4.1.ebuild,
+  +tls-1.5.0-r1.ebuild:
+  Fixed to work with tcl-8.5, bug #173542.
 
   31 Mar 2007; Jeroen Roovers <jer@gentoo.org> tls-1.5.0.ebuild:
   Stable for HPPA too.
diff --git a/dev-tcltk/tls/files/digest-tls-1.4.1 b/dev-tcltk/tls/files/digest-tls-1.4.1
deleted file mode 100644
index c5ebd8708c21..000000000000
--- a/dev-tcltk/tls/files/digest-tls-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 358bc16e8fd5a335dbf2e855426885d2 tls1.4.1-src.tar.gz 94074
-RMD160 6e016887f37959f4d2c6c685db31a1ed212a25c9 tls1.4.1-src.tar.gz 94074
-SHA256 c6098412b4682aee0c5622f2b53bab0c8d2a73294a7774006729083994c07d31 tls1.4.1-src.tar.gz 94074
diff --git a/dev-tcltk/tls/files/digest-tls-1.5.0-r1 b/dev-tcltk/tls/files/digest-tls-1.5.0-r1
new file mode 100644
index 000000000000..662390185a64
--- /dev/null
+++ b/dev-tcltk/tls/files/digest-tls-1.5.0-r1
@@ -0,0 +1,3 @@
+MD5 9eeab472475773b3810acc808ebec759 tls1.5.0-src.tar.gz 113600
+RMD160 fa37bc819ffc63f93991c876ffd318405e6bad85 tls1.5.0-src.tar.gz 113600
+SHA256 422ac2e4a812763a8f859b868c659d69769945ab754bd418b2eb07ce9bbcd253 tls1.5.0-src.tar.gz 113600
diff --git a/dev-tcltk/tls/files/tls-1.5.0-bad-version.patch b/dev-tcltk/tls/files/tls-1.5.0-bad-version.patch
new file mode 100644
index 000000000000..a55a00c6d5f0
--- /dev/null
+++ b/dev-tcltk/tls/files/tls-1.5.0-bad-version.patch
@@ -0,0 +1,10 @@
+diff -ur tls1.5_org/pkgIndex.tcl.in tls1.5/pkgIndex.tcl.in
+--- tls1.5_org/pkgIndex.tcl.in	2007-04-05 23:09:11.000000000 +0200
++++ tls1.5/pkgIndex.tcl.in	2007-04-05 23:09:40.000000000 +0200
+@@ -5,5 +5,5 @@
+ #    replace the original which didn't include the commands from "tls.tcl".
+ #
+ 
+-package ifneeded tls 1.5 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]"
++package ifneeded tls 1.50 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]"
+ 
diff --git a/dev-tcltk/tls/tls-1.4.1.ebuild b/dev-tcltk/tls/tls-1.4.1.ebuild
deleted file mode 100644
index a54e6ab3b9c3..000000000000
--- a/dev-tcltk/tls/tls-1.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.4.1.ebuild,v 1.13 2005/04/02 15:47:46 weeve Exp $
-
-DESCRIPTION="TLS OpenSSL extension to Tcl."
-HOMEPAGE="http://tls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tls/${PN}${PV}-src.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 hppa alpha ppc amd64 sparc"
-IUSE=""
-DEPEND=">=dev-lang/tcl-8.3.3
-		>=dev-lang/tk-8.3.3
-		dev-libs/openssl"
-
-S=${WORKDIR}/tls1.4
-
-src_compile() {
-	econf --with-ssl-dir=/usr || die
-	make || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog README.txt license.terms
-}
diff --git a/dev-tcltk/tls/tls-1.5.0-r1.ebuild b/dev-tcltk/tls/tls-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..dc8a51cdf53b
--- /dev/null
+++ b/dev-tcltk/tls/tls-1.5.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.5.0-r1.ebuild,v 1.1 2007/07/21 03:46:48 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="TLS OpenSSL extension to Tcl."
+HOMEPAGE="http://tls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tls/${PN}${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="tk"
+
+DEPEND=">=dev-lang/tcl-8.3.3
+	dev-libs/openssl
+	tk? ( >=dev-lang/tk-8.3.3 )"
+
+S="${WORKDIR}/${PN}${PV%.*}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-bad-version.patch
+
+}
+
+src_compile() {
+	econf --with-ssl-dir=/usr || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc ChangeLog README.txt
+	dohtml tls.htm
+}