From: Diego Elio Pettenò Date: Sat, 11 Nov 2006 00:19:53 +0000 (+0000) Subject: Ignore patch 230_all_libcdio-0.78.2.patch when using older versions of libcdio. Close... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1205e8372d46c5b793922bfd8952316edfb74ed;p=gentoo.git Ignore patch 230_all_libcdio-0.78.2.patch when using older versions of libcdio. Closes bug #154193. Package-Manager: portage-2.1.2_rc1-r5 --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index c859d3a9af2f..0277297df001 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.189 2006/11/04 03:35:57 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.190 2006/11/11 00:19:53 flameeyes Exp $ + + 11 Nov 2006; Diego Pettenò vlc-0.8.5-r5.ebuild: + Ignore patch 230_all_libcdio-0.78.2.patch when using older versions of + libcdio. Closes bug #154193. 04 Nov 2006; Patrick McLean vlc-0.8.5-r5.ebuild: Add patch to allow compilation with media-video/vlc-0.8.5-r5 (bug #153931). diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 79bd92fc4e1b..b451fd2a23a9 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -14,14 +14,14 @@ EBUILD vlc-0.8.5-r3.ebuild 6933 RMD160 033632b6fe505b092b7ea4e5270359e96c20ac53 MD5 318aadcaed33383a71c7207a5213fe26 vlc-0.8.5-r3.ebuild 6933 RMD160 033632b6fe505b092b7ea4e5270359e96c20ac53 vlc-0.8.5-r3.ebuild 6933 SHA256 419b6de88d7d85c9eae2128d93bda285e4b8c8606df0a2762398d1c7d1573411 vlc-0.8.5-r3.ebuild 6933 -EBUILD vlc-0.8.5-r5.ebuild 7377 RMD160 60f87dd18d7c29337a2d567c99b9cc1821ce91be SHA1 c84a5e7e62fa9ac65ea8dddef36179c4a1b8fe86 SHA256 2e56269a874828f1c7f37227e8234b0c385cda958e3c174e5050ff4991f2a810 -MD5 19eccd4f17a58fd2c2b1932c912deb38 vlc-0.8.5-r5.ebuild 7377 -RMD160 60f87dd18d7c29337a2d567c99b9cc1821ce91be vlc-0.8.5-r5.ebuild 7377 -SHA256 2e56269a874828f1c7f37227e8234b0c385cda958e3c174e5050ff4991f2a810 vlc-0.8.5-r5.ebuild 7377 -MISC ChangeLog 35564 RMD160 352df33444a0ea2aff0a29e99638c112277f14bd SHA1 c9d20f539b8ececa0b84b60f821f25bb2bc301ca SHA256 8a9c8545be3cd2c5c54092e5f8d21cc1bbf651d579e3e32dfadcadd8f29202ff -MD5 97e54616ed410fa52e28da834f3aad6f ChangeLog 35564 -RMD160 352df33444a0ea2aff0a29e99638c112277f14bd ChangeLog 35564 -SHA256 8a9c8545be3cd2c5c54092e5f8d21cc1bbf651d579e3e32dfadcadd8f29202ff ChangeLog 35564 +EBUILD vlc-0.8.5-r5.ebuild 7479 RMD160 d87443d301afdc32f29b74beb908852bd309c737 SHA1 3ccb817bab7f5356c80eca6db25e630749a28138 SHA256 9a7e6659a999ac2749b9222d58ed8816ab7f0bae848a588f618837ed927f0761 +MD5 81ff77133353f46a2181354d2978d73e vlc-0.8.5-r5.ebuild 7479 +RMD160 d87443d301afdc32f29b74beb908852bd309c737 vlc-0.8.5-r5.ebuild 7479 +SHA256 9a7e6659a999ac2749b9222d58ed8816ab7f0bae848a588f618837ed927f0761 vlc-0.8.5-r5.ebuild 7479 +MISC ChangeLog 35744 RMD160 65c2af666f112eed44f9e37f14118e1bf3e25353 SHA1 972a5910708dafc7d62ce06b0ea0fd5903287df4 SHA256 ecb656d6a4a6ce2a6ca5e7155760f9239c243ba0234923078c294c4f613f079a +MD5 a88ddc78fae2774ac22ab0c9a395212e ChangeLog 35744 +RMD160 65c2af666f112eed44f9e37f14118e1bf3e25353 ChangeLog 35744 +SHA256 ecb656d6a4a6ce2a6ca5e7155760f9239c243ba0234923078c294c4f613f079a ChangeLog 35744 MISC metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 SHA1 fc3811086b04b8f498738e2461158e2f17da5fb4 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249 @@ -38,7 +38,7 @@ SHA256 71ab8cd26defa0b2ab1517c7fc93188a38657475a9099907c87f7ed03dca32b4 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD4DBQFFTAruWt/XSf2CZdkRAsEOAJdGugkPXc+xxtLaSWk6u9hx96+9AJ0ReNmC -z7gZYMOgGIUOZXOGZTTvFA== -=/jQO +iD8DBQFFVRc4AiZjviIA2XgRAscuAKDV/TXg1vXdePKD0VmnBxGgAc4qjQCg80gp +hwVJwBqAgPyJxwO8TKldxA8= +=Paw9 -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-0.8.5-r5.ebuild b/media-video/vlc/vlc-0.8.5-r5.ebuild index 7ad883402f2b..7c382a002a42 100644 --- a/media-video/vlc/vlc-0.8.5-r5.ebuild +++ b/media-video/vlc/vlc-0.8.5-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5-r5.ebuild,v 1.9 2006/11/04 03:35:57 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5-r5.ebuild,v 1.10 2006/11/11 00:19:53 flameeyes Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -126,6 +126,9 @@ src_unpack() { unpack ${A} cd ${S} + has_version '>=dev-libs/libcdio-0.78' || \ + export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch" + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" AT_M4DIR="m4" eautoreconf }