USE pulseaudio for >=0.9.15 and don't allow previous versions installed because of missing include wrt #271183.

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

4 files changed, 17 insertions, 19 deletions

diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index 1fd4a003cbdd..4f9cbf65433c 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,8 +1,9 @@
+AUX gnome-mplayer-0.9.5-gettext.patch 7710 RMD160 5b24a62452e2094759b2cbae2ef57487dc8c370d SHA1 404cbc31fd5ef10fe417cd1a8db49de4eaf58b30 SHA256 1c9bc6e02aad58a946f7b63287fcf0b10f664b06f5bb8e9ad5a541fc7dff4f16
 DIST gnome-mplayer-0.6.0.tar.gz 450727 RMD160 bceccc4966c70d2a734e2e2c361883e2d2ed0ac0 SHA1 48ddf50d02f956a0b6258973897ab66861ca9285 SHA256 1309c69f90b75a8a8503c321b5652b239ce6a0c3c150476d831df2e00cdc661e
 DIST gnome-mplayer-0.6.3.tar.gz 601802 RMD160 cab5ec7d9fcc1e47bbff502ff849b2e392b90a05 SHA1 dbd489005add7a902c4dcd9ae4f9ab63fda7045c SHA256 a424e91ad33a413729cf19dd908cd92e6a28a00c0555ac0f1e954697051fcfc1
 DIST gnome-mplayer-0.9.5.tar.gz 747308 RMD160 474cc743f36254e92e171656a05e19c9addffc34 SHA1 d6a46e32d5d305eed68b25ae280b77d74095e873 SHA256 4cefb2afa08d8e75c1273980e2cad0e13f4b872e2f90019f1ac0d75ec9fa41b7
 EBUILD gnome-mplayer-0.6.0.ebuild 842 RMD160 50100d067a9a71c5264278ee83fdc7c04458edb5 SHA1 052236a7dba16ce0da860d02fac5ae176755251b SHA256 6b9d3170b59aceb1ee1bad3f83efa6b12ead466740eecf147ba0507fb890fcfa
 EBUILD gnome-mplayer-0.6.3.ebuild 997 RMD160 afc9c4e9d27d34cc93552fa1b93af26bf10e4812 SHA1 b5dce989592766bb1b8a9b6364970c9de433d721 SHA256 0076a45f533b1db844c702fd1f1975eb50ad831bff6776fa7a448ee3a890525f
-EBUILD gnome-mplayer-0.9.5.ebuild 1420 RMD160 65aadd5b585f167ac0e7a223781281519554222b SHA1 d4def4d1e4ec235759acad5f83aae4567995c351 SHA256 08defef231818812d034d83676ef00e35974cea02fb3a73386abda60b81c48c4
-MISC ChangeLog 2051 RMD160 8df444b47704f936949cbeafd30d9d2ff5561144 SHA1 e3512bfadf3982340b393f4e77bc72d4ba8b3b16 SHA256 cc44d8a6a7075fa36bf4d970d4d7c3f150faca78a5e0c1416af233d7e8a4278e
+EBUILD gnome-mplayer-0.9.5-r1.ebuild 1477 RMD160 da70c99f38144644ed1d7ecc50a26298cd59a767 SHA1 a636d397ef7e133475ac5f7e266db3b5389dc7b4 SHA256 61ecd36144b823e04d40fe8254f700a1c1540efa052f89a821e4ea01e4fd49aa
+MISC ChangeLog 2304 RMD160 cb8fbad645e9cba750e77b6205fc47de52ba23e2 SHA1 c845b360e8b0ef886e7a8f67022cf56c84495f7d SHA256 079a29f152b07afd42e5e304fa80b935c272a9977d0ee86514e1df1fe06d3356
 MISC metadata.xml 309 RMD160 5e13774680b78b83b20f8ffba77e54d22d7fba60 SHA1 d6d8c8f36d45b4f20f1d57ef22890c4415dabbae SHA256 f93cf32a0b04e0d971ceb1112c76977ca16427c3631c664340efc58c331cf9ee
diff --git a/media-video/guvcview/ChangeLog b/media-video/guvcview/ChangeLog
index 22a3514421e6..4ec43f0662a4 100644
--- a/media-video/guvcview/ChangeLog
+++ b/media-video/guvcview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/guvcview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.6 2009/05/24 05:02:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.7 2009/05/29 21:45:42 ssuominen Exp $
+
+  29 May 2009; Samuli Suominen <ssuominen@gentoo.org> guvcview-1.1.0.ebuild:
+  USE pulseaudio for >=0.9.15 and don't allow previous versions installed
+  because of missing include wrt #271183.
 
 *guvcview-1.1.0 (24 May 2009)
 
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 32a72a1d77c2..8498e8281b90 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX guvcview-1.0.5-implicit_declaration_setlocale.patch 585 RMD160 fe183ab85282bd927f247c070cc59885d1036510 SHA1 94b5bbd271663d0218c245cb6397d18e85a1afb3 SHA256 dd231e49540a0ed4604f4a37ed14608a24e074dc590d469912ca457769d35904
 DIST guvcview-src-1.0.5.tar.gz 529290 RMD160 3da44bbd9b127b3bbdd1d77a0f0a47eafb0957c6 SHA1 83190eab57458a92fc748047503c80155c934522 SHA256 050310f1e5c2778b1af98bd8d343b4ebdb4f8c717dbf05c33a15dd6d58f76d82
 DIST guvcview-src-1.1.0.tar.gz 442322 RMD160 e88e2f726b56f4f6914bc9f681ba78a92b3c1929 SHA1 b2bd630c3b59f9cc239550bfd5111c4d3a3e0a79 SHA256 6c89329bfd8296151c898495e35087f6126d1aaa697a20b03ddb2cbd22c4dd1e
 EBUILD guvcview-1.0.5.ebuild 955 RMD160 33db1c09cc21397015564b5ac4cd79a34fc8ab31 SHA1 32c820a1ed38bf72e6a28eaa8bfc9f0937f7aad4 SHA256 8a094fb7a228950dd8d415333d66e2d8432078382069298171602ae46648e470
-EBUILD guvcview-1.1.0.ebuild 956 RMD160 a6926ea910b232145cfdad6d745665e08fb5a598 SHA1 7639efde3828aaaba5cca9450c3be31a07870928 SHA256 3727961ff97572022e396b1089eef9ee5f3c946a4d298ea2e33ad88fbbdf518e
-MISC ChangeLog 1293 RMD160 80e9dc18a6a96627cf17aeb35f64fed01a9b19ea SHA1 9e4d24af0c0bd8cfb41928c0c527f4c441508e11 SHA256 058eb788d6d9a34f9eaf613026f29dd1b38bcbb58f50c3670b2a63bfed96017a
+EBUILD guvcview-1.1.0.ebuild 1096 RMD160 e5903602bb71c26a9c2fae2402cd027d91d01862 SHA1 3ef53931bafce17f7392d4f4d0bc608fe74c1878 SHA256 4656f28b9f8bb151c5d66e4a9ef954860130473ff5444e0373012b786aa268e6
+MISC ChangeLog 1489 RMD160 a5e2080b56c6296248aac8e90edfe5d40bd9581a SHA1 cb78d26dec767776a9fa15e4c5eadd1dd700276e SHA256 2a40876328f7b93c21fdfd623da046785d017fcd3d7bf2890f10db4238ca0781
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoY1SAACgkQ/ejvha5XGaPzQwCg6/eHRhGRtsIhUL7kwvOYcDY4
-+EgAnj0Az2tro1m6elVHUz82dAPSqpa9
-=/man
------END PGP SIGNATURE-----
diff --git a/media-video/guvcview/guvcview-1.1.0.ebuild b/media-video/guvcview/guvcview-1.1.0.ebuild
index abef329dcdf1..2277d18d5f1a 100644
--- a/media-video/guvcview/guvcview-1.1.0.ebuild
+++ b/media-video/guvcview/guvcview-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.1.0.ebuild,v 1.1 2009/05/24 05:02:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.1.0.ebuild,v 1.2 2009/05/29 21:45:42 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -14,18 +14,21 @@ SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="pulseaudio"
 
+# Automagic depend on pulseaudio, please fix.
 RDEPEND=">=x11-libs/gtk+-2.10:2
 	>=dev-libs/glib-2:2
 	>=media-video/ffmpeg-0.4.9_p20090201
 	>=media-libs/libsdl-1.2.10
 	>=media-libs/portaudio-19_pre
 	media-libs/libpng
-	media-sound/twolame"
+	media-sound/twolame
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	!<media-sound/pulseaudio-0.9.15"
 
 S=${WORKDIR}/${MY_P}