Add a patch to allow building with automake 1.13.4.

Closes bug #469504.
The patch is from upstream's svn repo,
so it can go away with the next release.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6521E06D

4 files changed, 47 insertions, 20 deletions

diff --git a/app-accessibility/sphinxbase/ChangeLog b/app-accessibility/sphinxbase/ChangeLog
index 4beb7938fc12..f086de9e40cc 100644
--- a/app-accessibility/sphinxbase/ChangeLog
+++ b/app-accessibility/sphinxbase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/sphinxbase
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/ChangeLog,v 1.8 2013/06/27 18:20:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/ChangeLog,v 1.9 2013/10/27 15:51:51 teiresias Exp $
+
+  27 Oct 2013; Christopher Brannon <teiresias@gentoo.org>
+  sphinxbase-0.8.ebuild, +files/sphinxbase-0.8-automake113.patch:
+  Add a patch to allow building with automake 1.13.4. Closes bug #469504.
 
   27 Jun 2013; Agostino Sarubbo <ago@gentoo.org> sphinxbase-0.8.ebuild:
   Stable for x86, wrt bug #474436
diff --git a/app-accessibility/sphinxbase/Manifest b/app-accessibility/sphinxbase/Manifest
index ce754fe5b4ac..24bfcd9f787a 100644
--- a/app-accessibility/sphinxbase/Manifest
+++ b/app-accessibility/sphinxbase/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX sphinxbase-0.8-automake113.patch 844 SHA256 19921f03dbc071b1258737595f5a0f3fff06359fe663832fb4672fac1f320def SHA512 3275705839ce5d720e2f0914998ad8709e2199ae00852555c89691897499b4ea2dfcd9943213bd3d62472e7d73c6cc8a9ba2cf9315f4e0c2b3023b9adca01787 WHIRLPOOL 14fec6ef4057f95a4ca873d5657c24b7ac3dff66e664fee6b3453ea75a06eb836030b2718181044e041f3f5ecbcee79ebf906c0d8d97f8bbd9c9e788f5b210ed
 AUX sphinxbase-0.8-unbundle-lapack.patch 2838 SHA256 7cf9428b77870753b57f26e9527283355ec5d7f460532910fe477429ad360e63 SHA512 65fe50fb11851848d0ae9ad17b4839953c1bebb027b91c42dc347c7e714ddea5f2a3131e2e243ba0ff771501c074a5d9850cef44b848d0feae90c764daa59447 WHIRLPOOL 0449079aca9fb1dc65b9725de2efa2d130f4955753dc5ae27579df2d58814776c0ee8b737e1f41debdce5121b28b8c1fbb30028614796a3edf9854421e01f828
 DIST sphinxbase-0.7.tar.gz 3291922 SHA256 389cb99a545f7d615a2b3bc3f7362a490ca45fc4dc440140ae1d2a41f87773ec SHA512 c5cc4e60a43fdaabce8b75c89eaa5e3dc4a0ef1f4fc253a20da8098eea7f13cf1e344ce42ae8a70f34bce20547fc2c88858fc3ab62ce8386fed666dfa43e1109 WHIRLPOOL b1a2238595b371ffe4c9b48d7ab0b604be2adc1b4e3cab3f9a17c3e9c587cdfa5bfcb33e5c8e0fc9bf282873f7ab4fb3ee03551b2063c1398e51eefa83a0e15a
 DIST sphinxbase-0.8.tar.gz 3313197 SHA256 55708944872bab1015b8ae07b379bf463764f469163a8fd114cbb16c5e486ca8 SHA512 fdb13c07e591e868c395d5f8209ec389fb9d5a93d99104a00cb82382e84d320091ae7e74d53225706331d4959ab5e248fa622582a148bfdb6ab5c38470d1963c WHIRLPOOL df050d547a263954574902ce08d966a184d428ea5ec700128fde2fee5d78f948a5920e2b92540f052e4a1d6ac208b388350d7ad66c0548ee945f99ceab0f0a0c
 EBUILD sphinxbase-0.7.ebuild 1450 SHA256 6c930d416a47fa97f2d81f2936c5445b5855ef21b1a44b64cc30f7c56cd45acd SHA512 c5dd7ea0198a0b8be100bd04e6d0c4f3fc2ea8bc0113bbbef599ed7186469e49fd4ce0a84c2cde8bd0f27c84e369dff9dba8236c6355b14f838c4c0e00848f2e WHIRLPOOL 6bcd605bad9eedc1f9c08f9361ad5b723d32399853d4d6466f73ffacbeb69cbe1855f2df85ed913d814fb371f51f3dde2779b2ebb59e3f26c64c7a806837355b
-EBUILD sphinxbase-0.8.ebuild 1653 SHA256 64b252ceead47994b759b1e6bdf8e91ca6c16b722cb06d969fb68bc891fdc101 SHA512 6084fa6fcf3d22972f63cf934f8ea04ea58dd7f7fa588ca921f42d1d634ac6f68526c30f09eb1be2802117fa0471619ea93d35b728a37130937846cdf1a6a8c6 WHIRLPOOL 000e55ba456c28af0aed8aa672e3933bbca41a82706fa8b7fbbe616814b104fe07fac7c133c7f901f427b95aa0d553030632537676656d51d308e90636cba18b
-MISC ChangeLog 1333 SHA256 fe9e23a96516a15199799f66bed0fec5a3d073547a74108859795d354f982906 SHA512 b7fcb94f084990fbdff3e29c629de147ebb0527bcb2d85159641517fd580e5050b52b09ab96fc3da7c3a9d6147be2a618d4429fa05cc8eaedf9ae07874b6d648 WHIRLPOOL ef1f9e38b9ad87549bf4b82c81b528d8c4f042a4343474d5b98c4dd0e950396e0f96c3db63cc05832b939c3693666f8492779efbfafbe25ca70fc5618d640def
+EBUILD sphinxbase-0.8.ebuild 1698 SHA256 23b1875314eac3b040fe654af10eea440e8f8074cdd3d6e362fc1854be887c05 SHA512 6e07fe6430ae95c6382d9aff16520b4bca26355d4451fb616af0130a17dc97053b6ce3f77f8a7358a6983f99b19b45134cd005ab3a285d8250e33a80f4ab3596 WHIRLPOOL e2412c1dc11e802c61cfa54a14615390d8758f7c3c02081d2cb948f4bb2aa35ebaf3464e1bcc5f21721a4469ecfc902e30a1254ccd7841eaf94371a33590dc28
+MISC ChangeLog 1538 SHA256 0033b878e4d98d1c3f0fbe0122102e1dbe1bb6e8e8f90ce0c36460021b363046 SHA512 53a041a44d2432b9c1d1fa1411466795c298a0bfb3edbba652c36d00e2a091ce48e91290b8f5bfd20f0e91da1b767adb6420617a34c7a373b26872b930bc1931 WHIRLPOOL 7053769e13a4cb58ed12efcc5fd68cf07f8871c4bea5aeec53e51f3566621a5d22e963b262a347ac4d4ab9b533e446a2f62d9153e847f6c4dc740970b195b4e8
 MISC metadata.xml 168 SHA256 2e110b646c5715ef0b4f393855f2e3bdf8126ec010d7dac6bc17dbaa7aa1bb1f SHA512 bf8e82515707dc6548946b094d087bc5f5736d4adce013fa2289b9b935cb35300197e66dbd965dd40b72ecbdd6277a013f6b7cdfb8d86f658b3eabc9608fd81f WHIRLPOOL d1b2e2111b62ccf0df301cf6d0e510e9f307b67e6f1d779d78be5a0e61730ed531aae4527ffd8c817f6696a5e1ba9f247a525825f51103a9abd015554d8dc8a9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRzIKAAAoJELp701BxlEWfJYsQAKwKQRKdpaW4OfYhpC/kYVOK
-6yVXrA0IzCTHh5BxnrCGE/caBUfibiOYpAIldhY8JNfjMlNm4tAn7PphFSy1RJ5j
-ffyCOycSPMcxAonWoY8DDoFVv3V94NnFuktb1a3rnj7WxoQSplKBx/Dg6eQQZWY6
-5tc+LxUJ2A226CT8KxbgcPTCZ3+9a953OaHe46C9+FqL+wtdSk1vCSIwnY+jFh9y
-r480bfqdRst2Xc//3no7Eg4RPt0dfBwlSIucaaGAu9z7+TjUvo1K1UOlkJnCTyIc
-WXpV6lSsFRRUOIO3Myhh4yD9Epdt7QgwGwVwDZYClLWzv0BiFJvmVyK/4yDGzQDn
-e5Q+mIrNUs8Qo20SAqF/chikm5gqvKObju5pkdXPKlK340vNAdFE4lP+tSYsrJox
-3A1YuRUbbBnDjwvpYkEnIxomKSx+9jXScsSUMLVB6FaI8S3fNTPcHARinKJrGzvf
-kbDIuCqoQE6RInoxiTHLqsGbi8tTVxbTveORYo49BMl6ggHLodhot8DlnEICeZ/p
-ItnV3vdjQOqB3aCS+CoJnDRojp8RAV+I7GSsGAwTe6MykAphkhNm6LPoOb+8+gD9
-ewa/mk166obvsMxaqSQ5Ms6UaUVHVmIepLrgG2wRAwvVRZZ/ncteoWsSqsRyC/M8
-tlYpG2HQCm/PQZzOSxIJ
-=GeHE
+iQEcBAEBCAAGBQJSbTaeAAoJEH8qFnJlIeBtPYoIAJ+fQyjvfwpD6CX6W+byXSoF
+e8fcIQCbHIJQG0IzOJD8OtHr22ReBIEje+UwCCSP0f87WJAFd/+yOcrQA/Na7p4x
++to1+3HCYEsgbV7h2p182uM0/tt8ijvw3VNm+bZ5tAAQO7WqtL9HkZvxJMKy6nBG
+DgN1Hjtyp5ZUhD06C5oq5v84g643Dw5265Lt45KNMAMpiVHDXCOZw1X77W0bKym+
+rDzTFQoVT2ppGGoC77IbDyUKv/vgE3OHrwlhbEWwm3J5/kmxkMCin/y2bj1QqZtk
+tstq26oeWhkPxReWnDrCQetfM0kQS9R7E164D+LLo01Mj3JaqzRdGE/FS8CyXes=
+=3TSK
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch b/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch
new file mode 100644
index 000000000000..11031918ee68
--- /dev/null
+++ b/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch
@@ -0,0 +1,25 @@
+diff -Naur sphinxbase-0.8/test/regression/Makefile.am sphinxbase-0.8.new/test/regression/Makefile.am
+--- sphinxbase-0.8/test/regression/Makefile.am	2012-12-05 06:05:39.000000000 -0800
++++ sphinxbase-0.8.new/test/regression/Makefile.am	2013-10-08 13:05:15.498853962 -0700
+@@ -33,9 +33,19 @@
+ 
+ # Disable sphinx_fe tests for now if fixed-point due to imprecision
+ if FIXED_POINT
+-TESTS = $(srcdir)/test-cepview.sh $(srcdir)/test-sphinx_pitch.sh
++TESTS = test-cepview.sh test-sphinx_pitch.sh
+ else
+-TESTS = $(srcdir)/test-*.sh
++TESTS = \
++	test-cepview.sh \
++	test-sphinx_fe-ctl.sh \
++	test-sphinx_fe-dct.sh \
++	test-sphinx_fe-dither-seed.sh \
++	test-sphinx_fe-logspec2cep.sh \
++	test-sphinx_fe-logspec.sh \
++	test-sphinx_fe.sh \
++	test-sphinx_fe-smoothspec.sh \
++	test-sphinx_jsgf2fsg.sh \
++	test-sphinx_pitch.sh
+ endif
+ 
+ EXTRA_DIST += $(TESTS)
diff --git a/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild b/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
index 4b9d5b9fc12b..b54e79e0b783 100644
--- a/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
+++ b/app-accessibility/sphinxbase/sphinxbase-0.8.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-accessibility/sphinxbase/sphinxbase-0.8.ebuild,v 1.4 2013/06/27 18:20:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild,v 1.5 2013/10/27 15:51:51 teiresias Exp $
 
 EAPI=5
 
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
 # Due to generated Python setup.py.
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-PATCHES=( "${FILESDIR}"/${P}-unbundle-lapack.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-unbundle-lapack.patch
+	"${FILESDIR}"/${P}-automake113.patch
+)
 
 src_configure() {
 	local myeconfargs=(