Fix installation on FreeMiNT (bug #390545), use get_libname for shared library extension, keyworded ~x64-macos

Package-Manager: portage-2.2.01.19572-prefix/cvs/Darwin i386

3 files changed, 16 insertions, 12 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 873292d315f4..d6f063bfd255 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.140 2011/10/04 16:59:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.141 2011/11/29 19:33:08 grobian Exp $
+
+  29 Nov 2011; Fabian Groffen <grobian@gentoo.org> tcl-8.5.10.ebuild:
+  Fix installation on FreeMiNT (bug #390545), use get_libname for shared library
+  extension, keyworded ~x64-macos
 
 *tcl-8.5.10 (04 Oct 2011)
 
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 57115757e9bb..71c6b4b726e7 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX tcl-8.4.11-multilib.patch 1808 RMD160 fb26bcbc63a3fb79dc2793af35f64b4dc189fe24 SHA1 21b02ba0c68ec512a9225b2822119624321b30db SHA256 4925265d9fc72077d94ac23420671a4a0403cb0bad1be1dcc5d945e7bef5629a
 AUX tcl-8.4.15-tclm4-soname.patch 477 RMD160 65326daf481e3ac425eb4ba9f9495dc122b7964a SHA1 7c664afeddfb3bf51fa52104cca047f6e421fcee SHA256 2130b8b5fdddadfca35b74e9432d2651733e4f1c7b13d66ffc87b6995865076b
@@ -18,17 +18,17 @@ DIST tcl8.5.8-src.tar.gz 4452127 RMD160 dfba63e9a3896350b88f592301fbe6669a60b5c1
 DIST tcl8.5.9-src.tar.gz 4469603 RMD160 d858c4fbe1a75bef9c4a4c03e50d8aa807a9d28b SHA1 ae87c5e58ba20760d9bc77117d219bbf1b6a5557 SHA256 3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d
 EBUILD tcl-8.4.18.ebuild 3590 RMD160 542eb68de305f6245e9b782967d8421b39ffdc42 SHA1 53e99c2bf2df2d69ea4f51c33d0217c0c3b41be9 SHA256 f95cd847bef526d992d8a7fab0473c29d411292b32a509cf0fd1924e06d898ab
 EBUILD tcl-8.4.19.ebuild 3601 RMD160 a928a5b8f0a1fc55eb99d54f38b9f599b0a221b4 SHA1 e4e7f69194d76de0fe1142a2e9ad491c407b3bf9 SHA256 43167a1314f2e33222c22121ddcb2fd15fbcc8dfd925238f74b7fea4cbe90208
-EBUILD tcl-8.5.10.ebuild 3649 RMD160 da6bcfccb4e2717767a21735fd147c9024cbceae SHA1 3e0f339319b411e924e40ed5bc78f26d30073231 SHA256 45def8dff4a6c95d202333953b9d8dc681c3f164c45313aa4717ca3fb531ac60
+EBUILD tcl-8.5.10.ebuild 3708 RMD160 b85f652c6732399fe0c8c6c4f32f25a48e1b3137 SHA1 fc6f8670d36803968031f2bd2ea5a6b4c103a6fb SHA256 84bc009d318d5e89378a14381faceb6f1d064493226fb9f3f056ec55490049d6
 EBUILD tcl-8.5.7.ebuild 3268 RMD160 4eddf2f2989e2d699d0b9dfe3714c874be77ea84 SHA1 a1549dd5e71c0c26a9c4f7a3bbd0691c95ea7192 SHA256 ac4b0d10918aba4fbbdc8574fe83b49f365f726ce2dd1fe54d07044d642a0750
 EBUILD tcl-8.5.8-r1.ebuild 3559 RMD160 38e2cb252b8dfba611458a1de310fa1089b6ee33 SHA1 510cd4f2b289e61d524b85197f8354a8ed479955 SHA256 8b1f31c94e6073af9e313edaf5eb4505402e22767b6a12293f8536e9ac84c28d
 EBUILD tcl-8.5.8-r2.ebuild 3631 RMD160 293406b38576a3a48b02dd5683e11bcff15fe115 SHA1 5e28f2ae943a4538286bf2f8d2cbb4ecaf13f790 SHA256 e0e18149683a7357409d49b438254d92d4290c2d3fdea169bcc7fbb1241c29e8
 EBUILD tcl-8.5.9.ebuild 3637 RMD160 3b2c3ecd047c916512d8b0595d14dc870d55586b SHA1 3772f69827f560b31e42b5551514f09a2794b504 SHA256 2eac249ebc62f2ea0e58ee0734b505c9350440e2dc716ee18c6fb81c241012e4
-MISC ChangeLog 17692 RMD160 da8a33e7fa04fe3cc7df2ad698c8193b74dbe7dd SHA1 c2fb6d426f562b7ffa0d84e9870105a369a9e2b7 SHA256 e33bd7b928133e9d5610812130d2692630e90846a1d2b2e5813f3b99fcc33da4
+MISC ChangeLog 17881 RMD160 0d0d973c43383032305c5842adc6c6a5545af444 SHA1 914ed6a879bb90d96eb17c82caaecf139ba8f3aa SHA256 aabd2f386cf0830bcc3b6291b756823fc3f2daf2f0d9e000fba085f57c230182
 MISC metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 SHA1 19fe5fc86133d09d7fcb0b2ce44054eff4fff028 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEAREKAAYFAk6LO3gACgkQgAnW8HDreRZmPACgvWmgJflj9rH+fcS4U++L5Bld
-vO4An3bAZoGnooGMJrDNHuX4ZnnoBSfX
-=913R
+iEYEARECAAYFAk7VM3kACgkQX3X2B8XHTontxwCeP95TZ1Md/N71T2q4qVze7Wm3
+U3sAnjzMXDIGnGGGFChCALGT+LsAMmc8
+=GqOa
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/tcl-8.5.10.ebuild b/dev-lang/tcl/tcl-8.5.10.ebuild
index c9bbfa8d4cda..c4c7cabcdf13 100644
--- a/dev-lang/tcl/tcl-8.5.10.ebuild
+++ b/dev-lang/tcl/tcl-8.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild,v 1.1 2011/10/04 16:59:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.10.ebuild,v 1.2 2011/11/29 19:33:08 grobian Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"
 
 S="${WORKDIR}/${MY_P}"
@@ -80,7 +80,7 @@ src_install() {
 		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
 		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
 		"${ED}"/usr/${mylibdir}/tclConfig.sh || die
-	[[ ${CHOST} != *-darwin* ]] && sed -i \
+	[[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] && sed -i \
 		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
 		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:${EPREFIX}/usr/${mylibdir}'," \
 		"${ED}"/usr/${mylibdir}/tclConfig.sh
@@ -95,7 +95,7 @@ src_install() {
 	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
 
 	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so || die
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) || die
 	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a || die
 
 	dosym tclsh${v1} /usr/bin/tclsh || die