From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA7A8139085 for ; Thu, 29 Dec 2016 21:39:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 181F1E0C37; Thu, 29 Dec 2016 21:39:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D652DE0C37 for ; Thu, 29 Dec 2016 21:39:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7911341685 for ; Thu, 29 Dec 2016 21:39:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2325B24E0 for ; Thu, 29 Dec 2016 21:39:24 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1483038004.ef00b42a6af4ca7d9c4eeff41ef652ee2e5edc56.ulm@gentoo> Subject: [gentoo-commits] proj/devmanual:master commit in: profiles/updates/, function-reference/query-functions/, ebuild-writing/eapi/, ... X-VCS-Repository: proj/devmanual X-VCS-Files: ebuild-writing/eapi/text.xml function-reference/query-functions/text.xml general-concepts/dependencies/text.xml profiles/updates/text.xml X-VCS-Directories: ebuild-writing/eapi/ function-reference/query-functions/ profiles/updates/ general-concepts/dependencies/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: ef00b42a6af4ca7d9c4eeff41ef652ee2e5edc56 X-VCS-Branch: master Date: Thu, 29 Dec 2016 21:39:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2163000c-158b-4002-8469-57cc58e74e30 X-Archives-Hash: 746f6658d39d34f6528ad62422170856 commit: ef00b42a6af4ca7d9c4eeff41ef652ee2e5edc56 Author: Ulrich Müller gentoo org> AuthorDate: Wed Dec 28 19:39:23 2016 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Dec 29 19:00:04 2016 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=ef00b42a Change "atom" to "package dependency specification" throughout. Bug: 603970 ebuild-writing/eapi/text.xml | 48 +++++++++++++++-------------- function-reference/query-functions/text.xml | 6 ++-- general-concepts/dependencies/text.xml | 8 ++--- profiles/updates/text.xml | 5 +-- 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml index 59e0bf3..a918fd0 100644 --- a/ebuild-writing/eapi/text.xml +++ b/ebuild-writing/eapi/text.xml @@ -89,9 +89,9 @@ src_compile() {

SLOT dependencies

- Any valid atom can be constrained to match a specific SLOT. This - is accomplished by appending a colon to the atom, followed by a - SLOT value. + Any valid package dependency specification can be constrained to match + a specific SLOT. This is accomplished by appending a colon to the + specification, followed by a SLOT value.

SLOT dependency examples: @@ -166,34 +166,34 @@ doman foo.lang.1

-
Blocker Atoms
+
Blockers
- New Meaning for Old Syntax
  
  - Blocker atoms which use the previously existing !atom syntax now - have a slightly different meaning. These blocker atoms indicate - that conflicting packages may be temporarily installed - simultaneously. When temporary simultaneous installation of - conflicting packages occurs, the installation of a newer package - may overwrite any colliding files that belong to an older package - which is explicitly blocked. When such file collisions occur, the - colliding files cease to belong to the older package, and they - remain installed after the older package is eventually - uninstalled. The older package is uninstalled only after any newer - blocking packages have been merged on top of it. + Blockers which use the previously existing ! syntax + now have a slightly different meaning. These so-called + weak blocks indicate that conflicting packages may + be temporarily installed simultaneously. When temporary + simultaneous installation of conflicting packages occurs, the + installation of a newer package may overwrite any colliding + files that belong to an older package which is explicitly + blocked. When such file collisions occur, the colliding files + cease to belong to the older package, and they remain installed + after the older package is eventually uninstalled. The older + package is uninstalled only after any newer blocking packages + have been merged on top of it.
- -
  New !!atom Syntax
  +
  New !! Operator
  
  - A new !!atom syntax is now supported, for use in special cases for - which temporary simultaneous installation of conflicting packages - should not be allowed. If a given package happens to be blocked by - a mixture of atoms consisting of both the !atom and !!atom - syntaxes, the !!atom syntax takes precedence over the !atom - syntax. + A new !! operator for strong blocks is now + supported, for use in special cases for which temporary + simultaneous installation of conflicting packages should not be + allowed. If both weak and strong blocks match a given package, + the strong block takes precedence.
@@ -731,7 +731,9 @@ REQUIRED_USE="|| ( foo bar baz )" RDEPEND="dev-libs/foo:0/3"
- Dependency atoms can use slot operators to clarify what should happen if the slot and/or sub-slot of a runtime dependency changes: + Package dependency specifications can use slot operators to + clarify what should happen if the slot and/or sub-slot of a runtime + dependency changes:
- diff --git a/function-reference/query-functions/text.xml b/function-reference/query-functions/text.xml index 66e595f..97d2dfb 100644 --- a/function-reference/query-functions/text.xml +++ b/function-reference/query-functions/text.xml @@ -96,8 +96,10 @@ query variables and similar state. best_version pkg - Echoes the highest versioned atom of pkg which is currently - installed. + Echoes category, name and version of the highest version of pkg + that is currently installed. + Example: best_version app-editors/emacs:24 will output + app-editors/emacs-24.5-r3. diff --git a/general-concepts/dependencies/text.xml b/general-concepts/dependencies/text.xml index df6df43..18fcefd 100644 --- a/general-concepts/dependencies/text.xml +++ b/general-concepts/dependencies/text.xml @@ -109,10 +109,10 @@ DEPEND="dev-lang/ruby
  -Each atom is the full category and name of a package. Atoms are separated by -arbitrary whitespace convention is to specify one atom per line for -readability purposes. When specifying names, the category part should be treated -as mandatory. +Each package dependency specification is the full category and name of +a package. Dependency specifications are separated by arbitrary whitespace +convention is to have one specification per line for readability purposes. +When specifying names, the category part should be treated as mandatory.
  diff --git a/profiles/updates/text.xml b/profiles/updates/text.xml index ae859e4..7136aea 100644 --- a/profiles/updates/text.xml +++ b/profiles/updates/text.xml @@ -36,10 +36,11 @@ the actual changes to the package have to be done manually. - slotmove atom oldslot newslot + slotmove spec oldslot newslot - Indicates that the atom specified has changed slots. + Indicates that the package matching dependency specification spec + has changed slots.