Don't provide virtual/emacs.

Package-Manager: portage-2.1.2.7

12 files changed, 32 insertions, 22 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index b739338d9ba6..bd5497448c3f 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.118 2007/05/15 09:30:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.119 2007/05/15 15:02:26 ulm Exp $
+
+  15 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.97.ebuild,
+  emacs-cvs-22.0.98.ebuild, emacs-cvs-22.0.99.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r1.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  Don't provide virtual/emacs, it is a new-style virtual now.
 
   15 May 2007; Tony Vroon <chainsaw@gentoo.org> emacs-cvs-22.0.99.ebuild,
   emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild:
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild
index b64fc4b2b0dd..557a1e53054c 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.97.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/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild,v 1.3 2007/04/25 06:09:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.97.ebuild,v 1.4 2007/05/15 15:02:26 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -33,7 +33,7 @@ DEPEND="sys-libs/ncurses
 	gzip-el? ( app-arch/gzip  )
 	nls? ( sys-devel/gettext )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 SLOT="22"
 OLD_SLOT="22.0.97"
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild
index 81a9776a7ed7..09729d98dfe2 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.98.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/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild,v 1.9 2007/04/28 20:45:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild,v 1.10 2007/05/15 15:02:26 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -37,7 +37,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 SLOT="22"
 # FULL_VERSION keeps the full version number, which is needed in order to
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild
index e63d49b1759e..3e0c882ffcc4 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.99.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/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild,v 1.4 2007/05/15 09:30:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild,v 1.5 2007/05/15 15:02:26 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -37,7 +37,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 SLOT="22"
 # FULL_VERSION keeps the full version number, which is needed in order to
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
index 48f9248143ae..1766e65265e1 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.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/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.12 2007/05/15 09:30:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.13 2007/05/15 15:02:26 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -43,7 +43,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 SLOT="22"
 LICENSE="GPL-2 FDL-1.2"
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
index cfd1387eb527..e0ca41fb84b9 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50.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/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.4 2007/05/15 09:30:26 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.5 2007/05/15 15:02:26 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -43,7 +43,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 SLOT="22"
 LICENSE="GPL-2 FDL-1.2"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
index a506213d8dbb..6115324f5f5b 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-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/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild,v 1.11 2007/04/25 06:09:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild,v 1.12 2007/05/15 15:02:26 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -33,7 +33,7 @@ DEPEND=">=sys-libs/ncurses-5.3
 		xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 ) )
 	sys-libs/zlib"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 SLOT="23"
 OLD_SLOT="23.0.0"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index 7a6cd0e89e07..7b855b81ff42 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.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/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.9 2007/04/30 22:48:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.10 2007/05/15 15:02:26 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -44,7 +44,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	gzip-el? ( app-arch/gzip )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 SLOT="23"
 LICENSE="GPL-2 FDL-1.2"
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index f1d3ec3dc9af..122307192058 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.148 2007/05/15 09:59:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.149 2007/05/15 15:03:56 ulm Exp $
+
+  15 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r4.ebuild,
+  emacs-21.4-r8.ebuild, emacs-21.4-r12.ebuild:
+  Don't provide virtual/emacs, it is a new-style virtual now.
 
   15 May 2007; Roy Marples <uberlord@gentoo.org>
   +files/emacs-21.4-freebsd-terminfo.patch, emacs-21.4-r12.ebuild:
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index 7d022157698c..be0b5d86a09e 100644
--- a/app-editors/emacs/emacs-21.4-r12.ebuild
+++ b/app-editors/emacs/emacs-21.4-r12.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/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.17 2007/05/15 10:12:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.18 2007/05/15 15:03:56 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	X? ( x11-misc/xbitmaps )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-editors/emacs/emacs-21.4-r4.ebuild b/app-editors/emacs/emacs-21.4-r4.ebuild
index 52b3ca504591..1ea7bb4a1a15 100644
--- a/app-editors/emacs/emacs-21.4-r4.ebuild
+++ b/app-editors/emacs/emacs-21.4-r4.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/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.14 2007/03/02 21:44:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.15 2007/05/15 15:03:56 ulm Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58
 	X? ( x11-misc/xbitmaps )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 DFILE=emacs-${SLOT}.desktop
 
diff --git a/app-editors/emacs/emacs-21.4-r8.ebuild b/app-editors/emacs/emacs-21.4-r8.ebuild
index aea28dea76c5..f31ccadf2737 100644
--- a/app-editors/emacs/emacs-21.4-r8.ebuild
+++ b/app-editors/emacs/emacs-21.4-r8.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/app-editors/emacs/emacs-21.4-r8.ebuild,v 1.2 2007/03/07 05:15:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r8.ebuild,v 1.3 2007/05/15 15:03:56 ulm Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58
 	X? ( x11-misc/xbitmaps )"
 
-PROVIDE="virtual/emacs virtual/editor"
+PROVIDE="virtual/editor"
 
 DFILE=emacs-${SLOT}.desktop