Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-tcltk/tls/ChangeLog6
-rw-r--r--dev-tcltk/tls/tls-1.5.0-r1.ebuild20
-rw-r--r--dev-tcltk/tls/tls-1.5.0.ebuild27
-rw-r--r--dev-tcltk/tls/tls-1.6-r1.ebuild34
-rw-r--r--dev-tcltk/tls/tls-1.6-r2.ebuild22
-rw-r--r--dev-tcltk/tls/tls-1.6.ebuild34
6 files changed, 28 insertions, 115 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/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
-}