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

Package-Manager: portage-2.1.2.9

7 files changed, 74 insertions, 42 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/Manifest b/dev-tcltk/tls/Manifest
index 4d1db8b7dc2c..f705d4d00e87 100644
--- a/dev-tcltk/tls/Manifest
+++ b/dev-tcltk/tls/Manifest
@@ -1,24 +1,27 @@
-DIST tls1.4.1-src.tar.gz 94074 RMD160 6e016887f37959f4d2c6c685db31a1ed212a25c9 SHA1 a8ed8124e71ab656d816fb048e05256164658f88 SHA256 c6098412b4682aee0c5622f2b53bab0c8d2a73294a7774006729083994c07d31
+AUX tls-1.5.0-bad-version.patch 540 RMD160 8c22ff1deb92649adf0e686028238bb5d0455ec9 SHA1 99575663d2654305dd7fc7e1a3c458bcab589c6d SHA256 175048c3ff600b974c03e24d1451a570d8eda1c86f3ed42714736983978c9b2d
+MD5 4e803a5e99d9e4a324f7b15463d93942 files/tls-1.5.0-bad-version.patch 540
+RMD160 8c22ff1deb92649adf0e686028238bb5d0455ec9 files/tls-1.5.0-bad-version.patch 540
+SHA256 175048c3ff600b974c03e24d1451a570d8eda1c86f3ed42714736983978c9b2d files/tls-1.5.0-bad-version.patch 540
 DIST tls1.5.0-src.tar.gz 113600 RMD160 fa37bc819ffc63f93991c876ffd318405e6bad85 SHA1 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16 SHA256 422ac2e4a812763a8f859b868c659d69769945ab754bd418b2eb07ce9bbcd253
-EBUILD tls-1.4.1.ebuild 662 RMD160 30c0db50fc131a82f8fdff88395a5b2cd483d752 SHA1 0ef1691d51e210bcaef462c052ec8dd04590fa97 SHA256 04e08d9980398f06ebf0a6c11a33f4f466428ca238664e983777f43c36ac2732
-MD5 7df24bf2316bb8388c28259bd9e9739d tls-1.4.1.ebuild 662
-RMD160 30c0db50fc131a82f8fdff88395a5b2cd483d752 tls-1.4.1.ebuild 662
-SHA256 04e08d9980398f06ebf0a6c11a33f4f466428ca238664e983777f43c36ac2732 tls-1.4.1.ebuild 662
+EBUILD tls-1.5.0-r1.ebuild 797 RMD160 4fedb6f3294ae0c61886444fe4f86c021989cdd4 SHA1 a256eb138b27a546dbab1f1b558914fb92126c1e SHA256 f2fdcd769695c761aeba01771d136b5225fa59b078e457b3c925207e6787a2ed
+MD5 347bea0c807463b894e824623e2c8cb7 tls-1.5.0-r1.ebuild 797
+RMD160 4fedb6f3294ae0c61886444fe4f86c021989cdd4 tls-1.5.0-r1.ebuild 797
+SHA256 f2fdcd769695c761aeba01771d136b5225fa59b078e457b3c925207e6787a2ed tls-1.5.0-r1.ebuild 797
 EBUILD tls-1.5.0.ebuild 667 RMD160 26d9b9965f8c16583e711da0c680a6da60e4442a SHA1 f269f46518c4a3f4478ecef39df2158cc38aaeda SHA256 97c4233048dd324cd4e855dd93f821ce50f911fc88cd4e1449ac010540c2f0d6
 MD5 166e456d62b3c5fd635b6d8dfb8c58ee tls-1.5.0.ebuild 667
 RMD160 26d9b9965f8c16583e711da0c680a6da60e4442a tls-1.5.0.ebuild 667
 SHA256 97c4233048dd324cd4e855dd93f821ce50f911fc88cd4e1449ac010540c2f0d6 tls-1.5.0.ebuild 667
-MISC ChangeLog 1423 RMD160 9465f3f1f951eb64704f1a5dc9bc69ac9e2608cb SHA1 27f8d82acd7283fb4384537013e61941d27216c3 SHA256 6c89a6f307cac0c9e63841d9aaa3f6358e2dbd5b00a653c4d658160d7eff39de
-MD5 ca5ed15cd7d4764cc05e2d1d8fc19291 ChangeLog 1423
-RMD160 9465f3f1f951eb64704f1a5dc9bc69ac9e2608cb ChangeLog 1423
-SHA256 6c89a6f307cac0c9e63841d9aaa3f6358e2dbd5b00a653c4d658160d7eff39de ChangeLog 1423
+MISC ChangeLog 1629 RMD160 3a59534e19e95172e1af06fb3605887a59fa4a81 SHA1 dfe703a7bfc755384d70addd81088242158f7c63 SHA256 a597fd8bffb774d87831b022366587360f26c9468974dd49230db31d5b03c83d
+MD5 9e793772b91d475d9f09f5d40a08991d ChangeLog 1629
+RMD160 3a59534e19e95172e1af06fb3605887a59fa4a81 ChangeLog 1629
+SHA256 a597fd8bffb774d87831b022366587360f26c9468974dd49230db31d5b03c83d ChangeLog 1629
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 MD5 43e377139ff5f3b7415b94a8c8d5260d metadata.xml 158
 RMD160 f197c34c7dd71f6025e93436e3f999137928554a metadata.xml 158
 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 metadata.xml 158
-MD5 8343a73ee334a26fcf7853267a9b0405 files/digest-tls-1.4.1 235
-RMD160 4ac0ae8b83d79d5d92e2a1f447a30943e49c2c91 files/digest-tls-1.4.1 235
-SHA256 5eccd25d9db27a940e27659baa6e2379304a033ce8202bb715cc109f3dce1a4f files/digest-tls-1.4.1 235
 MD5 f14fec3801dee85db38dec459a415f7b files/digest-tls-1.5.0 238
 RMD160 b87300d566b5eb36aa5168dab043a31c32e45f34 files/digest-tls-1.5.0 238
 SHA256 3a2584b34abb2507bde546fe53cf473cc9135d481322d6cc98a160dae4e6ffe2 files/digest-tls-1.5.0 238
+MD5 f14fec3801dee85db38dec459a415f7b files/digest-tls-1.5.0-r1 238
+RMD160 b87300d566b5eb36aa5168dab043a31c32e45f34 files/digest-tls-1.5.0-r1 238
+SHA256 3a2584b34abb2507bde546fe53cf473cc9135d481322d6cc98a160dae4e6ffe2 files/digest-tls-1.5.0-r1 238
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
+}