From: Alexis Ballier Date: Thu, 15 Feb 2007 07:47:05 +0000 (+0000) Subject: depend on mpg123 or mpg321 when using sox, bug #99500 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e272aa733a1d570e1d4bd752b4113de4441b52f5;p=gentoo.git depend on mpg123 or mpg321 when using sox, bug #99500 Package-Manager: portage-2.1.2-r9 --- diff --git a/media-sound/terminatorx/ChangeLog b/media-sound/terminatorx/ChangeLog index 7b360f550e6c..42a039f82eec 100644 --- a/media-sound/terminatorx/ChangeLog +++ b/media-sound/terminatorx/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/terminatorx # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.20 2007/01/05 20:09:02 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.21 2007/02/15 07:47:05 aballier Exp $ + + 15 Feb 2007; Alexis Ballier terminatorx-3.82.ebuild: + depend on mpg123 or mpg321 when using sox, bug #99500 05 Jan 2007; Diego Pettenò terminatorx-3.81.ebuild: diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest index 17d850227c61..95ba4b2fa00b 100644 --- a/media-sound/terminatorx/Manifest +++ b/media-sound/terminatorx/Manifest @@ -1,34 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST terminatorX-3.81.tar.gz 505489 +DIST terminatorX-3.81.tar.gz 505489 RMD160 b32ab21601e5b04985cbf5b7f9e2a1610e4649f9 SHA1 7d48b6f80ce450a5f575061f17864d012d3dc182 SHA256 184ef864d12c7e072707b8cd71b8184becd297b9b5a57fc5a84374678338734f DIST terminatorX-3.82.tar.gz 545693 RMD160 d8d053ba95ec9ac7805a9f7806f0451ca66e28cb SHA1 ebe387109ca90480fe108a587b4934ccc93d0744 SHA256 0021d9eaa60d19f54520828ce93ae36a35e0e6cbfc2b10ae6c9ff7dd574602f0 EBUILD terminatorx-3.81.ebuild 2333 RMD160 fe185cb0caba70f250e0e81fc31e2ccca1ec672d SHA1 18a936e5fcb108ba9ed87ff841c0ced0f3cc8b77 SHA256 d293d5352aa23f12c05d6b901218a9fcaa165a113f1ededde34f6e228fd2a04a MD5 d7d51dd72fe355966a4e430c14effba3 terminatorx-3.81.ebuild 2333 RMD160 fe185cb0caba70f250e0e81fc31e2ccca1ec672d terminatorx-3.81.ebuild 2333 SHA256 d293d5352aa23f12c05d6b901218a9fcaa165a113f1ededde34f6e228fd2a04a terminatorx-3.81.ebuild 2333 -EBUILD terminatorx-3.82.ebuild 1488 RMD160 c58f315062948af3001cfe76077dd8e2b8e49313 SHA1 278089aa902483fcd129ce2d149f76e3fce30679 SHA256 dfd2b01673d92f756020dee1e633894d56f165c9d6060d587c3650b61274abbb -MD5 f760b5cab09022eb5dc53a88563c6e25 terminatorx-3.82.ebuild 1488 -RMD160 c58f315062948af3001cfe76077dd8e2b8e49313 terminatorx-3.82.ebuild 1488 -SHA256 dfd2b01673d92f756020dee1e633894d56f165c9d6060d587c3650b61274abbb terminatorx-3.82.ebuild 1488 -MISC ChangeLog 2917 RMD160 ce5f80711d01e8643f8dd583ebf958267bc60545 SHA1 810153a354dc57e4a187a414b54c70c5f419dffb SHA256 05662367c33c1917609c0b592b19c0496ae83f42b18a5a392fa63c786994ac1a -MD5 150464feac723360c6942b6712075216 ChangeLog 2917 -RMD160 ce5f80711d01e8643f8dd583ebf958267bc60545 ChangeLog 2917 -SHA256 05662367c33c1917609c0b592b19c0496ae83f42b18a5a392fa63c786994ac1a ChangeLog 2917 +EBUILD terminatorx-3.82.ebuild 1545 RMD160 b28f8a8b11cce69ca6ff1e228a617f91a865dc32 SHA1 de2739a6ec701de4c25607da2753d297c8b84f15 SHA256 ae3ce76ea12a3ad061c203cb1401dab00edb7a1ee2c49e8a29ea3643fc113daf +MD5 55350c3744e9fb08b811c49fab64861c terminatorx-3.82.ebuild 1545 +RMD160 b28f8a8b11cce69ca6ff1e228a617f91a865dc32 terminatorx-3.82.ebuild 1545 +SHA256 ae3ce76ea12a3ad061c203cb1401dab00edb7a1ee2c49e8a29ea3643fc113daf terminatorx-3.82.ebuild 1545 +MISC ChangeLog 3050 RMD160 a4132e7c49f7649ba14ca59e591198b1f5b69b2e SHA1 22328caec9e6bee04266ddeefe4d98bd50f6dd2f SHA256 570a6d494a05a15bd719415d9381ef64ee7d57c0f3160876c98ffa3a8bfb58dd +MD5 9186f61d711559edd1801103666e7144 ChangeLog 3050 +RMD160 a4132e7c49f7649ba14ca59e591198b1f5b69b2e ChangeLog 3050 +SHA256 570a6d494a05a15bd719415d9381ef64ee7d57c0f3160876c98ffa3a8bfb58dd ChangeLog 3050 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158 -MD5 ed6038ad12972f0534133cb65dff99a0 files/digest-terminatorx-3.81 68 -RMD160 687cd58fa09b8bab0d03f0adc0921ea74465f6ba files/digest-terminatorx-3.81 68 -SHA256 1cae5408ccaceeaa88597e67cc289f4541a20678fc71b40be10467e7d6dc5b26 files/digest-terminatorx-3.81 68 +MD5 73260ccf41340511d4387f659f7a9e21 files/digest-terminatorx-3.81 250 +RMD160 f64fe7b7f556ab999e2d048c05eddbd454efefc6 files/digest-terminatorx-3.81 250 +SHA256 00b054d489bf9e839ccc8f5c391dbcc895ecc3d6abe1ebc317c9dd3ed99bc938 files/digest-terminatorx-3.81 250 MD5 99dd37dbadd5eb47a43d7e92491e4296 files/digest-terminatorx-3.82 250 RMD160 02dd6a4c179dadc84194541104a77e654bbb6e57 files/digest-terminatorx-3.82 250 SHA256 69653b63d6ab508dfb32ef2d9432dfe69ceffc3591bd2de49dc46366fde50fcc files/digest-terminatorx-3.82 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFnrBlAiZjviIA2XgRAvdfAKDI677Jhw9TA1TCfcoSO2HaEQfzMgCdHi23 -bBt5JnNfjcTQ6Zb51CEZQTQ= -=Anb5 +iD8DBQFF1BAAvFcC4BYPU0oRAmH6AJ0XZdzWl4HfIE27MMHmg95IYIdf2QCgrbA5 +FlA4myfYjBiOSdYmUCFtfUk= +=jZMY -----END PGP SIGNATURE----- diff --git a/media-sound/terminatorx/files/digest-terminatorx-3.81 b/media-sound/terminatorx/files/digest-terminatorx-3.81 index 554fd4395d23..7dedbe6a3b74 100644 --- a/media-sound/terminatorx/files/digest-terminatorx-3.81 +++ b/media-sound/terminatorx/files/digest-terminatorx-3.81 @@ -1 +1,3 @@ MD5 a16839184500afd74467e49a2efe6a5d terminatorX-3.81.tar.gz 505489 +RMD160 b32ab21601e5b04985cbf5b7f9e2a1610e4649f9 terminatorX-3.81.tar.gz 505489 +SHA256 184ef864d12c7e072707b8cd71b8184becd297b9b5a57fc5a84374678338734f terminatorX-3.81.tar.gz 505489 diff --git a/media-sound/terminatorx/terminatorx-3.82.ebuild b/media-sound/terminatorx/terminatorx-3.82.ebuild index 642aaca7c1cd..5d17d08aea92 100644 --- a/media-sound/terminatorx/terminatorx-3.82.ebuild +++ b/media-sound/terminatorx/terminatorx-3.82.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.82.ebuild,v 1.5 2006/10/23 21:25:24 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.82.ebuild,v 1.6 2007/02/15 07:47:05 aballier Exp $ inherit gnome2 @@ -18,7 +18,8 @@ IUSE="alsa mad vorbis sox" RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9 ) mad? ( media-sound/madplay ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) - sox? ( media-sound/sox ) + sox? ( media-sound/sox + || ( media-sound/mpg123 media-sound/mpg321 ) ) >=x11-libs/gtk+-2.2.0 >=dev-libs/glib-2.2.0 || ( ( x11-libs/libXi @@ -37,11 +38,11 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # we need the omf fix, or else we get access violation # errors related to sandbox - gnome2_omf_fix ${S}/doc/terminatorX-manual/C/Makefile.in + gnome2_omf_fix "${S}/doc/terminatorX-manual/C/Makefile.in" } src_compile() { @@ -56,5 +57,5 @@ src_compile() { } src_install() { - make DESTDIR=${D} install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" }