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

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 15 insertions, 11 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/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() {