commit: 4db82d56dd51b51748ea6000a3f2f10a2544ffd2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 26 16:33:23 2017 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue Feb 28 21:40:01 2017 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=4db82d56
ebuild-writing: The ebuild header doesn't have an $Id$ line any more. See Gentoo Council decision on 28 February 2017: https://bugs.gentoo.org/611234 ebuild-writing/common-mistakes/text.xml | 15 +++++++-------- ebuild-writing/file-format/text.xml | 16 ++++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ebuild-writing/common-mistakes/text.xml b/ebuild-writing/common-mistakes/text.xml index e3ee42d..1981bd5 100644 --- a/ebuild-writing/common-mistakes/text.xml +++ b/ebuild-writing/common-mistakes/text.xml @@ -155,21 +155,20 @@ skel.ebuild</uri>. </p> <p> -The first three lines <e>must</e> look like this: +The first two lines <e>must</e> look like this: </p> <pre caption="Valid Header"> # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ </pre> -<p> -Only if you are submitting a patched or version bumped ebuild, should you not -need to modify the <c>$Id$</c> line. But the line must be present. -It will be expanded on the staging box automatically. So there is no need for you to manually modify it. -See <uri link="::general-concepts/git-to-rsync"/>. -</p> +<note> +The header previously included a third line with a CVS <c>$Id$</c> +or <c>$Header$</c> keyword. That line was abolished after conversion +to Git by <uri link="https://bugs.gentoo.org/611234";>decision of the Gentoo +Council on 28 February 2017</uri> and <e>must not</e> be added any more. +</note> </body> </subsection> diff --git a/ebuild-writing/file-format/text.xml b/ebuild-writing/file-format/text.xml index 39e2ba4..1717d27 100644 --- a/ebuild-writing/file-format/text.xml +++ b/ebuild-writing/file-format/text.xml @@ -143,19 +143,23 @@ version components. <body> <p> -All ebuilds committed to the tree should have a three line header immediately at +All ebuilds committed to the tree should have a two line header immediately at the start indicating copyright. This must be an exact copy of the contents of -<c>$(portageq get_repo_path / gentoo)/header.txt</c>. Ensure that the -<c>$Id$</c> line is not modified manually <d/> will be expanded -on staging box. See <uri link="::general-concepts/git-to-rsync"/>. +<c>$(portageq get_repo_path / gentoo)/header.txt</c>. </p> <codesample lang="ebuild"> -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ </codesample> +<note> +The header previously included a third line with a CVS <c>$Id$</c> +or <c>$Header$</c> keyword. That line was abolished after conversion +to Git by <uri link="https://bugs.gentoo.org/611234";>decision of the Gentoo +Council on 28 February 2017</uri> and <e>must not</e> be added any more. +</note> + </body> </section>
