aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2020-01-25 18:59:42 +0100
committerUlrich Müller <ulm@gentoo.org>2020-01-28 01:23:32 +0100
commita520cba59f0d0a062a90de47ab963916ab1c3180 (patch)
tree3c02545fa155ef0a733d15f2390ee71ee12d19bb /ebuild-maintenance
parentbin/gen-eclass-html.sh: Whitespace. (diff)
downloaddevmanual-a520cba59f0d0a062a90de47ab963916ab1c3180.tar.gz
devmanual-a520cba59f0d0a062a90de47ab963916ab1c3180.tar.bz2
devmanual-a520cba59f0d0a062a90de47ab963916ab1c3180.zip
general-concepts/package-collisions: Moved here from ebuild-maintenance.
This section is about a general concept, not a particular maintenance operation. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'ebuild-maintenance')
-rw-r--r--ebuild-maintenance/collisions/text.xml49
-rw-r--r--ebuild-maintenance/text.xml1
2 files changed, 0 insertions, 50 deletions
diff --git a/ebuild-maintenance/collisions/text.xml b/ebuild-maintenance/collisions/text.xml
deleted file mode 100644
index 6f5cec6..0000000
--- a/ebuild-maintenance/collisions/text.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<guide self="ebuild-maintenance/collisions/">
-<chapter>
-<title>Package Collisions</title>
-<body>
-
-<p>
-When you encounter a package that is trying to install files that are
-already provided by another package (detectable with
-<c>FEATURES=collision-protect</c> 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 <c>/usr/bin/example</c> and "bar" is
-going to overwrite it, and later "bar" is unmerged, Portage will remove
-<c>/usr/bin/example</c> and it is therefore likely it will break
-"foo".
-</p>
-
-<p>
-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:
-</p>
-
-<ul>
- <li>Make "foo" (R)DEPEND on "bar" and not install the conflicting
- file.</li>
- <li>Remove conflicting files from "foo" in <c>src_install</c>
- or <c>pkg_preinst</c>.</li>
- <li>Move conflicting files into a new subpackage and make "foo" and
- "bar" both (R)DEPEND on that package.</li>
- <li>Change the location where "foo" or "bar" installs conflicting
- files.</li>
-</ul>
-
-<p>
-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 <c>CONFIG_PROTECT</c>'ed
-files (which should still be fixed, but aren't critical as Portage
-won't overwrite them).
-</p>
-
-</body>
-</chapter>
-</guide>
diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml
index 3576fbc..270230e 100644
--- a/ebuild-maintenance/text.xml
+++ b/ebuild-maintenance/text.xml
@@ -23,6 +23,5 @@ familiar with.
<include href="new-ebuild/"/>
<include href="git/"/>
<include href="package-moves/"/>
-<include href="collisions/"/>
<include href="removal/"/>
</guide>