diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-04-19 00:09:45 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-04-19 00:09:45 +0000 |
| commit | 21a689d085ed60764b0aa166fc08db0bbb49e061 (patch) | |
| tree | e1a2c040b81fc2bd4f43c4909dcbca912e3d54a9 /media-video | |
| parent | remove confcache restricting as it's dead and buried (diff) | |
| download | gentoo-2-21a689d085ed60764b0aa166fc08db0bbb49e061.tar.gz gentoo-2-21a689d085ed60764b0aa166fc08db0bbb49e061.tar.bz2 gentoo-2-21a689d085ed60764b0aa166fc08db0bbb49e061.zip | |
switch upnp and libupnp in the || to prefer libupnp
(Portage version: 2.1.2.4)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.8.6-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.8.6b.ebuild | 4 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.8.6b_beta1.ebuild | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 147ca3f3a860..506eca72a0ea 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.238 2007/04/19 00:05:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.239 2007/04/19 00:09:45 aballier Exp $ + + 19 Apr 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6-r1.ebuild, + vlc-0.8.6b_beta1.ebuild, vlc-0.8.6b.ebuild: + switch upnp and libupnp in the || to prefer libupnp 18 Apr 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6b_beta1.ebuild, vlc-0.8.6b.ebuild: diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild index 1035f7d2c5fa..ac625650b9a5 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.22 2007/04/18 23:19:55 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.23 2007/04/19 00:09:45 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -105,7 +105,7 @@ RDEPEND=" opengl? ( virtual/opengl ) ) directfb? ( dev-libs/DirectFB ) - upnp? ( || ( >=net-misc/upnp-1.2 net-misc/libupnp ) ) + upnp? ( || ( net-misc/libupnp >=net-misc/upnp-1.2 ) ) nsplugin? ( !seamonkey? ( www-client/mozilla-firefox ) seamonkey? ( www-client/seamonkey ) diff --git a/media-video/vlc/vlc-0.8.6b.ebuild b/media-video/vlc/vlc-0.8.6b.ebuild index b5390bcedd39..89d05fd97dab 100644 --- a/media-video/vlc/vlc-0.8.6b.ebuild +++ b/media-video/vlc/vlc-0.8.6b.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.6b.ebuild,v 1.2 2007/04/19 00:05:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6b.ebuild,v 1.3 2007/04/19 00:09:45 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -108,7 +108,7 @@ RDEPEND=" opengl? ( virtual/opengl ) ) directfb? ( dev-libs/DirectFB ) - upnp? ( || ( >=net-misc/upnp-1.2 net-misc/libupnp ) ) + upnp? ( || ( net-misc/libupnp >=net-misc/upnp-1.2 ) ) nsplugin? ( !seamonkey? ( www-client/mozilla-firefox ) seamonkey? ( www-client/seamonkey ) diff --git a/media-video/vlc/vlc-0.8.6b_beta1.ebuild b/media-video/vlc/vlc-0.8.6b_beta1.ebuild index 9a7ec998e1d1..bc9b02a509ce 100644 --- a/media-video/vlc/vlc-0.8.6b_beta1.ebuild +++ b/media-video/vlc/vlc-0.8.6b_beta1.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.6b_beta1.ebuild,v 1.4 2007/04/19 00:05:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6b_beta1.ebuild,v 1.5 2007/04/19 00:09:45 aballier Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -108,7 +108,7 @@ RDEPEND=" opengl? ( virtual/opengl ) ) directfb? ( dev-libs/DirectFB ) - upnp? ( || ( >=net-misc/upnp-1.2 net-misc/libupnp ) ) + upnp? ( || ( net-misc/libupnp >=net-misc/upnp-1.2 ) ) nsplugin? ( !seamonkey? ( www-client/mozilla-firefox ) seamonkey? ( www-client/seamonkey ) |