From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SBTxY-0005r5-KV for garchives@archives.gentoo.org; Sat, 24 Mar 2012 16:36:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 034FBE0630; Sat, 24 Mar 2012 16:35:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C0219E0630 for ; Sat, 24 Mar 2012 16:35:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 314F71B4031 for ; Sat, 24 Mar 2012 16:35:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 382B7E5438 for ; Sat, 24 Mar 2012 16:35:25 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1332606866.f6ba4fd4a41e4f6c0da8cd3e659ae2923e679800.tommy@gentoo> Subject: [gentoo-commits] proj/multilib-portage:master commit in: sys-apps/abi-wrapper/ X-VCS-Repository: proj/multilib-portage X-VCS-Files: sys-apps/abi-wrapper/Manifest sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild X-VCS-Directories: sys-apps/abi-wrapper/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: f6ba4fd4a41e4f6c0da8cd3e659ae2923e679800 X-VCS-Branch: master Date: Sat, 24 Mar 2012 16:35:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 93a1ef91-2067-47f0-abe5-c9d2ae8ea9ae X-Archives-Hash: 2f3d23cc06559ea8fb979273d245ad1d commit: f6ba4fd4a41e4f6c0da8cd3e659ae2923e679800 Author: Thomas Sachau gentoo org> AuthorDate: Sat Mar 17 15:05:12 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sat Mar 24 16:34:26 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/multilib-port= age.git;a=3Dcommit;h=3Df6ba4fd4 Adjust source location for bash and readlink --- sys-apps/abi-wrapper/Manifest | 2 +- sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild | 22 ++++++++++++++++++= ++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/sys-apps/abi-wrapper/Manifest b/sys-apps/abi-wrapper/Manifes= t index 358f035..f2fa0f4 100644 --- a/sys-apps/abi-wrapper/Manifest +++ b/sys-apps/abi-wrapper/Manifest @@ -1,3 +1,3 @@ AUX abi-wrapper 816 RMD160 3ec7cbf3a8ea0a00dbc0c154d06384a641b0c822 SHA1= 7b037ba8696d8bbb976ec7aa236f8c3aad6dddbb SHA256 8c307880e0811b85c9d9c9b0= b74fb54e1885e5380c7986e7b0576bf285488509 -EBUILD abi-wrapper-1.0-r6.ebuild 785 RMD160 64bcfe419f0def2a04d29384267b= 85ba877a4905 SHA1 522e9426abff3bb8a442a628b3c1d640502367a9 SHA256 22dd0b1= 80fd1027025cfb7e298ec3179772390ee8f4e5dff84c3bcf185ae0b38 +EBUILD abi-wrapper-1.0-r6.ebuild 1155 RMD160 620836f7040bf2d206bdbe0dac2= aa1aa983021a0 SHA1 429ee93416c9f4a80a5cb9e559243f5039d1429f SHA256 53d455= 92d9da676321b84c32aec0af6921b6be9e108c9047dc0e34121098b8ef MISC metadata.xml 365 RMD160 6ab4a591742066e6284b0476cfd052ec93cdd065 SH= A1 deee9793eceb9d79d1b56a48fc2794dd36672f83 SHA256 de15c8b9625114fedd7689= cdb81c29376a3ca5fb249c92577486f742026054c0 diff --git a/sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild b/sys-apps/ab= i-wrapper/abi-wrapper-1.0-r6.ebuild index 2927e70..d86dfda 100644 --- a/sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild +++ b/sys-apps/abi-wrapper/abi-wrapper-1.0-r6.ebuild @@ -24,6 +24,24 @@ src_install() { dobin abi-wrapper || die insinto /usr/bin ln -s ../../bin/abi-wrapper "${D}"usr/bin/abi-wrapper || die - newbin /bin/bash bash-abi-wrapper || die - newbin /bin/readlink readlink-abi-wrapper || die + if [[ -L "/bin/bash" ]] ; then + for i in ${abis} ; do + if [[ -x /bin/bash-${i} ]] ; then + newbin /bin/bash-${i} bash-abi-wrapper || die + break + fi + done + else + newbin /bin/bash bash-abi-wrapper || die + fi + if [[ -L "/bin/readlink" ]] ; then + for i in ${abis} ; do + if [[ -x /bin/readlink-${i} ]] ; then + newbin /bin/readlink-${i} readlink-abi-wrapper || die + break + fi + done + else + newbin /bin/readlink readlink-abi-wrapper || die + fi }