Set deps for upnp to net-misc/libupnp or net-misc/upnp, bug #169736

Package-Manager: portage-2.1.2.4

4 files changed, 24 insertions, 20 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/Manifest b/media-video/vlc/Manifest
index 219801f4f9cf..6b23fe2895b7 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,18 +5,18 @@ DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d
 DIST vlc-0.8.6b-test1.tar.bz2 10451832 RMD160 34c49c1451856a7817728de099cf30448fbe21b5 SHA1 a2f9f40df2d3ea366b17a8f4dc9ea9b3130555bb SHA256 191f4764148cd01f9a96d287ddeedc9ea09c1ce5615dadd587bccbb6f069d1d3
 DIST vlc-patches-38.tar.bz2 11402 RMD160 647b92b86823bdf2ed1e3ba40457aa892154bcbb SHA1 1d0d3b8ccbb95f75b2bce52ad801d398b00c9125 SHA256 17174e05fb41aac4607e84b075e91e8375bb2d59a114916ca6ecaea6b885da0c
 DIST vlc-patches-41.tar.bz2 11926 RMD160 c395422359abf9b99f7da80d8b47c8e269d80a10 SHA1 87b2ebc0d564480b3a9878a10b575405bbdce2aa SHA256 df162c2965844e0f3bacad4952ff41377566ae543a3f31b2fe1cdd33fc3e8a9c
-EBUILD vlc-0.8.6-r1.ebuild 8787 RMD160 fc6f19979022f167ae82c9e1d1d6afb80837c575 SHA1 9c6af8af2d89e5a01ccb815e4fccabcaf9030707 SHA256 a9564f1073cb5d4f1c05053b2b6a4dc8be4f573892e202a4d28080e4b0fe3796
-MD5 29a746f1c659f2b44e4f5e805582953b vlc-0.8.6-r1.ebuild 8787
-RMD160 fc6f19979022f167ae82c9e1d1d6afb80837c575 vlc-0.8.6-r1.ebuild 8787
-SHA256 a9564f1073cb5d4f1c05053b2b6a4dc8be4f573892e202a4d28080e4b0fe3796 vlc-0.8.6-r1.ebuild 8787
-EBUILD vlc-0.8.6b_beta1.ebuild 9222 RMD160 2de765c807bf7360a3d9ac9c5402647e3e81be37 SHA1 dd46531fa16e1cc9d67b39ba40101d474de5bc73 SHA256 84bcc083053c862aed68c966a2e9654acf5e9ec62848179cd41673aa9416b250
-MD5 6a8ec5e3ebb2dbf0a822193fe629f9f8 vlc-0.8.6b_beta1.ebuild 9222
-RMD160 2de765c807bf7360a3d9ac9c5402647e3e81be37 vlc-0.8.6b_beta1.ebuild 9222
-SHA256 84bcc083053c862aed68c966a2e9654acf5e9ec62848179cd41673aa9416b250 vlc-0.8.6b_beta1.ebuild 9222
-MISC ChangeLog 42426 RMD160 68867bb8f1404ca986b628905924663718c4aff8 SHA1 162f12e2b508510f2ffa8eca03a6ba9f3c516ea8 SHA256 9b5cf89ebd5007e4f917e0a8515112f16127416dd3ec63b845e2ec3f8df0710d
-MD5 e81260ccd91918497c22c620c5d49be6 ChangeLog 42426
-RMD160 68867bb8f1404ca986b628905924663718c4aff8 ChangeLog 42426
-SHA256 9b5cf89ebd5007e4f917e0a8515112f16127416dd3ec63b845e2ec3f8df0710d ChangeLog 42426
+EBUILD vlc-0.8.6-r1.ebuild 8811 RMD160 914b43930578c0bc98ef52899b7d6c46892e937a SHA1 01208812f8c555856167b6fc3a69a2058b7c16f4 SHA256 2e0eb61ae189bf095bf28b68fa41e607d3c156ff0e588f79c7d0489a76c4d759
+MD5 0d24646410412442a2f9f980b0dc55e2 vlc-0.8.6-r1.ebuild 8811
+RMD160 914b43930578c0bc98ef52899b7d6c46892e937a vlc-0.8.6-r1.ebuild 8811
+SHA256 2e0eb61ae189bf095bf28b68fa41e607d3c156ff0e588f79c7d0489a76c4d759 vlc-0.8.6-r1.ebuild 8811
+EBUILD vlc-0.8.6b_beta1.ebuild 9246 RMD160 af494428b233a01d557db70d1c7a0c86734676bb SHA1 02486fdd0229f33c277b61be8f85e74af9dd5cc4 SHA256 8ec6f81bbac1772cfff68b5219f57eea587358f79080f1c10ddbfa0b7e73acd9
+MD5 e1001b4fad82eeb751159b59d5ecf15a vlc-0.8.6b_beta1.ebuild 9246
+RMD160 af494428b233a01d557db70d1c7a0c86734676bb vlc-0.8.6b_beta1.ebuild 9246
+SHA256 8ec6f81bbac1772cfff68b5219f57eea587358f79080f1c10ddbfa0b7e73acd9 vlc-0.8.6b_beta1.ebuild 9246
+MISC ChangeLog 42597 RMD160 0c67055b1b4f58a081d527b7b924900532dde8c0 SHA1 ac792006bfec37062093520001bea014d5909e1c SHA256 a83e914747b33363991d2b64c5fa9b50f74a12e595eef1001bce4227eeb2e77e
+MD5 300a13afe96f94c6e8f8185a7a7bfc17 ChangeLog 42597
+RMD160 0c67055b1b4f58a081d527b7b924900532dde8c0 ChangeLog 42597
+SHA256 a83e914747b33363991d2b64c5fa9b50f74a12e595eef1001bce4227eeb2e77e ChangeLog 42597
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -30,7 +30,7 @@ SHA256 281b094804a59019b02f88eff0c456817305d3f1496b697be01be87870fd6f56 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJp7vvFcC4BYPU0oRAl3gAJ0cPBP1Kkh495OGZlcwKQZgNNUmhgCeOJNd
-XkcaSIeSXh2kRQ3qjsuySr8=
-=kLCM
+iD8DBQFGJqeBvFcC4BYPU0oRAuiZAKCSPOWaVYJbC7OZuTjNgg80ivlr4gCgvCg9
+GVVtbqVaaM4yITJQ5LdHkSg=
+=kYhG
 -----END PGP SIGNATURE-----
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 )