From: Alexis Ballier Date: Fri, 23 Feb 2007 15:48:40 +0000 (+0000) Subject: Dont erase myconf when doing live workaround X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f113a5d40e923804550f7db02987a3544eaac72;p=gentoo.git Dont erase myconf when doing live workaround Package-Manager: portage-2.1.2-r10 --- diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 4987fce2843d..ccbb37709628 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.227 2007/02/23 13:29:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.228 2007/02/23 15:48:40 aballier Exp $ + + 23 Feb 2007; Alexis Ballier vlc-0.8.6-r1.ebuild, + vlc-0.8.6_p18636.ebuild: + Dont erase myconf when doing live workaround 23 Feb 2007; Alexis Ballier vlc-0.8.6_p18636.ebuild: Add x264 useflag diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 3a79bbe5e43a..9328a3db2731 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -4,18 +4,18 @@ Hash: SHA1 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7 DIST vlc-0.8.6_p18636.tar.bz2 10732448 RMD160 7be1851933e13cb8938ace4139324fae1485eaa1 SHA1 fff2d45fc24f6782ce3fd90ac7a3a9ec4d905d7d SHA256 8d1dbee4b95f460457beddfa02fd4ab9ff162815e9d82f11a96c4e4f03aa09fe DIST vlc-patches-37.tar.bz2 11319 RMD160 e3de703aabfe1b7b2c8d3ed544cdd5e3ee74e846 SHA1 2d114acce8960503bd9973fc1bdb0d49d4b531b6 SHA256 8fcc57d4b87caf1a3306a602ea530857851cb904297b7bcba27679655c9fb65f -EBUILD vlc-0.8.6-r1.ebuild 8507 RMD160 c53e97b36c051cfe954fbcec962cf533de3c16c7 SHA1 6441d5308910c52de13ce7a3f7bdc4ddde6daf9f SHA256 985748d01bdd37ec35f3b768924aee089d7ccbc2a4b7904b37557dc3e60c18d6 -MD5 d0bd160b0bb8b4a643a428472083e2fd vlc-0.8.6-r1.ebuild 8507 -RMD160 c53e97b36c051cfe954fbcec962cf533de3c16c7 vlc-0.8.6-r1.ebuild 8507 -SHA256 985748d01bdd37ec35f3b768924aee089d7ccbc2a4b7904b37557dc3e60c18d6 vlc-0.8.6-r1.ebuild 8507 -EBUILD vlc-0.8.6_p18636.ebuild 8782 RMD160 07b3c148c863e53e7f80cb03ae6487e0d163eccb SHA1 963d56cb76f34dccf8452103465fe7bf1a891936 SHA256 f7e49e3c042e1e07cbb9119bfb16fd3b892114e22e376c51fba8a57a80c74da0 -MD5 90ff6aea025ed43d083ca6030737f234 vlc-0.8.6_p18636.ebuild 8782 -RMD160 07b3c148c863e53e7f80cb03ae6487e0d163eccb vlc-0.8.6_p18636.ebuild 8782 -SHA256 f7e49e3c042e1e07cbb9119bfb16fd3b892114e22e376c51fba8a57a80c74da0 vlc-0.8.6_p18636.ebuild 8782 -MISC ChangeLog 41247 RMD160 0d7a64f81b8193505ab9b94ac2464d4d62f6709f SHA1 f0eff21f44b474a0744d1276a007f8a68b6808dd SHA256 29209083fa14ef737d7a0a632d75d6d16b6e4cda49a635766a16de48eb362c42 -MD5 50852b899eb4db8c47a9c16cc31643e2 ChangeLog 41247 -RMD160 0d7a64f81b8193505ab9b94ac2464d4d62f6709f ChangeLog 41247 -SHA256 29209083fa14ef737d7a0a632d75d6d16b6e4cda49a635766a16de48eb362c42 ChangeLog 41247 +EBUILD vlc-0.8.6-r1.ebuild 8527 RMD160 a567011438128fe7be6cf0454ff5c666132843f9 SHA1 59d54017e6886d9695e59230221a2bfddc4ed029 SHA256 9a412c0fb0dea2a8a91cd5ffbc5308d6ec6fd40809ca0b2b45924e62dea706cd +MD5 37759db7e34db988f9f6a8a11a9beb3c vlc-0.8.6-r1.ebuild 8527 +RMD160 a567011438128fe7be6cf0454ff5c666132843f9 vlc-0.8.6-r1.ebuild 8527 +SHA256 9a412c0fb0dea2a8a91cd5ffbc5308d6ec6fd40809ca0b2b45924e62dea706cd vlc-0.8.6-r1.ebuild 8527 +EBUILD vlc-0.8.6_p18636.ebuild 8802 RMD160 8dafdf72d26d8be8c4455356dac04ce2eb01038e SHA1 f2030e2291d5e06577311ad2ff9904fcc23b5297 SHA256 5f45591ca323ec129e86f7f23ac1c78ca2b8b45b67ce8ddebf0f2998340e326f +MD5 b3d49bb197516e07b8a7eb14598370e8 vlc-0.8.6_p18636.ebuild 8802 +RMD160 8dafdf72d26d8be8c4455356dac04ce2eb01038e vlc-0.8.6_p18636.ebuild 8802 +SHA256 5f45591ca323ec129e86f7f23ac1c78ca2b8b45b67ce8ddebf0f2998340e326f vlc-0.8.6_p18636.ebuild 8802 +MISC ChangeLog 41395 RMD160 1aa2df14cf31a44a4aa4f19f75c8cd9027eeb255 SHA1 729e476b7aba26eea3396d2f271373224d0c0f95 SHA256 aaceb5d35415d238c31fe0ac7d2ef64757fdedd27b393605494a9e1563e94ff6 +MD5 b0d46e8e8a5ea3fa7a9cb655bc836d76 ChangeLog 41395 +RMD160 1aa2df14cf31a44a4aa4f19f75c8cd9027eeb255 ChangeLog 41395 +SHA256 aaceb5d35415d238c31fe0ac7d2ef64757fdedd27b393605494a9e1563e94ff6 ChangeLog 41395 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225 @@ -29,7 +29,7 @@ SHA256 97cf37d48184fcd8d6ee66df77b107c0cbcd1ff937bc3713c08dc5e6d63de93f files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF3uxbvFcC4BYPU0oRAv4PAJ9oMZruMvfdI4AyCo/lKo4oYTKAwwCfaETO -rizl3A+tcShhf8og99y0thc= -=yR2N +iD8DBQFF3wzgvFcC4BYPU0oRAuJ3AJ40ijx+DtMhssBXJG+L9nAaK72z3gCeNDND +2n9GQq2MuQIECntzNzRY0uQ= +=DBsc -----END PGP SIGNATURE----- diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild index 19770292ceae..a81e29b5e1c3 100644 --- a/media-video/vlc/vlc-0.8.6-r1.ebuild +++ b/media-video/vlc/vlc-0.8.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.18 2007/02/14 08:14:46 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.19 2007/02/23 15:48:40 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -173,9 +173,9 @@ src_compile () { fi if use live && ! has_version '>=media-plugins/live-2006.12.08'; then - myconf="--enable-live555 --with-live555-tree=/usr/$(get_libdir)/live" + myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live" else - myconf="$(use_enable live live555)" + myconf="${myconf} $(use_enable live live555)" fi econf \ diff --git a/media-video/vlc/vlc-0.8.6_p18636.ebuild b/media-video/vlc/vlc-0.8.6_p18636.ebuild index ec728fcfb7cb..d627118f16f2 100644 --- a/media-video/vlc/vlc-0.8.6_p18636.ebuild +++ b/media-video/vlc/vlc-0.8.6_p18636.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.13 2007/02/23 13:29:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6_p18636.ebuild,v 1.14 2007/02/23 15:48:40 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -181,9 +181,9 @@ src_compile () { fi if use live && ! has_version '>=media-plugins/live-2006.12.08'; then - myconf="--enable-live555 --with-live555-tree=/usr/$(get_libdir)/live" + myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live" else - myconf="$(use_enable live live555)" + myconf="${myconf} $(use_enable live live555)" fi econf \