From 700187075bd0827c25eebf48c2460f3bf09ff758 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Mon, 29 Apr 2024 08:48:37 +0200
Subject: No longer mention PORTDIR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/865455
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 ebuild-writing/functions/src_install/text.xml | 9 ++++-----
 ebuild-writing/variables/text.xml             | 5 ++---
 general-concepts/licenses/text.xml            | 3 ++-
 general-concepts/overlay/text.xml             | 6 +++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ebuild-writing/functions/src_install/text.xml b/ebuild-writing/functions/src_install/text.xml
index 66a8e3d..d6589e9 100644
--- a/ebuild-writing/functions/src_install/text.xml
+++ b/ebuild-writing/functions/src_install/text.xml
@@ -120,11 +120,10 @@ to be installed recursively.
 </p>
 
 <note>
-There is no need to <c>dodoc</c> <c>COPYING</c>! The license belongs
-to <c>${PORTDIR}/licenses</c>. Sometimes though, you might want to
-install <c>COPYING</c> regardless, if it explains how different
-licenses are applied to different parts of the application, for
-example.
+There is no need for <c>dodoc COPYING</c>! The license belongs in the
+repository's <c>licenses/</c> directory. Sometimes though, you might want to
+install <c>COPYING</c> regardless, if it explains how different licenses are
+applied to different parts of the application, for example.
 </note>
 </body>
 </section>
diff --git a/ebuild-writing/variables/text.xml b/ebuild-writing/variables/text.xml
index af03749..67c9887 100644
--- a/ebuild-writing/variables/text.xml
+++ b/ebuild-writing/variables/text.xml
@@ -64,9 +64,8 @@ for these variables when writing ebuilds.
   <tr>
     <ti><c>FILESDIR</c></ti>
     <ti>
-      Path to the ebuild's <c>files/</c> directory, commonly used
-      for small patches and files. For example:
-      <c>"${PORTDIR}/${CATEGORY}/${PN}/files"</c>.
+      Path to the package's <c>files/</c> directory, commonly used for small
+      patches and other files.
     </ti>
   </tr>
   <tr>
diff --git a/general-concepts/licenses/text.xml b/general-concepts/licenses/text.xml
index a9fb702..182cfb6 100644
--- a/general-concepts/licenses/text.xml
+++ b/general-concepts/licenses/text.xml
@@ -236,7 +236,8 @@ plain text file (UTF-8 encoded) if at all possible. Some licenses are
 PDF files rather than plain text <d/> this should only be done if we
 are legally required to do so.
 Finally you need to check if your license should be added to a license group
-as listed in $PORTDIR/profiles/license_groups. For more information see the
+as listed in the repository's <c>profiles/license_groups</c> file. For more
+information see
 <uri link="https://www.gentoo.org/glep/glep-0023.html">GLEP 23</uri>.
 </p>
 
diff --git a/general-concepts/overlay/text.xml b/general-concepts/overlay/text.xml
index 72463e9..43d1607 100644
--- a/general-concepts/overlay/text.xml
+++ b/general-concepts/overlay/text.xml
@@ -11,9 +11,9 @@ in one or more repos.conf files.
 </p>
 
 <p>
-The overlay should contain the same directory structure as <c>PORTDIR</c> (although
-only the necessary directories need be included). For example, a simple overlay
-might have a directory structure like:
+The overlay should contain the same directory structure as the Gentoo
+repository (although only the necessary directories need be included).
+For example, a simple overlay might have a directory structure like:
 </p>
 
 <pre>
-- 
cgit v1.2.3-65-gdbad