summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-04-18 23:19:55 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-04-18 23:19:55 +0000
commit46f26cdbbee36f98aa0ca55c8d59a75a4b5e1d5f (patch)
treefd564c3760ccc369e8f3523267af45f8b00ed548 /media-video
parentInitial commit. to satisfy 71501 as a pre-requisite for 111729 (diff)
downloadgentoo-2-46f26cdbbee36f98aa0ca55c8d59a75a4b5e1d5f.tar.gz
gentoo-2-46f26cdbbee36f98aa0ca55c8d59a75a4b5e1d5f.tar.bz2
gentoo-2-46f26cdbbee36f98aa0ca55c8d59a75a4b5e1d5f.zip
Set deps for upnp to net-misc/libupnp or net-misc/upnp, bug #169736
(Portage version: 2.1.2.4)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-0.8.6-r1.ebuild4
-rw-r--r--media-video/vlc/vlc-0.8.6b_beta1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 846d207b222f..348519c87161 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.235 2007/04/18 22:43:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.236 2007/04/18 23:19:55 aballier Exp $
+
+ 18 Apr 2007; Alexis Ballier <aballier@gentoo.org> vlc-0.8.6-r1.ebuild,
+ vlc-0.8.6b_beta1.ebuild:
+ Set deps for upnp to net-misc/libupnp or net-misc/upnp, bug #169736
18 Apr 2007; Alexis Ballier <aballier@gentoo.org>
-vlc-0.8.6_p18636.ebuild:
diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild
index 4499501cc9d0..1035f7d2c5fa 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.21 2007/03/09 08:31:07 aballier Exp $
+# $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 $
WANT_AUTOMAKE=latest
WANT_AUTOCONF=latest
@@ -105,7 +105,7 @@ RDEPEND="
opengl? ( virtual/opengl )
)
directfb? ( dev-libs/DirectFB )
- upnp? ( >=net-misc/upnp-1.2 )
+ upnp? ( || ( >=net-misc/upnp-1.2 net-misc/libupnp ) )
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 ebcb48736fcd..f94f03621b32 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.2 2007/04/18 22:01:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6b_beta1.ebuild,v 1.3 2007/04/18 23:19:55 aballier Exp $
WANT_AUTOMAKE=latest
WANT_AUTOCONF=latest
@@ -110,7 +110,7 @@ RDEPEND="
opengl? ( virtual/opengl )
)
directfb? ( dev-libs/DirectFB )
- upnp? ( >=net-misc/upnp-1.2 )
+ upnp? ( || ( >=net-misc/upnp-1.2 net-misc/libupnp ) )
nsplugin? (
!seamonkey? ( www-client/mozilla-firefox )
seamonkey? ( www-client/seamonkey )