From a1b591bb0013650ae438b51eee7d6a74f5da73db Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 23 Jan 2015 11:27:29 +0000 Subject: [PATCH] dev-lang/tk: Add multilib support, #537400; thanks Martin Gysel (bearsh) for preparing the patch Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- dev-lang/tk/ChangeLog | 8 ++++++-- dev-lang/tk/Manifest | 36 +++++++++++++++++++----------------- dev-lang/tk/tk-8.6.3.ebuild | 35 +++++++++++++++++++---------------- 3 files changed, 44 insertions(+), 35 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 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/Manifest b/dev-lang/tk/Manifest index 1d16b38f287b..4a891813dd15 100644 --- a/dev-lang/tk/Manifest +++ b/dev-lang/tk/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX tcl-8.5.9-gentoo-fbsd.patch 475 SHA256 5f7c415260c124f7515b8621535ba277add91b584149283543a92f5f2613dc75 SHA512 4cab5fefca03337a9f74e0df330d055ff9ebb930a3a84ef84aa45399faf9685f4a7c5c9f86b1bc71dd8a13b7ed7b42ac4485081f358f5fd28892e6ff277a2a63 WHIRLPOOL 02454a19ac2c1a25306676306b4c13fb882463c577545b65a3e3aaf93f6b3e0eb5b91c6e2c86fae601c5a7b1dc2bf6ec99be75aa4b335a16008a55427cd27d4d AUX tk-8.4-lastevent.patch 1095 SHA256 73bdd40b9e04ad705ac8956ea96967aaee5ac8ee9588a43e5c1bf30d50c0996d SHA512 50b804357484e5fb90ad1d3560db107cde8b2b0ae0363c152276fa941a21c19705ccee0e26265264bcd06c0cafb1ed90f6f5b413ff0851d0658ac03250a8aaf6 WHIRLPOOL 2c5a87016a6e7e7bbcd3ef82a70c00c1a152c70fe4409bf4f7a5c17e8b920adddc7d63deb0ac1662dfa882435db3e222311512a3317023a4c96acb4ebbd0510f @@ -28,23 +28,25 @@ EBUILD tk-8.5.16.ebuild 3548 SHA256 466c011875590155832aea8eda86fc40b921cd0c6b78 EBUILD tk-8.5.17.ebuild 3556 SHA256 47031cdf1240e2953836211ccea349b3ee5c54efd1da1f06e31abcfad5f459cd SHA512 5d3285208bd0a61aad6e9a4949c9ffd15efccb720db204d8d5fccb84e3c5a411b12c64cbd17091b25d22a7021a9abd74b3b05e1e069c6d59d87fd7c7f74d5f89 WHIRLPOOL 89984ba4e7661a26e3d9a6f711c69cc91b9fd48732e53f15ac5163d58d0845e8312aea81cc7ee41d0d8df343642545e16215fb1cdbcd344df256a02899483c14 EBUILD tk-8.6.1.ebuild 3829 SHA256 171b8134eac7e672a1d08a563d6708e46bde4803b0e6688668f81ac0c1bb448a SHA512 b4748b02a114b155babb6ae7dcd992ea5686dc2d893662382b9fb6ac2e483ae9f4f21a57629ca47001a02b07b425ec6baf9b49f34c19f959df5c057933130f97 WHIRLPOOL 6cf3bcd288c601739d2eeeead866747bffe9dd0ea726aba062c0f842a1648ad5595a6d0b505a0e8f1784bd6a4a1d4068a2f9354f69956830d3ff58a00e0af37d EBUILD tk-8.6.2.ebuild 3677 SHA256 c29d7caedb688e529eea84cd89a478fe6f2ef7994b6cd0129eb77b0cb4788ee8 SHA512 ff5698893d083d79a0b17bb729ec01be8d0d1e11daee45532fc69419be26d8eec617213b6750da1aa86f6010ef0e82bbf7d636e903e92a27590f6961b63c8195 WHIRLPOOL 7bda1b13394f39e7793b694f1ab9ad360b8a96c9551bd92a1516eebeac446de866f2670c9154071e20de7e5fe8e653c9b7383a7984ed986bf5a3d798f5a1af43 -EBUILD tk-8.6.3.ebuild 3685 SHA256 9d898fe18e308ae5dc8f904e62e613c218d0b271f14a01de48621191228dfbca SHA512 56c27cc10d30f4cd9794f1f9b3fb050d5777139b50c99476ff92f705aa6de7609e7667af4697b7fda60fc7ed9d523c74d7e7e9d27ee965d7afc2cb1bcb86b46c WHIRLPOOL 331df9f00545707ff9de67a9f3ce880f169e94223e10f8f29381831cb0a1cb16b48f96184d8b0fca1d65f6a42296e7281232253691085b4f3cfa4d867f6c96d0 -MISC ChangeLog 27614 SHA256 1223d97d5da8cfde22e76779a3590ee074cdfd22bc2ac5443691c99f8be0ecd1 SHA512 5411cab5085bd7cd55667aebe3f2d8d07215944d2175a8c51a3974e5618d5dbb6f0d232b5de7d56e88706be42dd1f4fe39e53abed6d56885c5fb19320963d3a0 WHIRLPOOL 27904dbeedbfc6723b2f733036d2309a8d575068cecdd8ad74244f9f0e94e402df8890390f76e5f13186670825bdd8abc9d33cebebe90cbf949d7ed3d9542589 +EBUILD tk-8.6.3.ebuild 3923 SHA256 badc25eb35df8c0949190b8ff45b37f9500ad0f5cf879439f764dbe6f400ba15 SHA512 9ead61a77d0308d516edeb90a8b124ff8a9bb820af22f0b49b38fe15b6356afe897a8feeefeeb63c5be64958af078a23c430f1141a8f00865bdbfe2b01738c7e WHIRLPOOL 9d3bf317d87b6b455e4dedfc4b3882fa468d459066361c5527b7020e3ad5c2e6117cc0f3d289b2d61a99705ca7a21ff51b1f51edfb5d0cc6226a00047991d0d5 +MISC ChangeLog 27759 SHA256 1c8d89a9ae9c1ff37ea6afb558227e513b6dd43170e89f350069804e9222ddc1 SHA512 d0d37d901f77a43f3a679748f7eb39aa059653977edd97366abbc6e65c17cd642d729e2c5488fcfed3e7196f19f8a97ae8fa4ca852f91edccfb4cbac2845d773 WHIRLPOOL e7261cb2697ad024d50cb2478fabf81c86440fb27833e487de5c3724dde727a85fc361405753af2b20dea6d01655aecc8a55cb6d2813be2c600804992fa6b685 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJUlTtIAAoJEPiazRVxLXTFPWYQAK4Xo4Nywmfqec4lIvh6/Ux4 -wgjyGuNdE/P009lSnwI2/tgrFMt8qzSP1Gl4hKOgo1k512+aluHoMVwkFyqWjSrR -hUITPWpSEOIdF2QSorixz9TrbAEe8NjXlO4xtiCOCwLHk6RPLkcHWu/FVYvlEnoX -vne5UntyXSSJF7zJACxhSe3dttS0B1oIAd07mgcYKvSXmrteJ3mzIkCAkhIyXlc2 -uTMX7tuKliz9lKh3MPF2jTLarjGIXtg8l2brXRpBIHy1u+630onNr4dGUX9XSdEM -7y6NVx8rgONdW8wcypfGluvZyGfTqlsU/YL4wuJKcwUTOfDVUcaiCp4sZ+t3+SbY -69yD4YFdmrLKCMQv4A6az77M+teZaJV5/e3gdFE+rm0Xfk/clVcCPuwL6AYYIVrp -I7bsuEiEOh1huKUAPm+Wrfbva/AV5L2REv8fvPj4IYxJCaTuLt9kq3jaIQmsEDXa -Hc4TYonFEEMEkVyv1eD3TdObGE2L0GehBjXXIHfzRPex60sn/REf7DMRY6C5GDm6 -KPKgZ35HS+vpmW1cQ+j1Lcyy8py+hMcD4B6dGOohHaz9HaSlUV+T9ynJCbWXfSP9 -Z074rsFBnZAA1L5QWzzrfQmkTtOqK1kxa0yREtViz0IyRklDvIeuqMMaLjY9Xkgu -OEJWNNr3XgiRLP+3VkCY -=6Ge1 +iQJ8BAEBCgBmBQJUwjDvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirPJgP/0P0XPAN/qLFm8x3+HboXvnb +6jmleXaKqa6dGOCqZFSLTU74hWlmsrT2E/TQ/0+Vd63yU4bdF7dNJw1OqkSD9zZ3 +C9rLsEzfN3DRGs2ojZsIC2btSO9fRfhuWZVyVZbi8YWbJIlM1BrubBsBYICLAu8u +4IsAMVdNdhCkGEU2lHDhQ2uP2n2t9oburiQPuGKrelmh5Ev1bUOf7+m6Cb5tMRWB +oDcM5jQhgqV4Fwp9OnEeH3JX+pD5ScXDdk5Cj1WnwL+89I1J69E/MkaHD28eNEw3 +An1il3LX1L3/WbYWAwdWsX8Rt6vWrRDAV8yjjcO6f8DlBEY7doaXBDZUl2sifxHG +xbXVWUBDkcyHJCRcIK3sfOtusIlHucU1gSKpq8ngaNxOnIsJ0DFtfouNWCbEPI31 +ET5EJ+B/2V4UOvwgmYjHKE0P09G89w5wIlCYoMTLGT5HZCtc1stVnSOd5+LTmv/M +650/v3OPBxl2GoATxP1gI8aNVrxnVwXS7tpFHWnRg5elDVo+K8L3EEQbyQknTfox +wBTEk3n/Ln3aTM6LXl3n/nFtF8gieTXcmlv/2R9tcuhWEEYytnbcYYS/hZf4bDnJ +SLDCfISXboUaEfKpK3mYWFnzajh4iEnY59psVIiRQXANRdNjP6VTHfW809FifpYO +9DRidIK9obXmJzM4Mrh2 +=ZAvb -----END PGP SIGNATURE----- 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 } -- 2.26.2