diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2013-12-30 03:28:29 -0800 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2013-12-30 03:28:29 -0800 |
| commit | be3dd3b11d4b5a6bdc952bcd9e880c2700a9a94e (patch) | |
| tree | 30020d7f6320d98275b761f3ee571cfdc97f134b /dev-lang | |
| parent | eclass/multilib-build: add/use MULTILIB_BUILD_ABI (diff) | |
| download | gmt-be3dd3b11d4b5a6bdc952bcd9e880c2700a9a94e.tar.gz gmt-be3dd3b11d4b5a6bdc952bcd9e880c2700a9a94e.tar.bz2 gmt-be3dd3b11d4b5a6bdc952bcd9e880c2700a9a94e.zip | |
dev-lang/tcl: use MULTILIB_WRAPPED_EXECUTABLES for tclsh.
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/tcl/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/tcl/tcl-8.6.1-r2.ebuild | 23 |
2 files changed, 15 insertions, 10 deletions
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest index 5d109a5..7ef68b4 100644 --- a/dev-lang/tcl/Manifest +++ b/dev-lang/tcl/Manifest @@ -12,6 +12,6 @@ AUX tcl-8.5_alpha6-tclm4-soname.patch 486 SHA256 af3c3ea0b0d6c37c666d2fb54cd9891 AUX tcl-8.6.1-conf.patch 518 SHA256 55c4bf1a8e21b9cfc749e4207293c6472f84145082beeecb7fa83f4c334c8f45 SHA512 564779732d4ad1253e4f6fbc760eabf67153e8978c29e434f7796c57a637932bf5d8308edb1e0951e391ec490ea00cd4360b19eae79fc840af02acd4ef03a021 WHIRLPOOL f3d4a9b5ae66a9defb9d0b209fe5b4bc43d7fae2aa3e366f0b54f763488d94a236f226cf445c03623f34793e8e2305a29906e14c4d0e3bda3e8ed27f9eefed9b AUX tcl-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea SHA512 6b097d9406f0faf5d0332c48a72d5654063fe29e37ec2d3bc2f425e98f26d117d39769c43ae39ee731f094a47912bf1dd24259fcc4a5b5326b1e2c4313c89c56 WHIRLPOOL 40cf52a3a9c97012be36a6e11054c3c418c692cb9292350baefecee621ecbff12b65f7b0edcde86e14600aea4c43daf607806c374b650d3f82142870b0da4da2 DIST tcl-core8.6.1-src.tar.gz 5773335 SHA256 00a25fcd70e0be65f85e996353c2a0717eaaf51dc547cf6e499bb05257e20764 SHA512 d3f4c3200017f3afcc50c19619d79a31cac5441b4aac341524a6dfdda3e6f2eada1e0a70875d24f29afc733998aedf6fa14826cba61fceda496aaf2a2a4a3c5b WHIRLPOOL dbd53216ee28bb9a3fbaa7aa5c07ca5931f098d6761eaa859d74ab5dda409e6dc77a28ee43a312267ceff74d04fb723484b6ea8afccf429c28cea5fd6c64521e -EBUILD tcl-8.6.1-r2.ebuild 3485 SHA256 8be650b6b52c75f413cd3390d8caa6c6b1ea97ac4df7dbc4cb626c4195f5f0f2 SHA512 6e31a046042b857554b8451708e2b9d3dc68b78afc31e2d6099deac871ff376625ec1af588612eb8493a1f933920cd6aa7b2e85359b1b69008ac4115b53bb505 WHIRLPOOL 095b7278c47a7cf01d8b9756e18e574669806c36aca7341afe1690579871b65744bda5c5352e6ee4501ff5d87a70747c9ce0c8f3e5d8bbcd973c80907c619099 +EBUILD tcl-8.6.1-r2.ebuild 3534 SHA256 d4dd7e7481255e6da6e5f0e7b142a97ff91b7ec7f19989a39483996d6ee5747f SHA512 6522c0360b97ca33f7952341d803e1b71c100ddfee6b76e871bc49c53f11bf2a1592dbaca0e9569b5f6c42c589d17509fda129cb5df8685a4d57b755f776461f WHIRLPOOL f716c85c465f060990e6af31a2e87e1e5fc10a1f7d60c432d6a91d1c6e0e72057e9bdd868d7859666b188f14c3cd36defa8ab4c1ea6cb36584945ad56d77d395 MISC ChangeLog 23916 SHA256 6d8eb2b169115f678633d53ae1998f2126860962848a722cd22c90c79d2f0f84 SHA512 439cbad25d2b62b79eab19a7491f97137f6b6f8fb01ecff65bed84317c95929bca479406bbd5e4ea69aee286db47486c20946dea41e91815545b800627fc4619 WHIRLPOOL 90139b32530303d23e2feb753de7bd893942cdcce49f1d585cb863e70ac8410d2d927eae948c85b97e1865b26f74688706254aac8478b6ae9a03201ae0c9abe8 MISC metadata.xml 271 SHA256 55e82636b02ffc7d7c033812851e6bf197a6e2b797fb8b5ee13c59c31246a0ba SHA512 f667a280785dbd69bfb4a0d78cc197e40196a2017f6f9c7fc3e4ed8846dda9608b2e9c9b01b94ab0d57b445fb3080d5fdcfc48d40def19bf90a5edaf188c5372 WHIRLPOOL 1447b7739ba725f572bb5c713d56867e3c5fc2dbad4bfd708d5b2ca8d50e74ff24bda238a3d30aaebb50457a87a8e9528c573fc3a443b6ee12e85a2b24514eeb diff --git a/dev-lang/tcl/tcl-8.6.1-r2.ebuild b/dev-lang/tcl/tcl-8.6.1-r2.ebuild index 9f00c98..3e32992 100644 --- a/dev-lang/tcl/tcl-8.6.1-r2.ebuild +++ b/dev-lang/tcl/tcl-8.6.1-r2.ebuild @@ -23,6 +23,12 @@ DEPEND="${RDEPEND}" SPARENT="${WORKDIR}/${MY_P}" S="${SPARENT}"/unix +V1=$(get_version_component_range 1-2) + +MULTILIB_WRAPPED_EXECUTABLES=( + /usr/bin/tclsh${V1} +) + src_prepare() { find \ "${SPARENT}"/compat/* \ @@ -59,7 +65,6 @@ multilib_src_configure() { multilib_src_install() { #short version number - local v1=$(get_version_component_range 1-2) local mylibdir=$(get_libdir) S= default @@ -69,11 +74,11 @@ multilib_src_install() { sed \ -e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ + -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${V1}/include:g" \ -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ - -e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ + -e "/^TCL_LIB_FILE=/s:'libtcl${V1}..TCL_DBGX..so':\"libtcl${V1}\$\{TCL_DBGX\}.so\":g" \ -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then sed \ @@ -83,18 +88,18 @@ multilib_src_install() { fi # install private headers - insinto /usr/${mylibdir}/tcl${v1}/include/unix + insinto /usr/${mylibdir}/tcl${V1}/include/unix doins *.h - insinto /usr/${mylibdir}/tcl${v1}/include/generic + insinto /usr/${mylibdir}/tcl${V1}/include/generic doins "${SPARENT}"/generic/*.h - rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die + rm -f "${ED}"/usr/${mylibdir}/tcl${V1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die # install symlink for libraries - dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) - dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a + dosym libtcl${V1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) + dosym libtclstub${V1}.a /usr/${mylibdir}/libtclstub.a is_final_abi && { - dosym tclsh${v1} /usr/bin/tclsh + dosym tclsh${V1} /usr/bin/tclsh dodoc "${SPARENT}"/{ChangeLog*,README,changes} } } |