[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/maintenance-tasks/, ebuild-maintenance/, ...

2020-01-22 Thread Ulrich Müller
commit: fc3dbac6583d211d9ad804d82f47c1bb50722ced
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jan 21 10:58:34 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Jan 23 07:48:06 2020 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=fc3dbac6

ebuild-maintenance/collisions: New chapter.

Split off from ebuild-maintenance/maintenance-tasks.

Signed-off-by: Ulrich Müller  gentoo.org>

 .../{maintenance-tasks => collisions}/text.xml | 30 +-
 ebuild-maintenance/maintenance-tasks/text.xml  | 47 --
 ebuild-maintenance/text.xml|  1 +
 3 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/ebuild-maintenance/maintenance-tasks/text.xml 
b/ebuild-maintenance/collisions/text.xml
similarity index 72%
copy from ebuild-maintenance/maintenance-tasks/text.xml
copy to ebuild-maintenance/collisions/text.xml
index 8a2c3fc..6f5cec6 100644
--- a/ebuild-maintenance/maintenance-tasks/text.xml
+++ b/ebuild-maintenance/collisions/text.xml
@@ -1,18 +1,7 @@
 
-
+
 
-Maintenance Tasks
-
-
-
-This guide aims to explain common everyday ebuild maintenance
-routines, as well as other rarer maintenance routines which
-developers may not be familiar with.
-
-
-
-
-Conflicting files
+Package Collisions
 
 
 
@@ -56,20 +45,5 @@ won't overwrite them).
 
 
 
-
-
-
-Homepage unavailable
-
-
-
-If the HOMEPAGE of your package seems to be unavailable or it
-never existed at all, please set the HOMEPAGE variable in every ebuild
-to https://wiki.gentoo.org/wiki/No_homepage";>
-https://wiki.gentoo.org/wiki/No_homepage
-
-
-
-
 
 

diff --git a/ebuild-maintenance/maintenance-tasks/text.xml 
b/ebuild-maintenance/maintenance-tasks/text.xml
index 8a2c3fc..ccdefe9 100644
--- a/ebuild-maintenance/maintenance-tasks/text.xml
+++ b/ebuild-maintenance/maintenance-tasks/text.xml
@@ -11,53 +11,6 @@ developers may not be familiar with.
 
 
 
-
-Conflicting files
-
-
-
-When you encounter a package that is trying to install files that are
-already provided by another package (detectable with
-FEATURES=collision-protect for example) you have to fix this
-situation before you can commit the ebuild or, if you encounter this
-with an existing package, file a bug about that package (see below for
-a few exceptions). The reason file conflicts are critical is because
-if "foo" provides the file /usr/bin/example and "bar" is
-going to overwrite it, and later "bar" is unmerged, Portage will remove
-/usr/bin/example and it is therefore likely it will break
-"foo".
-
-
-
-The most obvious fix is to add a blocking dependency to both packages
-that want to install that file, so they can't be installed at the same
-time. But unless there are also other reasons for those packages to
-block each other you should avoid this if possible and rather fix the
-package, which could include one or more of the following steps:
-
-
-
-  Make "foo" (R)DEPEND on "bar" and not install the conflicting
-  file.
-  Remove conflicting files from "foo" in src_install
-  or pkg_preinst.
-  Move conflicting files into a new subpackage and make "foo" and
-  "bar" both (R)DEPEND on that package.
-  Change the location where "foo" or "bar" installs conflicting
-  files.
-
-
-
-In some cases conflicting files can't be really fixed or aren't
-critical, currently known exceptions are Perl module manpages
-(overwriting the ones from Perl itself) and CONFIG_PROTECT'ed
-files (which should still be fixed, but aren't critical as Portage
-won't overwrite them).
-
-
-
-
-
 
 Homepage unavailable
 

diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml
index b298807..1917b07 100644
--- a/ebuild-maintenance/text.xml
+++ b/ebuild-maintenance/text.xml
@@ -20,6 +20,7 @@ This section covers various tasks related to working with 
ebuilds.
 
 
 
+
 
 
 



[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/maintenance-tasks/, ebuild-maintenance/git/

2018-01-02 Thread Göktürk Yüksek
commit: e567fc6f7d05d509bdac865606271f0bc2e132d6
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct 14 18:14:40 2017 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Wed Jan  3 04:31:48 2018 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e567fc6f

Move the commit policy & commit message to git

 ebuild-maintenance/git/text.xml   | 158 ++
 ebuild-maintenance/maintenance-tasks/text.xml | 151 
 2 files changed, 158 insertions(+), 151 deletions(-)

diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml
index 2070217..59f1833 100644
--- a/ebuild-maintenance/git/text.xml
+++ b/ebuild-maintenance/git/text.xml
@@ -107,6 +107,164 @@ the historical commits after the initial git commit.
 
 
 
+
+Committing to gentoo.git
+
+
+
+Git Commit Policy
+
+
+
+Always run repoman scan before you commit.
+Please run repoman full before you commit.
+Always test that package.mask is okay by doing
+emerge --pretend mypkg before you commit and check
+that it doesn't contain any conflicts.
+Always commit the updated package.mask before
+the updated package.
+Always do atomic commits; if you commit a package with a new license,
+or that is masked, then first commit the revised package.mask 
and/or license,
+then commit the ebuild, patches
+and metadata.xml all in 
one go
+.
+ Although the set of changes in a single git commit is atomic, and
+combining package.mask/license changes with ebuild changes in a
+single commit wouldn't break atomicity, it is not currently possible to do so
+using repoman commit.
+
+
+
+
+
+
+
+Git Commit Message Format
+
+
+
+It is important to format the commit messages properly so that they
+communicate the changes to the reader in a clear and concise
+way. Additionally, consistency in message format allows for easier
+parsing by external tools. The first line of the commit message should
+contain a brief summary of the changes, followed by an empty new
+line. From the third line onward should be a detailed, multiline
+explanation of the changes introduced by the commit. At the very end,
+auxiliary information such as the bugs related to the commit,
+contributors, and reviewers should be listed using RFC822/git style
+tags. The length of the lines in the message should be 70-75
+characters at maximum.
+
+
+
+The summary line should start with referencing what is affected by the
+change followed by a colon ':' character. Use the rules in the
+following list to determine the proper format based on what has
+changed, substituting the package, category and eclass names
+appropriately:
+
+
+${CATEGORY}/${PN}:Single Package (Note that repoman commit
+automatically inserts this for you)
+${CATEGORY}: Package Category
+profiles: Profile Directory
+${ECLASS}.eclass: Eclass Directotry
+licenses: Licenses Directory
+metadata: Metadata Directory
+
+
+For packages where ${CATEGORY}/${PN}: is long, the line length
+limit can be exceeded, if absolutely necessary, to ensure a more
+useful summary line. If a commit affects multiple directories, prepend
+the message with which reflects the intention of the change best. If
+there are any bugs on Gentoo Bugzilla associated with the commit, id
+of the bug can be appended to the summary line using the format
+#BUG-ID. If you are modifying keywords, clearly state what
+keywords are added/removed.
+
+
+By default, lines starting with # are considered to be comments
+by git and not included in the commit message. Make sure that a new
+line does not start with #BUG-ID. Optionally, git can be
+configured to use a different character for comments by changing the
+commentchar option.
+
+
+
+
+For non-trivial commits, the message should contain a detailed
+explanation of what the commit intends to change, why it is required,
+and how it is accomplished, along with any other supplementary
+information.
+
+
+
+Finally the commit message should list auxiliary information such as
+people who are involved in authoring, suggesting, reviewing and
+testing the changes, and revelant bugs. Use RFC822/git style tags as
+explained in the
+https://kernel.org/doc/html/latest/process/submitting-patches.html";>
+Linux Kernel patch guideline. Additionally, the following tags
+are optionally used in Gentoo:
+
+
+Bug: Use this to reference bugs without closing them.
+The value is a URL to the bug. If multiple bugs need to be referenced,
+each one should be listed in a separate Bug tag. If a bug
+on Gentoo Bugzilla, or an issue or a pull request on GitHub
+is referenced, a reference to the commit will be added
+automatically.
+Closes: Use this to reference bugs and close them
+automatically. Alike Bug:, the value is a single URL to the bug,
+and multiple tags can be used to close multiple bugs. If a bug on Gentoo
+Bugzilla, or an issue or a pull request on a GitHub repository
+mirrored by Gentoo is referenced, it will be closed (as fixed)
+automatically with reference to the