Include libFLAC.m4 in a separate tarball to avoid autotools failures, bug #212584

Package-Manager: portage-2.1.4.4

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 019e52e685151fbebf8e2bb15e6552aef9c54f4c..4077d8a5dcf402939389b04c94fbca5dc1bead2d 100644 (file)
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/moc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.48 2008/03/05 19:04:57 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.49 2008/03/09 14:36:48 aballier Exp $
+
+  09 Mar 2008; Alexis Ballier <aballier@gentoo.org>
+  moc-2.5.0_alpha3-r1.ebuild:
+  Include libFLAC.m4 in a separate tarball to avoid autotools failures, bug
+  #212584
 
 *moc-2.5.0_alpha3-r1 (05 Mar 2008)
 

diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index fead03da3d664ac1b7c9bed77865c967cc486ab6..c285af77c58e1f8a7c61212b52e5dec3a4209ab3 100644 (file)
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX moc-2.5.0_alpha2-endianess.patch 1747 RMD160 6b284b59d461aba3b3248b78cee7a4c576b9d67d SHA1 4a26b7f6b488f7781ba18a1423dadc0d74a6d8b7 SHA256 b6874f79f454a430dc96705b54048ee999576e8327436ca9ef1654b72bb5f28f
 AUX moc-2.5.0_alpha3-faad2.patch 933 RMD160 54fdaee534bde0f2004334ce1637d6f57a95028a SHA1 d387c13600458eb4bebe2d2715e5eaba36c748af SHA256 2a221a9328b3a1dd753af07d0ba64ebffba145b2309d7c9ac596b04fc8c4a283
 DIST moc-2.5.0-alpha2.tar.bz2 486681 RMD160 64efd4bff599ae419dad34905725db38633ec8c9 SHA1 9d448c79ad0889cc5a27c5d9e1bbe7b6a697954f SHA256 000deb3212a70fe4b83e4f005753746e80fdc7d5b74db89b8a6cf69410c455a3
 DIST moc-2.5.0-alpha3.tar.bz2 489824 RMD160 7a603538e2080f3e182a543bc82100a09a56c2fe SHA1 59251b6239ad38f3f5ba8a1f73d1e90246765ab7 SHA256 6b691295eb0b42aab17805798bd40fb308619a9ba8f6a1e1ed599e3449946617
+DIST moc-m4-1.tar.bz2 1635 RMD160 25f0561e4fdd7f5a622d419dae434bbcba70a02f SHA1 0e0c47b379764f986976414c283a05e6da825822 SHA256 337f47d91fbf532443f278b81db3d69d13260bebeaa1358bedff34e10637dee7
 EBUILD moc-2.5.0_alpha2.ebuild 2042 RMD160 b6d43919bad24a254fa452317a74e44291271b04 SHA1 8c1588a576b9c5952e42525f04b1139575dc1a6d SHA256 eb844976f867392e231e1e4c8859e4a5f8eb4d9aa990b306eb2dd446eb3d5b8e
-EBUILD moc-2.5.0_alpha3-r1.ebuild 2109 RMD160 f564f390498234ae6d932cd0b6d85c5274b9fa10 SHA1 5f784aeb64f39f1115493402bc64603457b8915d SHA256 09b9f299b0e41f7404fefd3479e513ae57f98280cfa3984ab214f8c2afad47a2
+EBUILD moc-2.5.0_alpha3-r1.ebuild 2206 RMD160 c88511932e28e721cb61663ea3e70b89b695281c SHA1 c80e66e36b4ded02a758feff7c704be4f152e1ac SHA256 da011c87a7769b16fa22a86e7b58f3d2413ca97819ceff14b5092c715057f826
 EBUILD moc-2.5.0_alpha3.ebuild 2011 RMD160 2ca4a5495b8097e10dcd82d09a9a1ac1c827307a SHA1 49313c809317b54ae2d624b110325df75104b517 SHA256 950ae9554e3611f14aa78e8be922d709613dbfc6f8029c821069ac90fa11c854
-MISC ChangeLog 6918 RMD160 45d98ff9ea8bfec142f0ef6f393d057e84d2a2c7 SHA1 19509920ab5fc60348c52ed49728d580fd13195d SHA256 26bf380ca340fded3a217f05aa7ebf8ee32bf123f4f65ff8063489303efe2c79
+MISC ChangeLog 7091 RMD160 3357e2d2ccaee5b95d5ae7b7c0cdb344378bffad SHA1 1f18534d8e7655ee5d07d1c1e17d96f4ef6d5d36 SHA256 c303531704989fb84f84d08289a9d5bbe36cec4f3ecde3788ce0cd1204a8b167
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH0/YIvFcC4BYPU0oRAg5EAJoC+B7bz+1S4DjrxOYeekqwqpzZ5ACeJkBu
+EnUdkwSkKmklc+rd8I13USc=
+=+eix
+-----END PGP SIGNATURE-----

diff --git a/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
index 1925889c0a698b8b4ffc22ac685eee59fdd816fc..2f62da040d5406b1947829487b08a2cd57d9f57c 100644 (file)
--- a/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
+++ b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild,v 1.1 2008/03/05 19:04:57 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild,v 1.2 2008/03/09 14:36:48 aballier Exp $
 
 inherit autotools eutils
 
 MY_P=${P/_/-}
 
+MOC_M4_VER="1"
+
 DESCRIPTION="Music On Console - ncurses interface for playing audio files"
 HOMEPAGE="http://moc.daper.net"
-SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.tar.bz2"
+SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.tar.bz2
+       mirror://gentoo/${PN}-m4-${MOC_M4_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -40,6 +43,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/${P}-faad2.patch
+       cp -f "${WORKDIR}"/m4/* m4/
        AT_M4DIR="m4" eautoreconf
 }