From: Markos Chandras Date: Sun, 13 Jun 2010 09:25:46 +0000 (+0000) Subject: Fix gstreamer dependencies logic wrt bug #323489 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c854f2537c27217a0b692cc83d9366d11d635c3f;p=gentoo.git Fix gstreamer dependencies logic wrt bug #323489 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/media-video/minitube/ChangeLog b/media-video/minitube/ChangeLog index 3fb0031ee279..b9c666425d05 100644 --- a/media-video/minitube/ChangeLog +++ b/media-video/minitube/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/minitube # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.30 2010/06/10 12:13:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.31 2010/06/13 09:25:46 hwoarang Exp $ + + 13 Jun 2010; Markos Chandras minitube-1.0-r1.ebuild: + Fix gstreamer dependencies logic wrt bug #323489 10 Jun 2010; Markos Chandras minitube-1.0-r1.ebuild: Stable on amd64 wrt bug #bug #322691 diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest index 823669e10757..0a5269e70830 100644 --- a/media-video/minitube/Manifest +++ b/media-video/minitube/Manifest @@ -3,7 +3,7 @@ DIST minitube-0.9.tar.gz 174152 RMD160 76b0fb7aa038d52f801e67528692c7acd692cfb7 DIST minitube-1.0.tar.gz 193957 RMD160 0445647817c075e5fb445487b1ed86de563a43ab SHA1 089279b00d92ee5a2dc3a07b17bf8b8881e29b64 SHA256 6d57528cf29e53ef6ce1c5b26857d8a1a2ad1b9040f95e8bbd094d73c134a809 EBUILD minitube-0.8.1.ebuild 1316 RMD160 9d92e6bd985ba9f265acef8e79b01f9b9850b032 SHA1 59846cdfc507221d756dfa751a7b52975246f20d SHA256 a8c0d48c910cd65871bd640e4466f940263188484e1f0b4392c9b87325db946a EBUILD minitube-0.9.ebuild 1496 RMD160 bb1ec1c0d886bb3302c1c54ff8661c4491ad8545 SHA1 48e0d53af0dfc5a09ab95d5d750ed6cd046cf711 SHA256 c62c985d51023d1d748c0ef5e2b3f9c314b621a305a7602327d57867eca221ce -EBUILD minitube-1.0-r1.ebuild 1607 RMD160 91ca58160f2cf3f0da3d915d99566d7d914864c7 SHA1 c2d2edadac1af4a9eaaabf04964b364c383339d7 SHA256 7ab5f50a54579deb1579fd707fb8a87cc82735160e5d751787c2877a7fb5d250 +EBUILD minitube-1.0-r1.ebuild 1632 RMD160 12fc0ffc08036d99f1380a546cd607803f52f7f0 SHA1 665f3a3ad60eae1c48f8782324f9d4089314b708 SHA256 66ec750c81512df843396a5c748e63e6fb6ce19f12f663c1d1d10a531ce84a95 EBUILD minitube-1.0.ebuild 1527 RMD160 0ff31cb5bf18ce02fa2b8f71710c49adbeb2ec27 SHA1 462c6878b5096bef5a68d1e2eb1e7ccf052a0c1c SHA256 c87a71be56e6e2aaeceef0b8f1082fa730cd382edb742e4d0722bf83f1379ac2 -MISC ChangeLog 4642 RMD160 41b8be03c42b61dfb58e84607769d655c37937ee SHA1 62066e41fc23e8941a304eea82b3339b74e4c10e SHA256 d4b3095508947c143ee6a29e1114f4b0fa2c6fff24cf89bf4c26ecf0482a68ae +MISC ChangeLog 4771 RMD160 928270a6fd2a0419a137d1f659cdb4fd4125c1dc SHA1 b1ab5b59505d80f36f35cb3a05d66cb57db88aa5 SHA256 9ba778c1db9b27e5820b610660221c014682ffdf03cc4efce3ac43322c84ca35 MISC metadata.xml 265 RMD160 e723dc6fc78de62b3144444b1329d9791b1f2099 SHA1 4ed7a4469aafc625f36fb28d3b7932d1c9e75f91 SHA256 218f4f107ec5040834a5d0d24c83e179cdd83cdb49a639fa29df53f479a680c7 diff --git a/media-video/minitube/minitube-1.0-r1.ebuild b/media-video/minitube/minitube-1.0-r1.ebuild index 7354bb6009d4..683c09db149c 100644 --- a/media-video/minitube/minitube-1.0-r1.ebuild +++ b/media-video/minitube/minitube-1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-1.0-r1.ebuild,v 1.2 2010/06/10 12:13:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-1.0-r1.ebuild,v 1.3 2010/06/13 09:25:46 hwoarang Exp $ EAPI="2" LANGS="ar es pt_BR pt_PT uk" @@ -19,12 +19,15 @@ KEYWORDS="amd64 ~x86" IUSE="debug kde gstreamer" DEPEND="x11-libs/qt-gui:4[accessibility] - kde? ( || ( media-sound/phonon[gstreamer?] x11-libs/qt-phonon:4[gstreamer?] ) ) - !kde? ( || ( x11-libs/qt-phonon:4[gstreamer?] media-sound/phonon[gstreamer?] ) ) - gstreamer? ( media-plugins/gst-plugins-soup + gstreamer? ( + kde? ( || ( media-sound/phonon[gstreamer] x11-libs/qt-phonon:4 ) ) + !kde? ( || ( x11-libs/qt-phonon media-sound/phonon[gstreamer] ) ) + media-plugins/gst-plugins-soup media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-faac - media-plugins/gst-plugins-faad )" + media-plugins/gst-plugins-faad ) + !gstreamer? ( media-sound/phonon[-gstreamer] )" + RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}"