commit: e3366b392c76249ead2ef947b275eb5bba99bc1e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 5 16:25:58 2014 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 12 16:11:42 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e3366b39
Allow virtuals in package.provided
With new-style virtuals, there is no reason to enforce special rules to
virtuals in package.provided. If user wishes to implicitly provide
the virual package, we should not forbid him. Of course, he knows
the implications.
Reviewed-By: Zac Medico <zmedico <AT> gentoo.org>
---
man/portage.5 | 7 -------
pym/portage/package/ebuild/config.py | 6 ------
2 files changed, 13 deletions(-)
diff --git a/man/portage.5 b/man/portage.5
index ed0423f..f0b0e20 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -419,13 +419,6 @@ entries may cause installed packages satisfying equivalent
dependencies
to be removed by \fBemerge\fR(1) \fB\-\-depclean\fR actions (see the
\fBACTIONS\fR section of the \fBemerge\fR(1) man page for more information).
-Virtual packages (virtual/*) should not be specified in package.provided,
-since virtual packages themselves do not provide any files, and
-package.provided is intended to represent packages that do provide files.
-Depending on the type of virtual, it may be necessary to add an entry to the
-virtuals file and/or add a package that satisfies a virtual to
-package.provided.
-
.I Format:
.nf
\- comments begin with # (no inline comments)
diff --git a/pym/portage/package/ebuild/config.py
b/pym/portage/package/ebuild/config.py
index b7dd9ea..e119498 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -808,12 +808,6 @@ class config(object):
has_invalid_data = True
del pkgprovidedlines[x]
continue
- if cpvr[0] == "virtual":
- writemsg(_("Virtual package in
package.provided: %s\n") % \
- myline, noiselevel=-1)
- has_invalid_data = True
- del pkgprovidedlines[x]
- continue
if has_invalid_data:
writemsg(_("See portage(5) for correct
package.provided usage.\n"),
noiselevel=-1)
