ffmpeg patch now in upstream, remove unneeded and failing epatch line (bug 381725...

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 8fbae70fa09d5378e680e48b299d330dc233252a..7f82a2e0d04abc4241079205fb35422de4970153 100644 (file)
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.263 2011/09/03 18:39:24 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.264 2011/09/04 01:24:06 xmw Exp $
+
+  04 Sep 2011; Michael Weber <xmw@gentoo.org> mpd-0.16.4.ebuild:
+  ffmpeg patch now in upstream, remove unneeded and failing epatch line (bug
+  381725 by Josh)
 
 *mpd-0.16.4 (03 Sep 2011)
 

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index c0361ce4b07abff4cd872f65e4af821848499051..b8aa176f59d5aa8a58b85dbbdbcb88f9c5687d66 100644 (file)
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -12,14 +12,14 @@ DIST mpd-0.16.3.tar.bz2 477517 RMD160 860a308ec443896da43c7421db8895c5aff9bd91 S
 DIST mpd-0.16.4.tar.bz2 478807 RMD160 2e06445ea09c30b0ae63c33b85875114008fd13c SHA1 b4eb52903f269e18f434ca5fc346be281ba22c4f SHA256 fa85ca6f837bdfa5ac165c674c2d8cdb77ff44b5f56fac526bc6a11211e61cfd
 EBUILD mpd-0.16.2.ebuild 5426 RMD160 26c1acc62728eeb9102dee0f63ef7b3f26656088 SHA1 0cc36c588c3026ddd02252c2de8abfaf20077540 SHA256 9e80b9113e43090b2eb01fa501c4220367fa738558040059a74c05e2b9175c86
 EBUILD mpd-0.16.3-r1.ebuild 5472 RMD160 8241721e65c37bd0a211c18327facec83f299ec7 SHA1 cc6f0c0ed19840b23f8e1ba8444ad88692f03ca2 SHA256 f7dad7bb1a5c722fabfe3e1a50ba7a41012af1149a35060198535575d4c36b09
-EBUILD mpd-0.16.4.ebuild 5469 RMD160 9a5a9ce9064bfdd7d75b95dc4e09fe2f94047d97 SHA1 8f7968375a65e2fef93478e7fa8eb3989e9f333c SHA256 3818321c32bd58d704ddc3bd0cd3ad985ac76d99a25779a505c9265b74a8f90f
+EBUILD mpd-0.16.4.ebuild 5429 RMD160 cdf2e53424f70dfe26e7d947ed3fd173cb7379c8 SHA1 14ca409dae511ae2a42ef75c01ecbd48fbcf23f0 SHA256 fd46a6e1bf5833971c6e1081a8642f665aead365a4ede6d99bfd27c5f78e3aa4
 EBUILD mpd-9999.ebuild 5492 RMD160 9cdc4093fd888d445f1b5c63c0cdf41a5a644c3d SHA1 8eb1ee71a902e8c663c8ef36da8c003ee9c2f321 SHA256 0b3f2c11cb59b7027e489035222fe0e9e77451b902b75e0f7714b7ccead95df4
-MISC ChangeLog 38217 RMD160 3c0d9e615d67d70fa8317fdb7b0023f65ceb5e24 SHA1 ea9e774c0bc2080727b417efc4ebb420444ff1f4 SHA256 50acfd9bb7efcb42b2c1e5ce222094bf0a4dd3a379a5dafa93d49254e28fcee3
+MISC ChangeLog 38374 RMD160 8f0c292b661a1983f22899e3ce5d9444efb62684 SHA1 6b151fb305619b6b9dc851058636f0b16547cf7f SHA256 c487de244f8fe9fc5f274edfda2cfda375fec9e529f1330ceda3ecd77c939932
 MISC metadata.xml 1434 RMD160 170e2d23e96fb26f832a6fa64d77f9260326e62b SHA1 02b0ce06f5fea588ed924a837d1d375fe7f2a8e9 SHA256 781c3f6bdd130a2638b390f513395447500d609682750748c13b8a7cd9d17034
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5idFsACgkQmWq1bYTyC0PZsAEAidcTVdcAXcT2tkCjUMHzZGZz
-uPxQ62Uz1dL718dVwUEBALzmPXnp9+RjNbGbxz75pXw2f1LCSchj/aoFGLUrvLwM
-=j50f
+iF4EAREIAAYFAk5i00IACgkQknrdDGLu8JC0pAD/bplqIKwwtQiUmCaf4hLE240n
+0l73yYPXtCE9rSDyW+cA/1Vqci+l5jMZrq9cgdI1Mz6S7JkZWhmwyZbTPaMaF8T/
+=DQiL
 -----END PGP SIGNATURE-----

diff --git a/media-sound/mpd/mpd-0.16.4.ebuild b/media-sound/mpd/mpd-0.16.4.ebuild
index cac8ba40523d0d2a97f462da7347e48495d7388e..14d98d722f4e0e2f00c17d82b2fae81ba928a2b2 100644 (file)
--- a/media-sound/mpd/mpd-0.16.4.ebuild
+++ b/media-sound/mpd/mpd-0.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.4.ebuild,v 1.1 2011/09/03 18:39:24 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.4.ebuild,v 1.2 2011/09/04 01:24:06 xmw Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -79,8 +79,7 @@ pkg_setup() {
 
 src_prepare() {
        cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-       epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
-               "${FILESDIR}"/${P}-ffmpeg.patch
+       epatch "${FILESDIR}"/${PN}-0.16.conf.patch
 }
 
 src_configure() {