Move to virtual/ffmpeg from media-video/ffmpeg.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 29 insertions, 15 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index d6fcca7f1f4e..dcf08a9eb360 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.82 2011/03/02 12:29:33 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.83 2011/04/04 12:06:58 scarabeus Exp $
+
+  04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cherokee-1.0.12.ebuild,
+  cherokee-1.2.0.ebuild, cherokee-1.2.1.ebuild:
+  Move to virtual/ffmpeg from media-video/ffmpeg.
 
 *cherokee-1.2.1 (02 Mar 2011)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 978cd8970091..e3de70de36b4 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cherokee-initd-0.99.23 542 RMD160 e0ee20b7bb781797c3a53d0e2804e8b0fe985beb SHA1 4a8b43509aa4b9bf1079e0e74ca9d61428672522 SHA256 9e58ed7b3050a17fed08cc682e30dfa14e09eb804084b6cc9b213ccd0843300f
 AUX cherokee-initd-1.2.0 717 RMD160 79d5e72dabc0183ae7e8d6453d83b1e549cac736 SHA1 04efcc25ab326a695944b45e12a1057a3574181e SHA256 c6cd9b7ab782aa5f3242bbdfcefabf4fff05ea253e7af1175df5eb2da7e6255d
 DIST cherokee-1.0.12.tar.gz 5710898 RMD160 21022ac54c32324d3d738e7afb104aa76c96374f SHA1 6a514ea6816252400c777cca4d91658575f49091 SHA256 37fbece8df5af26773710100f85008a9d65e3f363885ce7228f32e882b21fc75
 DIST cherokee-1.2.0.tar.gz 5898536 RMD160 e0b9f7af51cf21c94130b3ad3b106821cd35c3b9 SHA1 af8e4ee0e3dce59db86855a59aa0724ca0cfb331 SHA256 835df63bc97324d9a27d9bf3980de25cddae3edc55a2c72b01dc721ac604076a
 DIST cherokee-1.2.1.tar.gz 6041090 RMD160 d6285e8dd157b689eb1b2cd2369daf2bf812ba59 SHA1 982bc99e966218661abd562d604aea32923bfde9 SHA256 8ce6f35f521b8b0a45b5c95587b3653a137f9d8eed5ee7ffd3e8fa6cb922a668
-EBUILD cherokee-1.0.12.ebuild 4156 RMD160 475282d32ea58f162b0f1be3a3f2d2fbc0095e9e SHA1 3fc8153a4bae50ededd663efe2c4f83b7e992bdb SHA256 c339938504c78a2ef35abc4eca5045a69f9ef9ab989ada8b5fb3e0c2896f26e3
-EBUILD cherokee-1.2.0.ebuild 4151 RMD160 4d0c21d160a0e5c2743a2cc5ada865feda4ab7b6 SHA1 04ee24e8c0cae0e1c5aabbf423a2a970b550a796 SHA256 5c1725838310dcbae4c9634f56a65f915f3da48b78d54105d09ac8bfa4f0ec01
-EBUILD cherokee-1.2.1.ebuild 4151 RMD160 3bfbe8c1f3ab5c896335368d7a591ba1b3374666 SHA1 85a115c6084c0ad389a95fbf516ee3c92955dd5f SHA256 a69867c5225d8f2969e89a30ab227d60a4328b80c9663c751dc189e239edc185
-MISC ChangeLog 19413 RMD160 40745ccb9e76ed324f684ca7287f2fe1f5ea2869 SHA1 0450d573257ea63cb3e4559a771cdf1660ce3682 SHA256 b82e72ee63d02de534cfa7f2a0dd250a63268c54849175d077deb58217654ab6
+EBUILD cherokee-1.0.12.ebuild 4157 RMD160 200c962991c6c947e234b9fa4546f1dd3d827d7d SHA1 0d4832f2361d8e83bba07b42002a7de0a9697db1 SHA256 a5c85e604e4a02ab4a20c88ebf6c7b70f01f46491fe1a4a6179f79151867a07a
+EBUILD cherokee-1.2.0.ebuild 4152 RMD160 c2beb0bf529e26ebfc729d0f536a0a5e4c7282c7 SHA1 fd04a0bf5e8d00cd52a0b9d3e6554164236c1036 SHA256 965f7ee1e40fde54b1f8c3a4f3da95dfae4500559a9bbab3382ab543d0b3954c
+EBUILD cherokee-1.2.1.ebuild 4152 RMD160 7ceeda0703cd4a3bac513ba7bdb636d11034dcc7 SHA1 51206f2a53d226fbd877e8eee03e159a80cd90b9 SHA256 923c7cbea1560abca1aedae25cd450d9d0c800a60731a29c9aed64257c4d7a37
+MISC ChangeLog 19596 RMD160 0f8a1e0d24f86e61064e99f61ff0348a4dd47ba7 SHA1 ca28ac15b302d22e0f7034415a46bf5c2d08bbfa SHA256 2d66417f96dad8b506d7c5bd2743ab91554657f5e78c3fdf9152edc56f2ed5fc
 MISC metadata.xml 488 RMD160 6689708f9508ed17b4f67284e8fef3512161b432 SHA1 c7a8168a8e6b119bee60b536552f378cf670130b SHA256 4ee7f5937c157209c4d78429188bcfc36b9c063252760215ce2e70da1ff95496
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2ZsvcACgkQHB6c3gNBRYeVXQCgyCqM3rcFzv6LqxsBBy66aFwE
++34AoJytk4DibPmcYDTm49TqzgUDxXc5
+=uk+K
+-----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.0.12.ebuild b/www-servers/cherokee/cherokee-1.0.12.ebuild
index 35f8ac8a2e14..150f042f9380 100644
--- a/www-servers/cherokee/cherokee-1.0.12.ebuild
+++ b/www-servers/cherokee/cherokee-1.0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.12.ebuild,v 1.1 2010/12/02 13:55:12 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.0.12.ebuild,v 1.2 2011/04/04 12:06:58 scarabeus Exp $
 
 EAPI=2
 PYTHON_DEPEND="admin? 2"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.cherokee-project.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="ipv6 nls ssl static pam coverpage threads kernel_linux admin debug geoip
 ldap mysql ffmpeg fastcgi rrdtool"
 
@@ -27,7 +27,7 @@ RDEPEND="
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	fastcgi? ( www-servers/spawn-fcgi )
-	ffmpeg? ( media-video/ffmpeg )"
+	ffmpeg? ( virtual/ffmpeg )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/www-servers/cherokee/cherokee-1.2.0.ebuild b/www-servers/cherokee/cherokee-1.2.0.ebuild
index 59d2199b1658..abaed828b06b 100644
--- a/www-servers/cherokee/cherokee-1.2.0.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.0.ebuild,v 1.3 2011/03/02 12:29:33 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.0.ebuild,v 1.4 2011/04/04 12:06:58 scarabeus Exp $
 
 EAPI=2
 PYTHON_DEPEND="admin? 2"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.cherokee-project.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="ipv6 nls ssl static pam coverpage kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi rrdtool"
 
 RDEPEND="
@@ -26,7 +26,7 @@ RDEPEND="
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	fastcgi? ( www-servers/spawn-fcgi )
-	ffmpeg? ( media-video/ffmpeg )"
+	ffmpeg? ( virtual/ffmpeg )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/www-servers/cherokee/cherokee-1.2.1.ebuild b/www-servers/cherokee/cherokee-1.2.1.ebuild
index 5c7488eaa73e..406fcf94a64b 100644
--- a/www-servers/cherokee/cherokee-1.2.1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.1.ebuild,v 1.1 2011/03/02 12:29:33 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.1.ebuild,v 1.2 2011/04/04 12:06:58 scarabeus Exp $
 
 EAPI=2
 PYTHON_DEPEND="admin? 2"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.cherokee-project.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="ipv6 nls ssl static pam coverpage kernel_linux admin debug geoip ldap mysql ffmpeg fastcgi rrdtool"
 
 RDEPEND="
@@ -26,7 +26,7 @@ RDEPEND="
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
 	fastcgi? ( www-servers/spawn-fcgi )
-	ffmpeg? ( media-video/ffmpeg )"
+	ffmpeg? ( virtual/ffmpeg )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {