Add non-bash-shell patch from upstream provided in bug #510918

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 44 insertions, 32 deletions

diff --git a/media-libs/opus/ChangeLog b/media-libs/opus/ChangeLog
index 63858f7e7648..80939f695936 100644
--- a/media-libs/opus/ChangeLog
+++ b/media-libs/opus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/opus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opus/ChangeLog,v 1.43 2015/05/09 14:07:43 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opus/ChangeLog,v 1.44 2015/05/28 10:06:37 yngwin Exp $
+
+  28 May 2015; Ben de Groot <yngwin@gentoo.org>
+  +files/1.1-fix-configure.ac-shell-bug.patch, opus-1.1.ebuild:
+  Add non-bash-shell patch from upstream provided in bug #510918
 
   09 May 2015; Ben de Groot <yngwin@gentoo.org> opus-1.1.ebuild:
   Mark stable for amd64, bug #500868
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 4eec7c154b89..07f272b61683 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.1-fix-configure.ac-shell-bug.patch 545 SHA256 31bef7d778611192b973a8ce92b83ca4ebdec9404c0fc2853a2916e66977d4af SHA512 0174060c67c89a6836673784c7269d33ef4a421040ee9f9e37368e613f1ff482e792e1a3a9ac69868d933e5881edd778bcac2d254cb9ae9b4e3206d3a2245dee WHIRLPOOL ebebc79f75ca1bc9de95cb6a1a3edca98a4383258abeffb11ac71477783c1c30d8e1647a7cbb6c5e2e3dcc2992becaffbc6db3592bc893ae86e3209845136f44
 DIST opus-1.0.2.tar.gz 777306 SHA256 da615edbee5d019c1833071d69a4782c19f178cf9ca1401375036ecef25cd78a SHA512 73f089ac9c6fcf6adea6c862f6ac0e56712473f9dcaec3aec444a988ded1abcec7fa69da286af38500182dfaf96ba0b6ca52431c39ed08f2aa1caf84ffd43b39 WHIRLPOOL f953cc7f8bd4332524ee403e7dbd9647a29d324a30ef820e5b96a316366ab0a168f55e36a0ab5b239afe7f547874eb28aff1529e38774c1a880da1b7ce7daa86
 DIST opus-1.1.tar.gz 850208 SHA256 b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95 SHA512 b603efe66d65ef38dbcd0d2bbf213a1d15fa456aee00eca73e99abe4ec78668ed82e661ca7a69e9af4e0bc39e1aa76c4151b7f9840ff621ddcfd69f596cf2ba9 WHIRLPOOL 9d53e57d0c99b7e5e330822808f5b79e19bb3fbbffb9054e3d1d421b42fd70463d5fc39517eff1169d218bad8ab2440162c334ace013ffba846cbcfb57206201
 EBUILD opus-1.0.2-r2.ebuild 1171 SHA256 b1b9b88165cf4e83b7edc97858c1fb954e9698c41dfafdd152367470b2d27005 SHA512 736d879512c4bc5b566efad6a3dfdd301f9ec22948b6fb41d440920292cfe0fd1f96df345cb396d9d7d7ccf4e9849ab535aa66c30b7d5436235ee7390a674478 WHIRLPOOL fb856a72636f67e20f8a0ffe2f5a2abef254cd3e435d9d55cc4fe15ceca74d990b50d197453adca9a2408ea40afa4a86eb4d7111192041649594a439a474dcad
-EBUILD opus-1.1.ebuild 1172 SHA256 027e14274dd42e1752ff32415dfaea12246dec34ee93b4f334c11de14c30b08f SHA512 2940e218aa790e67e74fbd8136246241b8eb49491c27bb5e58746888ddd87559a1a7d10aa56863de078430a5f31973796a16e48efb397fbac7ea645c51c71ebe WHIRLPOOL e64af1d8a589e3ac594983426e611d9e52849780f73c09ad76b62dcde6fc082ebec38ca3f6198b44b9f0d5b3413a270fd7de8603e26995cb30afd249f861615c
-MISC ChangeLog 5197 SHA256 161739491b264856b12b6d53276e9dcaa7eb729f9a7ebc7eadda6019ff24b8f7 SHA512 c532381982907c6ba33f448ad1473b7ea6979834f60bf98360d94bcef3dadceee37d4d91bc8230f808e83e45df1c00ed67675f80f60e17a735ad5b4cfb7e2966 WHIRLPOOL 77ed74d28c8f15a6559b8007006b6a8b72d49ebc8fdf9cf6c6675316144cd5392cbce3ecb986db5760ab95da92dc7ec59de7e471f1d3c79c862010925fb4f111
+EBUILD opus-1.1.ebuild 1024 SHA256 21f9b0e1c557c87ccc86c8a3021cd698530ea52b902b6494e0061187a94d30ee SHA512 e86bfe4b2374b58d764a77d7461a7b98b9735fe58b94b5a7f37a0355c414cb50e2d72988f9a1cba1b46bb18b8affeb7991aca32bd2bd81dd8a35b8b08446ee30 WHIRLPOOL 7498c0d1e35303ae9697e0fb89c44b8e8459ec12e5fde38a81ddf52cf93d4e939050221735f5b60397fd882bf8cd5617bfe7b33720a05310a9933a2e2456a3c3
+MISC ChangeLog 5375 SHA256 704ac862a8f039360cfc4b1c36fb799d8719a28743803bb8834b48ac21abe707 SHA512 4a63cf1da98841ad7b67b36f290d9b4d9c3d925aee9ccd12bc924cb39f93ef1dab77f821dfdbef34bee64b61832db8ca646fd2ec8d236bcd71232541a3b47733 WHIRLPOOL 43f9a357c2ff1cb868b586af143c32058e5c590c2e87a9f4e0023734f1ed1edc50fb4d573de1a2c76e1cf608a1ccf71a02c367123fe1964b619296cd89f1ed2c
 MISC metadata.xml 239 SHA256 0f0fec7fcbe04ead6403176cfaa25a426ad2be9b4bf28b11d77b92fb4fa0bc68 SHA512 bacd799b1cb6ba0a972796b62b80a2ea0b81511334c1dad6f5ffb57da72e9516e3a8b98a058f3b4461eb29723b75243c261af3aa5a43e3b43a5d10cc0e226796 WHIRLPOOL df085ffb47655ab7c87b466ec9bca481924b812e234dabba63fadfb1b167c09c52cff6f94d07ca9c85d570795b8ae5e98b5179e3e0a5e9e1ed09031d2d12c5b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVThS0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVZui0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO2JgP/itAVzg8YwcDisVcWSoxxJI/
-uRQfyZZTYoPBXNLtclrbXRznqPceCKLzH5we5xj00lQ1+zfB1XzoMkXS+D4njZ5S
-mrInDNCOqJrzMbCZDlYmsHVoeUkID9UPQR4QSMMXicCCx6oXMCAczB/UQXLf+q6R
-MjKQV77AHCVu4aL2FTXf0zx1Udjy9sder0veICscpW7ki84AhUSqNefcOUgk5TsO
-bqVo7qwP6lpgCgXlkPcLIxb0oJCGo+aohN6ZwFSJb2E5NxATVSBhYTixxVG5wgBO
-XnB7raiOW6DPpPpRMAJhiJYqVgTmSPXl7LJyHw3pAh1PMPuuvvq0wbR8QU0ilFwr
-3tSzwUrhdgD5qxpRemifptv1Om0M+pjVpNPZQ4ndsCpx1AzLc+wZ7xilc7pjCWxW
-uQHfKWFlu4bg3xmQt2n/g91tFHlpjRlITTv/CMbJykRKf6/WUttS2uInb7IpVTqc
-5pWDqvDN46NML2eZt2gAUGwInnsZhLrKsbB1etK6oEZeBskLoUg9H/OxMB4C9tMX
-4rH1IVQ3DLO5f3Dlj9Jfw0fJNFDJz6xcTmOuJCWbILrmuR0ErmNvHrfWCDPJwA0b
-epQ2llUNftn5RQjpQWqoSZ0LF6yk2Sq3b47bipq6YofyDEXb00hXd9dliE62IolX
-p1QQ19ql/G5GtikOV2aw
-=70HH
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOPhcP/2n5z0h1MN+z3oy/2lw+PNr3
+iU1K79apNpprK4DFpjmiCbmZYPcXGSLj2eUWNTW5WQ/en9tWpaTzUw1aUczmMMgy
+AD3DL2GpX9jVqJEhtKimBdCHBQ8FROplruIfM/GJz3FBmoQkpti4f4Vaq/zSjQ58
+QIqPUeTqCuvg/OjHJCT4Nc+obJ6EjxAIUQYjIe3HhMreGXiLEXm8CuKcGOjn0z8l
+43gSnzkm5vtYYqFvrSxLo+zL+/44Jq/pPKBbNIso2GFKvSF6L6teZYrq/J5x8mMA
+gaIK1spVcgohL67YqC62Mv2xVvmLmRg5SUdtgAvP0T/QEVIInC+XSfSGBqUqR67g
+F4++pjtwNKnfWppA8wIQqUmJyk5i9iQR9LIX4Mvld4IXsxkXQfxxq5R6PiNjUN7V
+pjgH3xyuzwv52AO0KpsZP9tw6CfKpCykrUTrCl6NpikztFuH+tROvd6oGg7bC14C
+kvBhnGyAiaw4DXwt2x9rxnNCySnDn8fapadbAavuVNr39/1iJ1DsY63VMtZABcmD
+urxrRYxB2n07cKGliMUvA4LRjrZ83/N54vClTZC61koY+cCUvZ8Iig0VrY2NTHNC
+vAajd3vpAPhz07+J6+5PuYo/z2SoZGBLDrUralQFLn2Ob6i8iUmL8pPruus1FRE8
+ABkdlEfgufLbiNBdGiAI
+=QrKO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch b/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch
new file mode 100644
index 000000000000..e35452436259
--- /dev/null
+++ b/media-libs/opus/files/1.1-fix-configure.ac-shell-bug.patch
@@ -0,0 +1,14 @@
+--- opus-1.1.orig/configure.ac
++++ opus-1.1/configure.ac
+@@ -333,9 +333,9 @@ AS_IF([test x"${enable_asm}" = x"yes"],[
+ 
+ AM_CONDITIONAL([CPU_ARM], [test "$cpu_arm" = "yes"])
+ AM_CONDITIONAL([OPUS_ARM_INLINE_ASM],
+-    [test x"${inline_optimization:0:3}" = x"ARM"])
++    [test x"${inline_optimization%% *}" = x"ARM"])
+ AM_CONDITIONAL([OPUS_ARM_EXTERNAL_ASM],
+-    [test x"${asm_optimization:0:3}" = x"ARM"])
++    [test x"${asm_optimization%% *}" = x"ARM"])
+ 
+ AS_IF([test x"$enable_rtcd" = x"yes"],[
+     AS_IF([test x"$rtcd_support" != x"no"],[
diff --git a/media-libs/opus/opus-1.1.ebuild b/media-libs/opus/opus-1.1.ebuild
index c6097cfa5710..584102f2986e 100644
--- a/media-libs/opus/opus-1.1.ebuild
+++ b/media-libs/opus/opus-1.1.ebuild
@@ -1,37 +1,30 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opus/opus-1.1.ebuild,v 1.7 2015/05/09 14:07:43 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opus/opus-1.1.ebuild,v 1.8 2015/05/28 10:06:37 yngwin Exp $
 
 EAPI=5
+AUTOTOOLS_AUTORECONF="1"
+inherit autotools-multilib
 
 if [[ ${PV} == *9999 ]] ; then
-	SCM="git-2"
+	inherit git-2
 	EGIT_REPO_URI="git://git.opus-codec.org/opus.git"
-	AUTOTOOLS_AUTORECONF="1"
+else
+	SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
-inherit autotools-multilib ${SCM}
-
-MY_P=${P/_/-}
 DESCRIPTION="Open versatile codec designed for interactive speech and audio transmission over the internet"
 HOMEPAGE="http://opus-codec.org/"
 SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://downloads.xiph.org/releases/${PN}/${MY_P}.tar.gz"
-fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="custom-modes doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/1.1-fix-configure.ac-shell-bug.patch" ) # bug 510918
 
 src_configure() {
 	local myeconfargs=(