switch upnp and libupnp in the || to prefer libupnp

Package-Manager: portage-2.1.2.4

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 147ca3f3a860fc414272b3a1cbd9a253f580407e..506eca72a0eac0c469f2c27d6e1070557175bc92 100644 (file)
--- 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/Manifest b/media-video/vlc/Manifest
index 4d33bc6e8ba3ecab2c2988e4b3d009ba60b52435..6d27450f7dc4b565bdf2082b0682bdbe23d94d68 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,22 +6,22 @@ DIST vlc-0.8.6b-test1.tar.bz2 10451832 RMD160 34c49c1451856a7817728de099cf30448f
 DIST vlc-0.8.6b.tar.bz2 10479890 RMD160 568b4d8860d0d5def2655cd278142ba8915ca0cb SHA1 2e67f073009de766340f1ef9f3920c2b4efa327e SHA256 1a101f517485cd1bcabac5c4d180421d34e86af78710ed858ec61f78e3602377
 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 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.ebuild 9218 RMD160 edc177e414d1443268d00c95df831bd133ad3ec9 SHA1 62e7b9cc8e5aeac26ecd42c231c5ac7ee00b7b77 SHA256 0b777409b228bade8e36b0727012294b2f37ed2028acfe373f0c956a4a596237
-MD5 2ce69eb599f515b73d21df895d07aa2e vlc-0.8.6b.ebuild 9218
-RMD160 edc177e414d1443268d00c95df831bd133ad3ec9 vlc-0.8.6b.ebuild 9218
-SHA256 0b777409b228bade8e36b0727012294b2f37ed2028acfe373f0c956a4a596237 vlc-0.8.6b.ebuild 9218
-EBUILD vlc-0.8.6b_beta1.ebuild 9224 RMD160 e84ab3aba22a92f40b14bd4affb694ed91defc13 SHA1 58a6726586a5e2986afbc48b5d9e83cea4f92fde SHA256 045ac2b9db6fe2f6448209f286c09665cb9adda02405bef24b23a15ab400eed4
-MD5 d28acf7fe33783308f307eb538e51b58 vlc-0.8.6b_beta1.ebuild 9224
-RMD160 e84ab3aba22a92f40b14bd4affb694ed91defc13 vlc-0.8.6b_beta1.ebuild 9224
-SHA256 045ac2b9db6fe2f6448209f286c09665cb9adda02405bef24b23a15ab400eed4 vlc-0.8.6b_beta1.ebuild 9224
-MISC ChangeLog 42876 RMD160 eb395627908fad11d8f475cb1a05dcd59c13909d SHA1 f5c1499221390dd371a1a73353478bde2a7a289b SHA256 a3d3271306c38086c11b09e149d252a4b00cd24ed72e20f3ba072412a8bd8e5d
-MD5 779549e1501c1ade99e5fe3ed1e7fd34 ChangeLog 42876
-RMD160 eb395627908fad11d8f475cb1a05dcd59c13909d ChangeLog 42876
-SHA256 a3d3271306c38086c11b09e149d252a4b00cd24ed72e20f3ba072412a8bd8e5d ChangeLog 42876
+EBUILD vlc-0.8.6-r1.ebuild 8811 RMD160 f7a0c9d916e1eff2c6b4a6902d967c2c5e43e90d SHA1 532d5813a71f4ded536bf792bbfa7fe27188287e SHA256 fb11662934effd9e24fe14ccd63a21104bb5a77ea069f4c6ac5d09b8c8815041
+MD5 56d3979d367ef6045e80a6488ae2d0a6 vlc-0.8.6-r1.ebuild 8811
+RMD160 f7a0c9d916e1eff2c6b4a6902d967c2c5e43e90d vlc-0.8.6-r1.ebuild 8811
+SHA256 fb11662934effd9e24fe14ccd63a21104bb5a77ea069f4c6ac5d09b8c8815041 vlc-0.8.6-r1.ebuild 8811
+EBUILD vlc-0.8.6b.ebuild 9218 RMD160 0490f5955ccfe8737a510e3caa2eb0ebe6a4bc7f SHA1 f4a3948591086d83a5c19794f2de198cc9cab22e SHA256 1158ab2a7904940efd052809209098ab647c7fcd258ee34152c0f554ed230410
+MD5 8c7a46066c5654b5d2a3a8d7417bc587 vlc-0.8.6b.ebuild 9218
+RMD160 0490f5955ccfe8737a510e3caa2eb0ebe6a4bc7f vlc-0.8.6b.ebuild 9218
+SHA256 1158ab2a7904940efd052809209098ab647c7fcd258ee34152c0f554ed230410 vlc-0.8.6b.ebuild 9218
+EBUILD vlc-0.8.6b_beta1.ebuild 9224 RMD160 fe719ff224fb9f9b40983f26613c25c18abd4fc3 SHA1 fc40fb867a1ac35e45e1776b5dc246db706a4de9 SHA256 9f582cdc2aca0573947bd71279d09b3ffbb37a9eb8a08836dd42bd316c5e4234
+MD5 d7135fd245376dc3d963f3f7ee813464 vlc-0.8.6b_beta1.ebuild 9224
+RMD160 fe719ff224fb9f9b40983f26613c25c18abd4fc3 vlc-0.8.6b_beta1.ebuild 9224
+SHA256 9f582cdc2aca0573947bd71279d09b3ffbb37a9eb8a08836dd42bd316c5e4234 vlc-0.8.6b_beta1.ebuild 9224
+MISC ChangeLog 43050 RMD160 f2c86fd58993f8b1a0cc698f0d3ca1c7c23e5f2c SHA1 a563a208b41dede77cea0f2cbfe42f342588b469 SHA256 3ab593e44460c8e0d5cbb7587341027642cd4589237a51951b9e196034b4177a
+MD5 ad96824a43e8595452d3fa5c6906c94d ChangeLog 43050
+RMD160 f2c86fd58993f8b1a0cc698f0d3ca1c7c23e5f2c ChangeLog 43050
+SHA256 3ab593e44460c8e0d5cbb7587341027642cd4589237a51951b9e196034b4177a ChangeLog 43050
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -38,7 +38,7 @@ SHA256 281b094804a59019b02f88eff0c456817305d3f1496b697be01be87870fd6f56 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJrIYvFcC4BYPU0oRAmqSAJ9qd36+ja6N25j7J7fm+tAztnz0hgCdElxE
-5aARa550KZrZ/3X3LXm7n0Y=
-=kHef
+iD8DBQFGJrMwvFcC4BYPU0oRAiW2AKC0XHjt90Uf1J0SDoxdz2NGcrt6EACcDrjZ
+6QN1ooGsWZxN4+dVpro45iQ=
+=SxAQ
 -----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 1035f7d2c5fa5e0ec675eabb7fa3ce8ce81af6e5..ac625650b9a5d2df925cd3b3fcfb4b0fa78bbf7c 100644 (file)
--- 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 b5390bcedd39b31da0fa0ac28455c37791cfa98d..89d05fd97dab65c9bd81ba486485a6db3f61f985 100644 (file)
--- 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 9a7ec998e1d1855fb4709fcdc5ab896b6bd43f7d..bc9b02a509ce149dae3308baf8d217eab12208a0 100644 (file)
--- 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 )