Improve deps for qt4.4 split ebuilds; thanks to Bernd Steinhauser <gentoo@bernd-stein...

Package-Manager: portage-2.1.4.4

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 0b25446cbafa28b32d5f3e389caaea89110420ab..f370eb44e09b0550b06b52182e7b5eb4b9a9ccb3 100644 (file)
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.305 2008/03/09 19:57:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.306 2008/03/09 20:08:36 aballier Exp $
+
+  09 Mar 2008; Alexis Ballier <aballier@gentoo.org>
+  vlc-0.9.0_alpha20080309.ebuild:
+  Improve deps for qt4.4 split ebuilds; thanks to Bernd Steinhauser
+  <gentoo@bernd-steinhauser.de>, bug #212746
 
 *vlc-0.9.0_alpha20080309 (09 Mar 2008)
 

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 13aef644c5c902b3bc03032cd43b836ea8d538bc..9f17ef5305a1323d30bf37c9911a411224f16c33 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -14,13 +14,13 @@ EBUILD vlc-0.8.6d-r1.ebuild 8856 RMD160 c8b97cfcf40fb156494d9f6ec47841673f34f25b
 EBUILD vlc-0.8.6e.ebuild 9091 RMD160 59aa0cf17377a9522694278cec8635230ef2c429 SHA1 71cabdbaa7461ebd4cef0973460ddd7b5fa3c831 SHA256 46436d600712275c894ea40292a64b37c1e7e5a43d17aa378d10e29a4930eb1f
 EBUILD vlc-0.9.0_alpha20080117.ebuild 10282 RMD160 d4ebda22b84d6e38c41464634a6541acb1d95178 SHA1 cb763cf9caa3e2dec4c347bcad7cb2477aa6cf9c SHA256 eb79bb917dc33cff0f62813d3e929042fd7f640845ad8d054a1508145a921bd6
 EBUILD vlc-0.9.0_alpha20080228.ebuild 10347 RMD160 549376ef9ee1bce8bc55c2c035dddb46cc5583c6 SHA1 3e112e02b81575bbcd1e48a5d485248b912d700d SHA256 dfb93907937f2b366e8ec97d03ec9413e9450812377b7bb55a0655e2f680a561
-EBUILD vlc-0.9.0_alpha20080309.ebuild 10347 RMD160 56d7f1767c0cc1096aed43c4e1d207b04b6626d6 SHA1 15e7841cfedda32ca03d15bf5c449348210fc3b5 SHA256 6a7876259cf36b4e8882869ee2efa503abb63694bc7314a70bc258d34ee9253f
-MISC ChangeLog 52091 RMD160 f8ce83b5e7cae31730703fe21f4451a2b181aad2 SHA1 09432cb74010fa97d3d87886a92535946ac5fe0f SHA256 80f9bbce64a4492be6cf883a34ad71a144727e711ae553ae181ea16e71108a9c
+EBUILD vlc-0.9.0_alpha20080309.ebuild 10397 RMD160 e7f801acb40d7afa90c213435cccdb00a26b253f SHA1 f296b6d393aa9310dc1f741c5250c276ab395017 SHA256 108dc74148c5002993a790f72e1f2130b3f4438045e9b42e9ccface1b5f0587d
+MISC ChangeLog 52291 RMD160 edabe58f3df1481e57550fb71ce71637f5db2624 SHA1 28b10069f2c07ca7d7f4b1dc093ea0da177dc6f6 SHA256 0d6bf1d8b963396b4b920e78393f7263e8e4fc6deca024dd82d39901eed5666d
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD4DBQFH1EFTvFcC4BYPU0oRAt6TAJwJM/sYHRdkyXdFgG9jteFYDyLQngCXaYno
-rE1KpkWz9sjvYGF4tthLRw==
-=iKH+
+iD8DBQFH1EPQvFcC4BYPU0oRAir+AJsFycIFrtzzv/LE6YbQfcxQaGB+MQCgw9St
+rQPReP9RCCYYtuxbtKJo3yc=
+=bkTD
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-0.9.0_alpha20080309.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080309.ebuild
index 6dc4e62ceed02a80b5b68947e77d4029baa627b2..56c9b2037e83905fdcaa4564ac368e20fb792f58 100644 (file)
--- a/media-video/vlc/vlc-0.9.0_alpha20080309.ebuild
+++ b/media-video/vlc/vlc-0.9.0_alpha20080309.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080309.ebuild,v 1.1 2008/03/09 19:57:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080309.ebuild,v 1.2 2008/03/09 20:08:36 aballier Exp $
+
+EAPI="1"
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -111,7 +113,7 @@ RDEPEND="
                ogg? ( media-libs/libogg )
                png? ( media-libs/libpng )
                pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
-               qt4? ( $(qt4_min_version 4.2.0 ) )
+               qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.2.0:4 ) )
                samba? ( net-fs/samba )
                sdl? ( >=media-libs/libsdl-1.2.8
                        sdl-image? ( media-libs/sdl-image ) )