Revert static-libs handling, #406905; push changes from 8.5.10 to .11

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

3 files changed, 18 insertions, 14 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index baa60aa5349f..d0432d6a1b20 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.158 2012/03/02 20:20:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.159 2012/03/04 20:13:49 jlec Exp $
+
+  04 Mar 2012; Justin Lecher <jlec@gentoo.org> tk-8.5.10.ebuild,
+  tk-8.5.11.ebuild:
+  Revert static-libs handling, #406905; push changes from 8.5.10 to .11
 
   02 Mar 2012; Brent Baude <ranger@gentoo.org> tk-8.5.10.ebuild:
   Marking tk-8.5.10 ppc64 for bug 406607
diff --git a/dev-lang/tk/tk-8.5.10.ebuild b/dev-lang/tk/tk-8.5.10.ebuild
index 204cccbd1d02..7bc5b1b4596d 100644
--- a/dev-lang/tk/tk-8.5.10.ebuild
+++ b/dev-lang/tk/tk-8.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild,v 1.3 2012/03/02 20:20:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.10.ebuild,v 1.4 2012/03/04 20:13:49 jlec Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug static-libs threads truetype aqua xscreensaver"
+IUSE="debug threads truetype aqua xscreensaver"
 
 RDEPEND="
 	!aqua? (
@@ -102,6 +102,7 @@ src_install() {
 	# install symlink for libraries
 	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
 	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
 
 	if use static-libs; then
 		dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
diff --git a/dev-lang/tk/tk-8.5.11.ebuild b/dev-lang/tk/tk-8.5.11.ebuild
index 0a9cc6c0fe80..7bd6fad9794c 100644
--- a/dev-lang/tk/tk-8.5.11.ebuild
+++ b/dev-lang/tk/tk-8.5.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.1 2012/03/02 15:31:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.2 2012/03/04 20:13:49 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit autotools eutils multilib toolchain-funcs prefix
 
@@ -61,8 +61,7 @@ src_configure() {
 }
 
 src_compile() {
-	cd "${S}"/unix
-	emake || die
+	cd "${S}"/unix && emake
 }
 
 src_install() {
@@ -71,7 +70,7 @@ src_install() {
 	v1=${PV%.*}
 
 	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
+	S= emake DESTDIR="${D}" install
 
 	# normalize $S path, bug #280766 (pkgcore)
 	local nS="$(cd "${S}"; pwd)"
@@ -94,20 +93,20 @@ src_install() {
 
 	# install private headers
 	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/unix/*.h || die
+	doins "${S}"/unix/*.h
 	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${S}"/generic/*.h || die
+	doins "${S}"/generic/*.h
 	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
 	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
 	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
 
 	# install symlink for libraries
 	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) || die
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a || die
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
 
-	dosym wish${v1} /usr/bin/wish || die
+	dosym wish${v1} /usr/bin/wish
 
 	cd "${S}"
-	dodoc ChangeLog* README changes || die
+	dodoc ChangeLog* README changes
 }