From 088d52251b622536c75b888fdbd2bd86bd5b3589 Mon Sep 17 00:00:00 2001
From: Ulrich Mueller <ulm@gentoo.org>
Date: Fri, 22 Apr 2011 20:24:43 +0200
Subject: [PATCH] Deprecate old-style virtuals.
---
ebuild-writing/variables/text.xml | 3 +--
general-concepts/dependencies/text.xml | 17 -----------------
general-concepts/virtuals/text.xml | 21 +++++----------------
profiles/virtuals/text.xml | 7 +++++--
4 files changed, 11 insertions(+), 37 deletions(-)
diff --git a/ebuild-writing/variables/text.xml b/ebuild-writing/variables/text.xml
index c78ca72..78113a1 100644
--- a/ebuild-writing/variables/text.xml
+++ b/ebuild-writing/variables/text.xml
@@ -235,8 +235,7 @@ Specifying the following variables is optional:
<tr>
<ti><c>PROVIDE</c></ti>
<ti>
- Any virtuals provided by this package, for example
- <c>"virtual/editor virtual/emacs"</c>.
+ Any old-style virtuals provided by this package.
</ti>
</tr>
</table>
diff --git a/general-concepts/dependencies/text.xml b/general-concepts/dependencies/text.xml
index 671ccf8..ba4a46c 100644
--- a/general-concepts/dependencies/text.xml
+++ b/general-concepts/dependencies/text.xml
@@ -327,23 +327,6 @@ DEPEND="!build? (
</section>
<section>
-<title>Virtual Dependencies</title>
-<body>
-
-<p>
-To depend upon a virtual package, use <c>virtual/whatever</c> as the atom.
-</p>
-
-<p>
-Currently, you must not use any kind of version specification with virtuals <d/>
-see <uri link="http://www.gentoo.org/proj/en/glep/glep-0037.html">GLEP 37</uri>
-for details and a proposed solution.
-</p>
-
-</body>
-</section>
-
-<section>
<title>
Any of Many Dependencies
</title>
diff --git a/general-concepts/virtuals/text.xml b/general-concepts/virtuals/text.xml
index 86bf815..d1fb751 100644
--- a/general-concepts/virtuals/text.xml
+++ b/general-concepts/virtuals/text.xml
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-<guide self="general-concepts/viruals/">
+<guide self="general-concepts/virtuals/">
<chapter>
<title>Virtuals</title>
<body>
<p>
-Currently there exist two different forms of virtuals, our regular
-<c>PROVIDE</c> type virtuals, and so called <e>new-style</e> virtuals.
+Currently there exist two different forms of virtuals, <e>old-style</e> and
+<e>new-style</e> virtuals.
</p>
</body>
@@ -34,19 +34,8 @@ because there is no concept of a version. You can only depend upon a virtual,
but not a particular version of that virtual.
</p>
<p>
-There are some things that are still only possible with old-style virtuals,
-which is why they are still useful:
-
-<ul>
- <li>
- Packages providing the virtual can block the virtual, so you can ensure
- nothing else is installed that also provides that virtual.
- </li>
- <li>
- The ability to set a default in the profile for what the virtual should
- pull in (without the need of pulling the package into the system set).
- </li>
-</ul>
+<e>Old-style</e> virtuals are deprecated and should not be added to the tree
+any more.
</p>
</body>
</section>
diff --git a/profiles/virtuals/text.xml b/profiles/virtuals/text.xml
index 3446cbd..2e3bdd9 100644
--- a/profiles/virtuals/text.xml
+++ b/profiles/virtuals/text.xml
@@ -6,11 +6,14 @@
<p>
The <c>virtuals</c> files in <c>profiles/</c> control the default provider for
-virtuals. It can be overridden in subprofiles for profile-specific defaults.
+old-style virtuals. It can be overridden in subprofiles for profile-specific
+defaults.
</p>
<p>
-Before adding a new virtual, it should be discussed on <c>gentoo-dev</c>.
+Old-style virtuals shouldn't be added to the tree any more. Use new-style
+virtuals instead, see section
+<uri link="::general-concepts/virtuals/#new-style-virtuals" />.
</p>
</body>
--
1.7.5.rc1