From 2972180029727a1533f9abb3dda72a9bcbeffc86 Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Sun, 7 Apr 2013 06:06:09 +0000 Subject: Adding static useflag and klibc dependency as per upstream suggestion Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 --- app-shells/mksh/ChangeLog | 8 +++++++- app-shells/mksh/Manifest | 5 +++-- app-shells/mksh/mksh-44-r1.ebuild | 40 +++++++++++++++++++++++++++++++++++++++ app-shells/mksh/mksh-9999.ebuild | 13 ++++++++----- 4 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 app-shells/mksh/mksh-44-r1.ebuild (limited to 'app-shells/mksh') diff --git a/app-shells/mksh/ChangeLog b/app-shells/mksh/ChangeLog index 560a48f3db91..3f2f18b6fc35 100644 --- a/app-shells/mksh/ChangeLog +++ b/app-shells/mksh/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-shells/mksh # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.38 2013/03/06 03:55:18 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.39 2013/04/07 06:05:24 patrick Exp $ + +*mksh-44-r1 (07 Apr 2013) + + 07 Apr 2013; Patrick Lauer +mksh-44-r1.ebuild, + mksh-9999.ebuild: + Adding static useflag and klibc dependency as per upstream suggestion *mksh-44 (06 Mar 2013) diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest index 5e12a7fdcab6..595f955e3840 100644 --- a/app-shells/mksh/Manifest +++ b/app-shells/mksh/Manifest @@ -12,7 +12,8 @@ EBUILD mksh-41b.ebuild 888 SHA256 cf3939f5b86715ce073515572f3d33bbb92b4395d8f821 EBUILD mksh-41c.ebuild 888 SHA256 087b92708eea7d79db82d8d56433ad1ddd570a34c121da0bd78344c4d14bef79 SHA512 d0c092f9b5d2145ff2594fba1757779d0f3b11c866c511f03698ae2224c585723aec5af67a30bee397b7d9970c363329018a6b924e29ca31a63408a11f11c2d6 WHIRLPOOL 2d5a8eb68b01e21140208493ffc714055535eb1d11622c2cef1203b7a0932f8733add90f7ffaf04e4346b55a22ad3d9a9755378a98e2e0850bf98a100c6854f4 EBUILD mksh-42.ebuild 887 SHA256 cba9cbf49faacf2bb646679b08bd6069196db80933acb9526696ad67b48a1d5b SHA512 8c412634c72d854d79892f03d8e2d9a902bda22dc06893c6e52d54a2b8dc1afbba708342b3816161e4c1c9389f22374875f5386e2e71f191855061cfc4573dd3 WHIRLPOOL 7cd7ebf4119331b7d6164e01dbee96bf498521fa106e76cf65c5506e6efa544827fbea7fe98f8c5f668ec32923ced881a547164457e26ffeb364a6bbe83e9f43 EBUILD mksh-43.ebuild 887 SHA256 1b108506acf831ba0b5220539558f7de02d81b2cac8f66105212ea60357a75c4 SHA512 bdabf18604cd088a1e16027d967c75612ebcd801872760f0221c2f28a449e074b5c17736d77dae1e496a2034f77b9986f4fd491c32d132eca509333ad5f3429c WHIRLPOOL 7f34d0881a63663411b8a2a7980fa28db47222e1e533d543198843d8a9a3710614a3c66ece5feaa73ea73eb79dcc8eef4a2893dad41605604b8b89e19d0f9801 +EBUILD mksh-44-r1.ebuild 1050 SHA256 28d08846497d06e59f170d0352ff593d8bf2a33deebe5710f7043fb2e05c9fe0 SHA512 1a2cc0bfc20f47b0ae5f6e9f12657b7c9ec670b2a7cf18b33a64340f137c6038d3ef7d13b1042a9807e4d753a4218beaa14e47f9dc4cb41e9ee453cb0d47dd5e WHIRLPOOL d4905534defff59a5934cf0d193b4cc628745e81821b7a983f704e6c2a27ef367ee4c6d4784a169961ab514791d1e6743069785e94bb6413024e23bc821d875e EBUILD mksh-44.ebuild 887 SHA256 4601c0678301d1fe5a864f9e886c7d5850369e3b92e729e13f7e445b627418aa SHA512 213dc74afd181c75804b732affcaacc32bb9ed2e9bb9cce12218a6dfe76d3f12367a48998c1778d08e49029a3d21845e91177bd6d997d972746eb1ae47c92232 WHIRLPOOL e7a9bb669aebb9a4f5b72214ebed966aa93341a957a257c753130b0f28efe8554efbbd3cfaa40e8338770173503c719ffdcdf59e7bb7359c41f0146e9b95f79a -EBUILD mksh-9999.ebuild 991 SHA256 1026966b4c81495e3f46f6dcb237061af63c923545d5290b2aa2065f6a82f06d SHA512 a14b75f80168695dfcfe2ed7f4521165b46a3cc452696b57b9f33416b62f479c4ec58451c11bc524afbc9f014b028e71617e6ee66f9daf377ce68bc2d148f5ed WHIRLPOOL acf3a90413a92284c852b5b55bd968a4f73b0334ae6e9377c3533819daba96d9f90f925b3fbfe22f2a5741586f40b1daf6fd30489e406b7532a6d1fc8c7313f8 -MISC ChangeLog 4768 SHA256 c389dd6b9ad6aff6fc815c792bfb90b8d52249f6a0876e1d2ae594e37c733c2b SHA512 5dcb3de129ba8b52265b6619246eacadc3c12961f42eea1c5e97516b75a4110fdf877916e7dccc6afd3b0e4b6c008e8f7bbb9df386db3964db95dc93d835d582 WHIRLPOOL 8947105d6e7300b5afbfb080ee71f4265f28bb55800ef7be25a63be21b95a092925d9c68f87972d959774fed8cdec3a0dab315edc1a06581b2563a40e06cd684 +EBUILD mksh-9999.ebuild 1170 SHA256 7f921a13eb77f931d37acbfc92164040c1ed207336ff825b3ad5c7c255957bd2 SHA512 2305077bd12456aa7a37c689c4a2bcd3c3d874ff2ae75ae8e956973fc094bbe474e6f8ee9d9532156fbbdf1a9b909c1228ee105829fad9771dcd532a52cef2c6 WHIRLPOOL 4dfb39eff331686284b26888defe35f27945f8967761a348e1c40af1b9de6cf09053be9c6793af79f9e578888dbe80f5695e60d483fecd3728cbb974b51aac24 +MISC ChangeLog 4958 SHA256 1c4325a39efea57e0035be491c1a88bb2ccf881b097ff17b60d8d5856bf751b4 SHA512 ee435a2f58dd61f52e7bb505ce59bde755596f25aa9b23383d4d9a3bb17647b8f8b0b2be22b3f12b09268accee7d155b5d4881c352731529560a0c27d096cca9 WHIRLPOOL 0cb1359e3ddadbe119b31f313bb1df14a61d9ea2433d8c584781ca9b4bcb43b361dd8a39c48f52d205dce5bd2d39a9419150b953a1c915eb24b6ef7292dc8d21 MISC metadata.xml 196 SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445 SHA512 ba2a04029fc9fd51726e618311fc0d5ca87333acb0c067a353000a5e0cd31a9f4095adc14faae4d1f14409303051f381c66c3a4cd6ac6699a9476193ac7030f4 WHIRLPOOL 002f8951fc98cfd1917aeef67a1ef0fbc7b662f4cce3c4d9735f198ec8fcaa7e258524a80dbdea1eb485db6faae224dfb317af827582c0777faeba8cd2950ccb diff --git a/app-shells/mksh/mksh-44-r1.ebuild b/app-shells/mksh/mksh-44-r1.ebuild new file mode 100644 index 000000000000..f5eee43e498a --- /dev/null +++ b/app-shells/mksh/mksh-44-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-44-r1.ebuild,v 1.1 2013/04/07 06:05:24 patrick Exp $ + +EAPI=4 + +inherit eutils toolchain-funcs unpacker + +DESCRIPTION="MirBSD KSH Shell" +HOMEPAGE="http://mirbsd.de/mksh" +ARC4_VERSION="1.14" +SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="static" +DEPEND="app-arch/cpio + static? ( dev-libs/klibc )" +RDEPEND="" +S="${WORKDIR}/${PN}" + +src_compile() { + tc-export CC + # we want to build static with klibc + if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi + export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" + # we can't assume lto existing/enabled, so we add a fallback + sh Build.sh -r -c lto || sh Rebuild.sh || die +} + +src_install() { + exeinto /bin + doexe mksh + doman mksh.1 + dodoc dot.mkshrc +} + +src_test() { + ./test.sh || die +} diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild index c41021a6ec9d..3cd2184d9674 100644 --- a/app-shells/mksh/mksh-9999.ebuild +++ b/app-shells/mksh/mksh-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.4 2012/12/01 03:12:33 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.5 2013/04/07 06:05:24 patrick Exp $ EAPI=4 @@ -13,9 +13,11 @@ if [[ $PV = 9999 ]]; then ECVS_USER="_anoncvs" ECVS_AUTH="ext" KEYWORDS="" + DEPEND="static? ( dev-libs/klibc )" else inherit unpacker - DEPEND="app-arch/cpio" + DEPEND="app-arch/cpio + static? ( dev-libs/klibc )" SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" fi @@ -24,13 +26,14 @@ DESCRIPTION="MirBSD Korn Shell" HOMEPAGE="http://mirbsd.de/mksh" LICENSE="BSD" SLOT="0" -IUSE="" -DEPEND="${DEPEND}" +IUSE="static" RDEPEND="" S="${WORKDIR}/${PN}" src_compile() { tc-export CC + # we want to build static with klibc + if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" sh Build.sh -r -c lto || sh Rebuild.sh || die } -- cgit v1.2.3-65-gdbad