From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CDFB11389E2 for ; Fri, 5 Dec 2014 16:43:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C36D0E095E; Fri, 5 Dec 2014 16:43:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50A2FE095C for ; Fri, 5 Dec 2014 16:43:32 +0000 (UTC) Received: from pomiot.lan (mgorny-1-pt.tunnel.tserv28.waw1.ipv6.he.net [IPv6:2001:470:70:353::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id DCFA034031E; Fri, 5 Dec 2014 16:43:30 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-portage-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-portage-dev] [PATCH] Allow virtuals in package.provided Date: Fri, 5 Dec 2014 17:43:14 +0100 Message-Id: <1417797794-19449-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.2.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 43512fed-3394-4fb9-9884-4acb384324eb X-Archives-Hash: 34dc34493324241566a4eaf9146eec84 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. --- 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 150294b..46835b5 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -400,13 +400,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 59e239b..4d1f1d5 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -803,12 +803,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) -- 2.2.0