net-misc/upnp has been package.mask'ed, removed dependency

Package-Manager: portage-2.1.2.9

4 files changed, 21 insertions, 27 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index dd16b2624c78..14f450b0ea01 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.244 2007/05/30 15:44:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.245 2007/06/01 21:24:02 gurligebis Exp $
+
+  01 Jun 2007; Bjarke Istrup Pedersen <gurligebis@gentoo.org> vlc-0.8.6b.ebuild,
+  vlc-0.8.6-r1.ebuild:
+  net-misc/upnp has been package.mask'ed, removed dependency
 
   30 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> vlc-0.8.6b.ebuild:
   Stable on sparc wrt #179862
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index adf5d29e20c6..25190a6e747e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,22 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST vlc-0.8.6.tar.bz2 10506025 RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d SHA1 86c038fdca2b6c8665e83e302a1a7a5e64a6b912 SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7
 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 8813 RMD160 47658a58ad90e2b865c4e193ff393322304e7f6d SHA1 59a9ca453a937919cb1c17344eabf347e4472281 SHA256 f8d4e713b0c36b26d67e730568dab2029ef56f0c81515de0c0c8c44d176e98c4
-MD5 a25879a6e2e45977410d64faa619b472 vlc-0.8.6-r1.ebuild 8813
-RMD160 47658a58ad90e2b865c4e193ff393322304e7f6d vlc-0.8.6-r1.ebuild 8813
-SHA256 f8d4e713b0c36b26d67e730568dab2029ef56f0c81515de0c0c8c44d176e98c4 vlc-0.8.6-r1.ebuild 8813
-EBUILD vlc-0.8.6b.ebuild 9314 RMD160 04a7c7069cbd7ac8b2814d163fe2f60027b6338a SHA1 f0dcdfdf530b8e9d1a4c0bf266ccb33ee4c5d480 SHA256 4f3ce543c0666bbcac1a6144bb4ee967b488ad6509b5d0a1598b25113a566ed8
-MD5 60bf09c41fa8ed03abccc0e3c571e2b6 vlc-0.8.6b.ebuild 9314
-RMD160 04a7c7069cbd7ac8b2814d163fe2f60027b6338a vlc-0.8.6b.ebuild 9314
-SHA256 4f3ce543c0666bbcac1a6144bb4ee967b488ad6509b5d0a1598b25113a566ed8 vlc-0.8.6b.ebuild 9314
-MISC ChangeLog 43697 RMD160 a908b2cd31fd3affd192b58d47f76be66a07c51e SHA1 af62dab13bb5b4d69124b014f9c9b31e9487e359 SHA256 8d5ca89685122f4249a90a2a9e3f52199a4b03ac3208b97c323752a3bab9e8f3
-MD5 cad71feaee3bd9d2decb71528381e1bb ChangeLog 43697
-RMD160 a908b2cd31fd3affd192b58d47f76be66a07c51e ChangeLog 43697
-SHA256 8d5ca89685122f4249a90a2a9e3f52199a4b03ac3208b97c323752a3bab9e8f3 ChangeLog 43697
+EBUILD vlc-0.8.6-r1.ebuild 8786 RMD160 736985fe8844de56b3d82d103291320f00daf835 SHA1 730dcbd503ef0cd9b86fd3a8284c5bc31e8c5145 SHA256 e91da48e04aaa3bd64b9619dc5fe50242f114738c7be93d83518949037169329
+MD5 47081138ce7447ab737797175155b89e vlc-0.8.6-r1.ebuild 8786
+RMD160 736985fe8844de56b3d82d103291320f00daf835 vlc-0.8.6-r1.ebuild 8786
+SHA256 e91da48e04aaa3bd64b9619dc5fe50242f114738c7be93d83518949037169329 vlc-0.8.6-r1.ebuild 8786
+EBUILD vlc-0.8.6b.ebuild 9289 RMD160 bb25aef6f8060e3c38872df2147f94d8d94ae0c5 SHA1 bbbde03b190b7a1f2859e21a2e95544fcbc2aa42 SHA256 396390303f5bdc9ced6eb868869e457082dc9f6eba9ecec43f2470a87f4e4539
+MD5 62f076b31ccdcf23a75407d2db20aa9a vlc-0.8.6b.ebuild 9289
+RMD160 bb25aef6f8060e3c38872df2147f94d8d94ae0c5 vlc-0.8.6b.ebuild 9289
+SHA256 396390303f5bdc9ced6eb868869e457082dc9f6eba9ecec43f2470a87f4e4539 vlc-0.8.6b.ebuild 9289
+MISC ChangeLog 43865 RMD160 80a2c1359cb0f6e938a0147a6ec601cdbb828827 SHA1 7b4706262a4b508e9b559f5fc7392d25bdbd3a98 SHA256 949bb49050123460074b966a48495518c6765014ad45138a170917fb55460a52
+MD5 e6a1cc83e309140f6c923752bfbe393d ChangeLog 43865
+RMD160 80a2c1359cb0f6e938a0147a6ec601cdbb828827 ChangeLog 43865
+SHA256 949bb49050123460074b966a48495518c6765014ad45138a170917fb55460a52 ChangeLog 43865
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -27,10 +24,3 @@ SHA256 0eca80ff9addee5971dbcefaa597b261889874ef2fe93f38f7360347381c047a files/di
 MD5 7959107d3dac9e414d6046a69d3ed449 files/digest-vlc-0.8.6b 485
 RMD160 4e5804eb51dd05bca1dac59dcbaeb292bd7f1284 files/digest-vlc-0.8.6b 485
 SHA256 4f8c21720700f4554c7bcef3097983e11a19bd403dc19f7a7045f65df84d4691 files/digest-vlc-0.8.6b 485
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGXZvKKRy60XGEcJIRAkDHAKCqOS0zCC4WA4gLGguvgZNhKtx1CQCfat/8
-/RT542RoOT/xG3g6USKnpRU=
-=YXFP
------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 7cb7734d0737..91c56d6174f2 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.24 2007/05/07 15:27:27 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.25 2007/06/01 21:24:02 gurligebis Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -105,7 +105,7 @@ RDEPEND="
 			opengl? ( virtual/opengl )
 		)
 		directfb? ( dev-libs/DirectFB )
-		upnp? ( || ( net-libs/libupnp >=net-misc/upnp-1.2 ) )
+		upnp? ( net-libs/libupnp )
 		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 8e09a4bb71df..e9c9638e3ba0 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.7 2007/05/30 15:44:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6b.ebuild,v 1.8 2007/06/01 21:24:02 gurligebis Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -108,7 +108,7 @@ RDEPEND="
 			opengl? ( virtual/opengl )
 		)
 		directfb? ( dev-libs/DirectFB )
-		upnp? ( || ( net-libs/libupnp >=net-misc/upnp-1.2 ) )
+		upnp? ( net-libs/libupnp )
 		nsplugin? (
 			!seamonkey? ( www-client/mozilla-firefox )
 			seamonkey? ( www-client/seamonkey )