Fix building with automake-1.13. Thanks to Ulenrich in bug #468214.

Package-Manager: portage-2.1.11.62/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

4 files changed, 30 insertions, 8 deletions

diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index 3d2b9be96832..84a6e4771c6f 100644
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/aqualung
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.28 2013/01/20 10:05:03 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.29 2013/05/02 16:35:04 billie Exp $
+
+  02 May 2013; Daniel Pielmeier <billie@gentoo.org>
+  aqualung-0.9_beta11-r2.ebuild,
+  +files/aqualung-0.9_beta11-automake-1.13.patch:
+  Fix building with automake-1.13. Thanks to Ulenrich in bug #468214.
 
   20 Jan 2013; Daniel Pielmeier <billie@gentoo.org>
   aqualung-0.9_beta11-r1.ebuild, aqualung-0.9_beta11-r2.ebuild:
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index e1ab3a1058b5..173e7a09ba3a 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX aqualung-0.9_beta11-automake-1.13.patch 524 SHA256 e256249314c37a1d6347c5ac840bc10d9eaa37bff1aa189c055d622c8ea75441 SHA512 a81f0ee28af7f467a6fbff61a2b5ada5a9ff31344bc0399f2ca6715aeda4012992d1a8f5924e738503418fac8135d8bc9a82f44c858ab122fd3812eaaea5284c WHIRLPOOL cebe36e214a8feb947011a5f097b79c40c3654c706c4ae88d2a39a0824ffceb0e4dfd8d38dfab693826720c9982cb10913ef65e83982f18fd1d337bbab179ed1
 AUX aqualung-0.9_beta11-ffmpeg.patch 880 SHA256 8f4083e2b2b6a54bb7c0da4eb91e3a1ca96fb17a30907b26f6d2384878fe4377 SHA512 5e1c42c640b87b6dda71743a4215bd77a19da8c359afad94f07c08ea4b162d4ad86ca2ed204c5a551299ca656b9c8c9d6fb862ce742817fdc9dbcacc166fc4d7 WHIRLPOOL 11f5d2c2454dea807f1b546ee176aab2506a9bb4fece3449e258fa566fdb33ca345f205bcfa6e170b333519603e55ad06d4486115c4e65e7b276ee481bce5634
 AUX aqualung-0.9_beta11-libavformat54.patch 1170 SHA256 1e0d189c36e70ba8e9d49afa4051f8417560c1e016fefcf6027a5622d4931d09 SHA512 e2a9f923fd48add6f36740f87eaed363ea627452a8a88db5bd38438aa62a4c29c014f4aa8b3e9f6512efaeaf5dc6dc2b839e8df2a07c8b388e9677f8d6a5bbc6 WHIRLPOOL 3972d343981ebb1b415284134cdf79a46de9470de1cfaee8f992662345214672e6f56b5ca33233b935cf32505a17c04af7f7726f9b0be6294daf04a919d4eaa9
 AUX aqualung-0.9_beta11-use_lrdf_cflags.patch 1190 SHA256 1bd61fae33bbd2bc36e551dac73757258765de28b17cefa33f70474947197e66 SHA512 611ec971e00226a32d9d402fffab26bb65bec2353d186875ffe9dcc074cca67854c80d86f31c7cccc32df3320dba5427ec4b3b4782f43922cb5294eee9c92631 WHIRLPOOL 1858a5c5c76175c92abd598e164d5bea0563dfb98973b961d5c4efa2c1a0acf8acb1ecfa1dd1fdf26a93fe88400ac62926f6eca2e6d8d33d6a09cfa956740711
 DIST aqualung-0.9beta11.tar.gz 1584700 SHA256 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd SHA512 b5b7b8b8f10f0ac4bd332d7644e0f22003edc30c24aaac04b21ebe14b2a451ab3b06c6996e77b795a0fa600090a5bd42a8f993a28269dd8ec905c37b2debf399 WHIRLPOOL fc1c3516b55818979ae14080cae9ce9ed7ad8b57cf113fb90c66dec51ae75c9c176a32ad1be02cadac2a96799281d800e283a70743f876319f25e457fa6d672d
 EBUILD aqualung-0.9_beta11-r1.ebuild 2701 SHA256 ffeae43c32baffad21392c91ae480efd28ab4339ec561fff38f8f59e813cd151 SHA512 73403a9c05683caa91645fb3044103285fd6b22f6244a0a9729e18a22247d71d2b0023b3d3bc9fcb5420f3883110832aed3a339caf3b209392631b608b96175e WHIRLPOOL 358074bb0713c1a59fdcd095d2fa68350f86ab65795f7d8dc24c289085671563c5414913fc158f0b4e5dd8605b12307353cca9eae19b570b580bdd87e5c9c962
-EBUILD aqualung-0.9_beta11-r2.ebuild 2649 SHA256 42f9081786a2ec2c230454689362dcf610f15bd247b51fae1f75e588327b985b SHA512 1304897082c6b91d49abbee13828f770ebc978cc32b158c6f3029ee40d3b72bf117387a65353cd475d7d0dd65ac7831013dd6250721c8bdccb5f60436225ba26 WHIRLPOOL cec920e12bde9e85a877f97d147e3bce889936dd57279c5992df28c2ed9ce8a32389316e5c4f4bdb4020f6f6eab9355c851c1b8f3cb02c4b168f17e30b98cd66
-MISC ChangeLog 5316 SHA256 9041bc6757280f8310492bb8afe577ae40ed38f752f00507ddfb8b1962ed9e52 SHA512 8147dc162638dbaa34b818c09e5f81aa00b6fd8952faa836e48c2bd72f852c13e810664e1183454d8617edc93046361932cc15871814eacff8fadfef3eb9c37d WHIRLPOOL f6c91dd31c0bc12425fb66a9210cf8b5508cee7a09039f903c8543b904835ad8be87beb152a4e74d50991acd8fa448d0345ebc8d2dfd795a4286f6fa151bc429
+EBUILD aqualung-0.9_beta11-r2.ebuild 2692 SHA256 c5d0754d7e650b8f8e42797aa680a09c5fa144694b760216ce62dfda867092d5 SHA512 e805b81f1f2230bcb7d84c2ff2150f1b1ba905f59725189a2d49527cf437fba81b02deb441820f22853c06657716efff1bc758fa4a8744ff0cc3b0235fc99270 WHIRLPOOL e455f5ee8b7ec9a4077e36a70ef701f06548193d4439051e532c853ce935709e38660accc9c9c704b5ca591f51e2657318c7ad00b8043141103b91995cb5381e
+MISC ChangeLog 5522 SHA256 230c3ce8ba64acaa03c95acb7b38ad9790e2ba0d488ea7166be08a747baf2539 SHA512 34a66682e4858fa56cdb0d2ecdacbf456226f47b74167bf9db54d47251ed0e029b66f3cc30b7ccba2f8164d217e7d1e2c687b6948ecc4f3e826c0600218adb0f WHIRLPOOL b97fc64f452eed71ad6d8739ecd50a7eea35b60b05ed4f1aae0260fce07de2f588a794cdab66dda8dec06e54c1a40384498f228d8025cde482faf8bf5cecfbde
 MISC metadata.xml 663 SHA256 c0a4fbd91732bb8bf47fcf8862325f1ab833dd2c1e91a4e27d3482eb7998c575 SHA512 6e91256f59dd584f7b9c09b1c3704e837691c6b09c65401c828c6f3e9a57defdb4984ec531baeb2e0680edf455210f33b8226cbed317090c2c61ab22305ba574 WHIRLPOOL 75d15bcb548a80baf81bdf25f75c4ec2fb50f2aac4596f550d5b0d4e8e9a120524463408b4bde1f545f7e2ff3ac85523d616ecb3479185c1bc532dae9581a789
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD7wVUACgkQlcuUeyFa0U3NGQCgpB0M0uxTqq0gpjJWlaO1qQi/
-dH0AoKzFysImOyaR/tp+b1IDH6yGEYiq
-=IuUc
+iEYEAREIAAYFAlGClb4ACgkQlcuUeyFa0U2tygCg9i20KF6Ykc8iIzXjbV6EcAVA
+Z0gAn1WlZy05KtSFkT1a0IXsDgSGnMyz
+=EOu8
 -----END PGP SIGNATURE-----
diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
index a4fe99b2d944..78ce1cf38cf6 100644
--- a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
+++ b/media-sound/aqualung/aqualung-0.9_beta11-r2.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/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.2 2013/01/20 10:05:03 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.3 2013/05/02 16:35:04 billie Exp $
 
 EAPI=5
 
@@ -51,7 +51,8 @@ S=${WORKDIR}/${PN}-${MY_PV}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch \
 		"${FILESDIR}"/${P}-ffmpeg.patch \
-		"${FILESDIR}"/${P}-libavformat54.patch
+		"${FILESDIR}"/${P}-libavformat54.patch \
+		"${FILESDIR}"/${P}-automake-1.13.patch
 	sed -i \
 		-e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' \
 		doc/Makefile.am || die
diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch
new file mode 100644
index 000000000000..bd8d45919793
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch
@@ -0,0 +1,15 @@
+--- aqualung-0.9beta11/configure.ac.old	2013-05-02 18:20:45.918789345 +0200
++++ aqualung-0.9beta11/configure.ac	2013-05-02 18:21:51.471466816 +0200
+@@ -1,9 +1,9 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(aqualung, 0.9beta11, http://aqualung.factorial.hu/mantis)
+-AM_INIT_AUTOMAKE(aqualung, 0.9beta11)
++AC_INIT([aqualung],0.9beta11,[http://aqualung.factorial.hu/mantis])
++AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src/core.c])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ 
+