dev-lang/tk: Add multilib support, #537400; thanks Martin Gysel (bearsh) for preparing the patch

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

2 files changed, 25 insertions, 18 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 3969b20ed008..f70bdc5f8f18 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.208 2014/12/20 09:03:03 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.209 2015/01/23 11:26:53 jlec Exp $
+
+  23 Jan 2015; Justin Lecher <jlec@gentoo.org> tk-8.6.3.ebuild:
+  Add multilib support, #537400; thanks Martin Gysel (bearsh) for preparing the
+  patch
 
 *tk-8.6.3 (20 Dec 2014)
 *tk-8.5.17 (20 Dec 2014)
diff --git a/dev-lang/tk/tk-8.6.3.ebuild b/dev-lang/tk/tk-8.6.3.ebuild
index 78f3693e71e6..a3e8a3e3abaa 100644
--- a/dev-lang/tk/tk-8.6.3.ebuild
+++ b/dev-lang/tk/tk-8.6.3.ebuild
@@ -1,10 +1,10 @@
-# 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-lang/tk/tk-8.6.3.ebuild,v 1.1 2014/12/20 09:03:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.3.ebuild,v 1.2 2015/01/23 11:26:53 jlec Exp $
 
 EAPI=5
 
-inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
+inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
 
 MY_P="${PN}${PV/_beta/b}"
 
@@ -19,15 +19,15 @@ IUSE="debug +threads truetype aqua xscreensaver"
 
 RDEPEND="
 	!aqua? (
-		media-libs/fontconfig
-		x11-libs/libX11
-		x11-libs/libXt
-		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver )
+		media-libs/fontconfig[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXt[${MULTILIB_USEDEP}]
+		truetype? ( x11-libs/libXft[${MULTILIB_USEDEP}] )
+		xscreensaver? ( x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] )
 	)
-	~dev-lang/tcl-${PV}"
+	~dev-lang/tcl-${PV}[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
-	!aqua? ( x11-proto/xproto )"
+	!aqua? ( x11-proto/xproto[${MULTILIB_USEDEP}] )"
 
 # Not bumped to 8.6
 #RESTRICT=test
@@ -66,9 +66,11 @@ src_prepare() {
 		-i tcl.m4 || die
 
 	eautoconf
+
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mylibdir=$(get_libdir)
 
 	econf \
@@ -80,11 +82,11 @@ src_configure() {
 		$(use_enable debug symbols)
 }
 
-src_test() {
+multilib_src_test() {
 	Xemake test
 }
 
-src_install() {
+multilib_src_install() {
 	#short version number
 	local v1=$(get_version_component_range 1-2)
 	local mylibdir=$(get_libdir)
@@ -124,7 +126,8 @@ src_install() {
 	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
 	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
 
-	dosym wish${v1} /usr/bin/wish
-
-	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	if multilib_is_native_abi; then
+		dosym wish${v1} /usr/bin/wish
+		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	fi
 }