jlec 15/01/23 11:26:53 Modified: ChangeLog tk-8.6.3.ebuild Log: 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!)
Revision Changes Path 1.209 dev-lang/tk/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.209&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.209&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.208&r2=1.209 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- ChangeLog 20 Dec 2014 09:03:03 -0000 1.208 +++ ChangeLog 23 Jan 2015 11:26:53 -0000 1.209 @@ -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 <[email protected]> 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) 1.2 dev-lang/tk/tk-8.6.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.6.3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.6.3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.6.3.ebuild?r1=1.1&r2=1.2 Index: tk-8.6.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tk-8.6.3.ebuild 20 Dec 2014 09:03:03 -0000 1.1 +++ tk-8.6.3.ebuild 23 Jan 2015 11:26:53 -0000 1.2 @@ -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 @@ 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 @@ -i tcl.m4 || die eautoconf + + multilib_copy_sources } -src_configure() { +multilib_src_configure() { local mylibdir=$(get_libdir) econf \ @@ -80,11 +82,11 @@ $(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 @@ 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 }
