Fix tcl/tk slotting; Bump to EAPI=5

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 58 insertions, 49 deletions

diff --git a/dev-tcltk/tls/ChangeLog b/dev-tcltk/tls/ChangeLog
index 4ffdc0bf710a..92aaf0243dab 100644
--- a/dev-tcltk/tls/ChangeLog
+++ b/dev-tcltk/tls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tls
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/ChangeLog,v 1.35 2014/08/10 21:26:41 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/ChangeLog,v 1.36 2015/03/20 12:12:41 jlec Exp $
+
+*tls-1.6-r3 (20 Mar 2015)
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> +tls-1.6-r3.ebuild,
+  -tls-1.5.0-r1.ebuild, tls-1.6-r2.ebuild:
+  Fix tcl/tk slotting; Bump to EAPI=5
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> tls-1.5.0-r1.ebuild,
   tls-1.6-r2.ebuild:
diff --git a/dev-tcltk/tls/tls-1.5.0-r1.ebuild b/dev-tcltk/tls/tls-1.5.0-r1.ebuild
deleted file mode 100644
index 9c4787424f58..000000000000
--- a/dev-tcltk/tls/tls-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 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.10 2014/08/10 21:26:41 slyfox 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
-	dev-libs/openssl
-	tk? ( dev-lang/tk )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}${PV%.*}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-bad-version.patch
-
-}
-
-src_compile() {
-	econf --with-ssl-dir=/usr
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog README.txt || die
-	dohtml tls.htm || die
-}
diff --git a/dev-tcltk/tls/tls-1.6-r2.ebuild b/dev-tcltk/tls/tls-1.6-r2.ebuild
index 5cf98c28b278..6350749972d1 100644
--- a/dev-tcltk/tls/tls-1.6-r2.ebuild
+++ b/dev-tcltk/tls/tls-1.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.9 2014/08/10 21:26:41 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.6-r2.ebuild,v 1.10 2015/03/20 12:12:41 jlec Exp $
 
 EAPI="3"
 
@@ -18,9 +18,9 @@ KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-mac
 IUSE="tk"
 
 DEPEND="
-	dev-lang/tcl
-	dev-libs/openssl
-	tk? ( dev-lang/tk )"
+	dev-lang/tcl:0
+	dev-libs/openssl:0
+	tk? ( dev-lang/tk:0 )"
 RDEPEND="${DEPEND}"
 
 RESTRICT="test"
diff --git a/dev-tcltk/tls/tls-1.6-r3.ebuild b/dev-tcltk/tls/tls-1.6-r3.ebuild
new file mode 100644
index 000000000000..c6e8364bd7f6
--- /dev/null
+++ b/dev-tcltk/tls/tls-1.6-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tls/tls-1.6-r3.ebuild,v 1.1 2015/03/20 12:12:41 jlec Exp $
+
+EAPI=5
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tk"
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-libs/openssl:0=
+	tk? ( dev-lang/tk:0= )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--with-ssl-dir="${EPREFIX}/usr" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+	dohtml tls.htm
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this is ugly, but fixing the makefile mess is even worse
+		local loc=usr/$(get_libdir)/tls1.6/libtls1.6.dylib
+		install_name_tool -id "${EPREFIX}"/${loc} "${ED}"/${loc} || die
+	fi
+}