Fix for Darwin, based on work by Changyuan Yu in bug #481194, force for elibc_Darwin-only deps that are applied to all other archs

Package-Manager: portage-2.2.7-prefix/cvs/SunOS i386
RepoMan-Options: --force
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 28 insertions, 11 deletions

diff --git a/app-admin/pass/ChangeLog b/app-admin/pass/ChangeLog
index a623b14a9590..4d8c49cce3b0 100644
--- a/app-admin/pass/ChangeLog
+++ b/app-admin/pass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/pass
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.4 2013/04/16 07:34:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.5 2013/10/20 19:13:56 grobian Exp $
+
+  20 Oct 2013; Fabian Groffen <grobian@gentoo.org> pass-1.4.2.ebuild:
+  Fix for Darwin, based on work by Changyuan Yu in bug #481194
 
   16 Apr 2013; Justin Lecher <jlec@gentoo.org> pass-1.4.2.ebuild,
   pass-9999.ebuild, metadata.xml:
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index d84e0594fd56..9dfbf3ea04ed 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST password-store-1.4.2.tar.xz 19248 SHA256 ac5261b176e2be60b44c5c785dc5770a3e0f459bc6dbc42136679d68d3986e04 SHA512 bc846a79417c54ab8352380e08673c3aa2f38b68eb57e957f6f3c02c938a65ea8e6b87c2144cc0a675c9a0a7f3bb859135599c4a75eb83e2f06a201caa14ca0f WHIRLPOOL 60ae449685c6bd241995c2685c044bfeaa77e8a861c1fcb7f7ffeec32be4b35f78b034c95ab1cfa4f84f26095a7b25f48dbe34fc2cc5df1817d775cd5b3aed77
-EBUILD pass-1.4.2.ebuild 1198 SHA256 ebe8e028c30e75093a21ce402192333327f60e40eaee4852b80f76aa0494f0b2 SHA512 7986f72420a017278e15da0a19cce48d4ecaea36d2d80d2f7e68eae695f71e7b9e82252b2b7918e9d2ae46a0c66a3997452ead6494bb00856af58068e753be58 WHIRLPOOL bdd0d87646c6d290545a56f5f7b247a8c47da66b45f837109a1378864e62bf5afcf4de4bd71db66e45d85cc2e014a2e5a0068157c26342cc4016e4f09d53fd41
+EBUILD pass-1.4.2.ebuild 1714 SHA256 e7eeb264272fcf2956055974bf65b42639bcac626fd48a9cfa05bce3aedc555b SHA512 b5dc14b506d5dd48224d6d33b5831e88f94a59ba74b5630a860db054cf07a27e35bbd5b749fb6f904a69514354cde0375063f1ed4d91bb7f8832a8ba8791e0a1 WHIRLPOOL f9fa7ae3baf8dc4254f1701b049c221d37bfc59d11023fe1281ec3b21f47892de730b8e976e9d4a54177f9827980fc124245b6d58588b2f52d47592e794e721e
 EBUILD pass-9999.ebuild 1161 SHA256 ffef1670e11a25639340a06b4fd415dc02b96e5ee014ac522b5f63a78b053bd2 SHA512 546fb7117e55e75be8e167cce4eaa9688781e5fa817f24d3185c73a3d1bb09286bf53a32449450e3436efaef5194888c16e6a9ed48c373f85485a77f35667938 WHIRLPOOL 6ae6aecc2df05a1a1554b181f97aba47d72cb3aac6707202ff08c97e286f38db4de0dd62e901ccd1b811ff599f85c42738210ebe021730cf3c1b7e7c2dde313f
-MISC ChangeLog 798 SHA256 558c339d03bab8af4d5cd6a0f10271d05fa4ec0c14b02487e70b80ff346f3cd5 SHA512 0d97755371a2f483995a899fd9ac8160e7e88b3b0ee7e9f94561c242e5021e183dde1419fca739e6e98c4410885a2edbb136221bcb1b6756c66bf0892ee999a7 WHIRLPOOL 2322810c038fb225b07140197d4da0ba1bf9092b1bfebd225bcd660a158bb20490b109e22e9d90a36dc1b69b68a00967cd0d42848c8c34b528b598365d01b9a5
+MISC ChangeLog 935 SHA256 a586eeb00c504204e88c6c8c08567b4c472f2b200f0661f5d2a74bb24c8a3176 SHA512 cbad2c822638992a5644a2f08668a127efb336106ad231c4d2c818a38ea32f109b29de1a0fc5ff5dede58b833f4c384fe9b2c9d38c53a78a2eaafb6cf054970e WHIRLPOOL d4f85d50390a237d5409fde48a8f8ac25c34972f2a9828effc4c716a7016cb56d830cfa9eee7f230df7a488d55cf28e6f2b14919a82e9b5ac7fc2cc7d28edcf2
 MISC metadata.xml 658 SHA256 cae7f10b3b2b3b362e35dba55e1a8ff4ba9f9cfdee888c04ccf8549658da1ff1 SHA512 adc9b7d63d29b2aa16dc31b96a234df0cf660b39ff9e17f7b157e22c65581f9f5afa33bbe16df861dd3e43e66e18a5cc9d7f04f22456c200a16beb9409b0abb0 WHIRLPOOL 632917d432fbff2e25d18ce3f01964b741fe3d400ec663b727d96f7dedcd7c3bdbbc111975cf3b11214858d75a7c971ab147cb4094247df5e38529115e39eec4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (SunOS)
 
-iEYEAREKAAYFAlFs/u0ACgkQgAnW8HDreRax1wCfaYQ8LtA2JPVEEW/m1hhiDezu
-9kEAn0/pQR6RzeBMhRShV9LPQEWjTJe6
-=qoBM
+iEYEAREIAAYFAlJkK3UACgkQX3X2B8XHTonZigCeKqOpkKc+TWvX56GANDDMWaxr
+UkEAn0kUE5Lxv+F1EkrpzymXHXQGIpYZ
+=ulCh
 -----END PGP SIGNATURE-----
diff --git a/app-admin/pass/pass-1.4.2.ebuild b/app-admin/pass/pass-1.4.2.ebuild
index 36027869d50a..e378b9634bf9 100644
--- a/app-admin/pass/pass-1.4.2.ebuild
+++ b/app-admin/pass/pass-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-1.4.2.ebuild,v 1.2 2013/04/16 07:34:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-1.4.2.ebuild,v 1.3 2013/10/20 19:13:56 grobian Exp $
 
 EAPI=4
 
@@ -12,8 +12,8 @@ SRC_URI="http://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.x
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="+git X zsh-completion fish-completion"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE="+git X zsh-completion fish-completion libc_Darwin"
 
 RDEPEND="
 	app-crypt/gnupg
@@ -21,12 +21,22 @@ RDEPEND="
 	app-text/tree
 	git? ( dev-vcs/git )
 	X? ( x11-misc/xclip )
+	libc_Darwin? ( app-misc/getopt )
 	zsh-completion? ( app-shells/zsh )
 	fish-completion? ( app-shells/fish )
 "
 
 S="${WORKDIR}/password-store-${PV}"
 
+src_prepare() {
+	# use coreutils'
+	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+	# host getopt isn't cool, and we aren't brew (rip out brew reference)
+	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+	# make sure we can find "mount"
+	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
 src_compile() {
 	:;
 }
@@ -44,4 +54,8 @@ src_install() {
 		insinto /usr/share/fish/completions
 		newins contrib/pass.fish-completion pass.fish
 	fi
+	if use elibc_Darwin ; then
+		insinto /usr/share/pass
+		newins src/platform/darwin.sh platform.sh
+	fi
 }