Cleaned old, QA on quoting, die

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

7 files changed, 41 insertions, 121 deletions

diff --git a/dev-tcltk/tls/ChangeLog b/dev-tcltk/tls/ChangeLog
index 0b860d31f23a..edf0e6108b66 100644
--- a/dev-tcltk/tls/ChangeLog
+++ b/dev-tcltk/tls/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/tls
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/ChangeLog,v 1.31 2010/10/23 17:51:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/ChangeLog,v 1.32 2010/12/15 19:35:43 jlec Exp $
+
+  15 Dec 2010; Justin Lecher <jlec@gentoo.org> -tls-1.5.0.ebuild,
+  tls-1.5.0-r1.ebuild, -tls-1.6.ebuild, -tls-1.6-r1.ebuild, tls-1.6-r2.ebuild:
+  Cleaned old, QA on quoting, die
 
   23 Oct 2010; Raúl Porcel <armin76@gentoo.org> tls-1.6-r2.ebuild:
   sparc stable wrt #332415
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
index d3c8e1e69300..6cef6beac798 100644
--- a/dev-tcltk/tls/Manifest
+++ b/dev-tcltk/tls/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tls-1.5.0-bad-version.patch 540 RMD160 8c22ff1deb92649adf0e686028238bb5d0455ec9 SHA1 99575663d2654305dd7fc7e1a3c458bcab589c6d SHA256 175048c3ff600b974c03e24d1451a570d8eda1c86f3ed42714736983978c9b2d
 DIST tls1.5.0-src.tar.gz 113600 RMD160 fa37bc819ffc63f93991c876ffd318405e6bad85 SHA1 66611f384f4b1c5e126ac8fc1cd03040bbe8ac16 SHA256 422ac2e4a812763a8f859b868c659d69769945ab754bd418b2eb07ce9bbcd253
 DIST tls1.6-src.tar.gz 168043 RMD160 7f833422dadcab06b3c251f5b7a67a0a1c8fe6a1 SHA1 badee4d0a096e9951ffc1f82a6530f78b2404a2c SHA256 adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3
-EBUILD tls-1.5.0-r1.ebuild 808 RMD160 9ed6ead145f0b1765ba30edfcb5d70cf3ed9c584 SHA1 64eb3646ebc136da3f9aa284abd642f4aca78251 SHA256 83c34a83dd3ebda9fc2e2be8f52a8cedd28bec58c057b3aba7622706495ce95d
-EBUILD tls-1.5.0.ebuild 667 RMD160 26d9b9965f8c16583e711da0c680a6da60e4442a SHA1 f269f46518c4a3f4478ecef39df2158cc38aaeda SHA256 97c4233048dd324cd4e855dd93f821ce50f911fc88cd4e1449ac010540c2f0d6
-EBUILD tls-1.6-r1.ebuild 757 RMD160 03f6535a127d24f320987926956543476c95e4bc SHA1 ea7152139e5f1e002b4a9643d5a00f58d2c75a0a SHA256 3f0eb2d128208f2eace4d9027fec9d7b802171bdcb829f9288ce7a0797347aa4
-EBUILD tls-1.6-r2.ebuild 1093 RMD160 4e6a5fd83c1eb3d2bbb112adaa8f8b2403a13b9f SHA1 049f10d11af5d854c64b8fc3ef913cc0a508f38d SHA256 ac864997368e9e6d14d4583972ce4d9ef032370c1cb4a279d0eccdd0a4998b3a
-EBUILD tls-1.6.ebuild 734 RMD160 5db51e950e38aba47054ce868c40a3d2f1b79e30 SHA1 47f0c1e5087faedbb2c46a21fb056c09b6837dc5 SHA256 a6b4214a52dc03d64275830130672eec0e158e7e88e62d489530cdd7463f31e8
-MISC ChangeLog 3109 RMD160 bd1dd0e7fc3cde86c53d0a8e3bb86a303ac45b6e SHA1 4c43b2bb4f9c26d3b7edac52290c70aa1505369d SHA256 30404f3c7b9e1a59b0ffd59779d58cd007fa1afe57b056e48ad2563a379fcce7
+EBUILD tls-1.5.0-r1.ebuild 819 RMD160 8341163a5d9fe318f95cf220a694550b675fa596 SHA1 f9f0b62ec9a0d29d535c841695a0082053b5a795 SHA256 96355193316bfdef23cedf5a5ce6ac37d393673a61b096f7ee09b39a4f72dcd1
+EBUILD tls-1.6-r2.ebuild 1100 RMD160 75c97a490bc2f92d4fab7ea243e37fc073ae71a7 SHA1 b4609807e51dd0765291f6221f34e7543073bbfd SHA256 20387d1b850eddc47838b7286cf87bd10d583af18713637ea62e7f2e8575c34b
+MISC ChangeLog 3286 RMD160 79c1f3a566a41e7f82c2b025abac7d47a2c550f9 SHA1 a2dae5c79da9141d69bcf589f82e9544f7832e30 SHA256 3905a9a1515dfe4fbdbf50a0862a8389c390f775c2d53d445dded8ff7e88af3d
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0JGJUACgkQgAnW8HDreRZZJgCfcOPSUU6H7T95xOroxvN/XiOo
+rjEAoI8hq0u/nsP2fyTSVS7loPTqMVBG
+=Ews2
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tls/tls-1.5.0-r1.ebuild b/dev-tcltk/tls/tls-1.5.0-r1.ebuild
index d56f1ece4d45..5ed5cc9b6425 100644
--- a/dev-tcltk/tls/tls-1.5.0-r1.ebuild
+++ b/dev-tcltk/tls/tls-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.8 2009/09/22 11:40:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.5.0-r1.ebuild,v 1.9 2010/12/15 19:35:43 jlec Exp $
 
 inherit eutils
 
@@ -13,11 +13,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE="tk"
 
-RESTRICT="test"
-
-DEPEND=">=dev-lang/tcl-8.3.3
+DEPEND="
+	dev-lang/tcl
 	dev-libs/openssl
-	tk? ( >=dev-lang/tk-8.3.3 )"
+	tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
 
 S="${WORKDIR}/${PN}${PV%.*}"
 
@@ -29,12 +31,12 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-ssl-dir=/usr || die
+	econf --with-ssl-dir=/usr
 	emake || die
 }
 
 src_install() {
 	einstall || die
-	dodoc ChangeLog README.txt
-	dohtml tls.htm
+	dodoc ChangeLog README.txt || die
+	dohtml tls.htm || die
 }
diff --git a/dev-tcltk/tls/tls-1.5.0.ebuild b/dev-tcltk/tls/tls-1.5.0.ebuild
deleted file mode 100644
index 38d0c1000a3e..000000000000
--- a/dev-tcltk/tls/tls-1.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.ebuild,v 1.10 2007/03/31 02:06:06 jer 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="alpha amd64 hppa ppc sparc x86"
-IUSE="X"
-
-DEPEND=">=dev-lang/tcl-8.3.3
-	dev-libs/openssl
-	X? ( >=dev-lang/tk-8.3.3 )"
-
-S=${WORKDIR}/tls1.5
-
-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.6-r1.ebuild b/dev-tcltk/tls/tls-1.6-r1.ebuild
deleted file mode 100644
index 2ee22bfe1634..000000000000
--- a/dev-tcltk/tls/tls-1.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.6-r1.ebuild,v 1.1 2009/11/16 19:57:19 mescalinum Exp $
-
-inherit eutils
-
-MY_P="${PN}${PV}"
-DESCRIPTION="TLS OpenSSL extension to Tcl."
-HOMEPAGE="http://tls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tls/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="tk"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/tcl-8.3.3
-	dev-libs/openssl
-	tk? ( >=dev-lang/tk-8.3.3 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf --with-ssl-dir=/usr || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README.txt
-	dohtml tls.htm
-}
diff --git a/dev-tcltk/tls/tls-1.6-r2.ebuild b/dev-tcltk/tls/tls-1.6-r2.ebuild
index 50ab065221a8..f8c2f78ab4b4 100644
--- a/dev-tcltk/tls/tls-1.6-r2.ebuild
+++ b/dev-tcltk/tls/tls-1.6-r2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.6-r2.ebuild,v 1.5 2010/10/23 17:51:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.6-r2.ebuild,v 1.6 2010/12/15 19:35:43 jlec Exp $
 
 EAPI="3"
 
 inherit eutils multilib
 
 MY_P="${PN}${PV}"
+
 DESCRIPTION="TLS OpenSSL extension to Tcl."
 HOMEPAGE="http://tls.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tls/${MY_P}-src.tar.gz"
@@ -16,25 +17,26 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 hppa ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="tk"
 
-RESTRICT="test"
-
-DEPEND=">=dev-lang/tcl-8.3.3
+DEPEND="
+	dev-lang/tcl
 	dev-libs/openssl
-	tk? ( >=dev-lang/tk-8.3.3 )"
+	tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	econf \
-		--with-ssl-dir="${EPREFIX}"/usr \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		|| die
+		--with-ssl-dir="${EPREFIX}/usr" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README.txt
-	dohtml tls.htm
+	dodoc ChangeLog README.txt || die
+	dohtml tls.htm || die
 
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# this is ugly, but fixing the makefile mess is even worse
diff --git a/dev-tcltk/tls/tls-1.6.ebuild b/dev-tcltk/tls/tls-1.6.ebuild
deleted file mode 100644
index a1f5c78d15d4..000000000000
--- a/dev-tcltk/tls/tls-1.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.6.ebuild,v 1.1 2009/04/26 16:29:27 mescalinum Exp $
-
-inherit eutils
-
-MY_P="${PN}${PV}"
-DESCRIPTION="TLS OpenSSL extension to Tcl."
-HOMEPAGE="http://tls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tls/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="tk"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/tcl-8.3.3
-	dev-libs/openssl
-	tk? ( >=dev-lang/tk-8.3.3 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf --with-ssl-dir=/usr || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog README.txt
-	dohtml tls.htm
-}