[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_install/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Markos Chandras" <hwoarang@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_install/
Date: Sun,  4 May 2014 10:51:41 +0000 (UTC)	[thread overview]
Message-ID: <1399200521.ae270a6ad3300cdf9872ab671df3e13601b32b82.hwoarang@gentoo> (raw)

commit:     ae270a6ad3300cdf9872ab671df3e13601b32b82
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat May  3 13:22:45 2014 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun May  4 10:48:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=ae270a6a

Update the src_install reference to favor EAPI >= 4.

X-Gentoo-Bug: 486146
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=486146

---
 ebuild-writing/functions/src_install/text.xml | 82 ++++++++++++++-------------
 1 file changed, 42 insertions(+), 40 deletions(-)

diff --git a/ebuild-writing/functions/src_install/text.xml b/ebuild-writing/functions/src_install/text.xml
index b3f8fc8..fe0a738 100644
--- a/ebuild-writing/functions/src_install/text.xml
+++ b/ebuild-writing/functions/src_install/text.xml
@@ -62,18 +62,21 @@ src_install() {
 	fi
 }
 </codesample>
+<important>The following examples assume EAPI &#8805; 4</important>
 </body>
 </section>
 
 <section>
 <title>Sample <c>src_install</c></title>
 <body>
+
 <codesample lang="ebuild">
 src_install() {
-    emake DESTDIR="${D}" install || die "Install failed"
-    dodoc README CHANGES || die
+    emake DESTDIR="${D}" install
+    dodoc README CHANGES
 }
 </codesample>
+
 </body>
 </section>
 
@@ -87,7 +90,7 @@ install to a non-root location. If possible, this should be used:
 </p>
 
 <codesample lang="ebuild">
-    emake DESTDIR="${D}" install || die "Install failed"
+    emake DESTDIR="${D}" install
 </codesample>
 
 <note>
@@ -97,20 +100,18 @@ if you hit an error.
 </note>
 
 <p>
-Sometimes this will end up installing a few things into strange
-places. If and only if this is the case, the <c>einstall</c> function
-can be used:
+  Sometimes this will end up installing a few things into strange
+  places. If and only if this is the case, the <c>einstall</c>
+  function can be used. It is usually necessary to include additional
+  <c>dodoc</c> statements for the <c>README</c>, <c>ChangeLog</c>, etc
+  in these cases:
 </p>
 
 <codesample lang="ebuild">
-    einstall || die "einstall failed"
+    einstall
+    dodoc README CHANGES
 </codesample>
 
-<p>
-It is usually necessary to include additional <c>dodoc</c> statements for the
-<c>README</c>, <c>ChangeLog</c>, etc in these cases.
-</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
@@ -124,6 +125,7 @@ example.
 <section>
 <title>Trivial Installs</title>
 <body>
+
 <p>
 For some packages with no <c>Makefile</c> that only install a small
 number of files, writing a manual install using <c>cp</c> is the
@@ -138,58 +140,58 @@ compilation required) themes:
 
 <p>
 Or sometimes a combination of <c>insinto</c> and <c>doins</c> (plus related
-functions -- see Install Functions Reference) <d/> the following is based
+functions -- see <uri link="::function-reference/install-functions"/>) <d/> the following is based
 upon the <c>sys-fs/udev</c> install:
 </p>
 
 <codesample lang="ebuild">
 src_install() {
-    dobin udevinfo || die
-    dobin udevtest || die
+    dobin udevinfo
+    dobin udevtest
     into /
-    dosbin udev || die
-    dosbin udevd || die
-    dosbin udevsend || die
-    dosbin udevstart || die
-    dosbin extras/scsi_id/scsi_id || die
-    dosbin extras/volume_id/udev_volume_id || die
+    dosbin udev
+    dosbin udevd
+    dosbin udevsend
+    dosbin udevstart
+    dosbin extras/scsi_id/scsi_id
+    dosbin extras/volume_id/udev_volume_id
 
     exeinto /etc/udev/scripts
-    doexe extras/ide-devfs.sh || die
-    doexe extras/scsi-devfs.sh || die
-    doexe extras/cdsymlinks.sh || die
-    doexe extras/dvb.sh || die
+    doexe extras/ide-devfs.sh
+    doexe extras/scsi-devfs.sh
+    doexe extras/cdsymlinks.sh
+    doexe extras/dvb.sh
 
     insinto /etc/udev
-    newins "${FILESDIR}/udev.conf.post_050" udev.conf || die
-    doins extras/cdsymlinks.conf || die
+    newins "${FILESDIR}/udev.conf.post_050" udev.conf
+    doins extras/cdsymlinks.conf
 
     # For devfs style layout
     insinto /etc/udev/rules.d/
-    newins etc/udev/gentoo/udev.rules 50-udev.rules || die
+    newins etc/udev/gentoo/udev.rules 50-udev.rules
 
     # scsi_id configuration
     insinto /etc
-    doins extras/scsi_id/scsi_id.config || die
+    doins extras/scsi_id/scsi_id.config
 
     # set up symlinks in /etc/hotplug.d/default
-    dodir /etc/hotplug.d/default || die
-    dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug || die
+    dodir /etc/hotplug.d/default
+    dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug
 
     # set up the /etc/dev.d directory tree
-    dodir /etc/dev.d/default || die
-    dodir /etc/dev.d/net || die
+    dodir /etc/dev.d/default
+    dodir /etc/dev.d/net
     exeinto /etc/dev.d/net
-    doexe etc/dev.d/net/hotplug.dev || die
+    doexe etc/dev.d/net/hotplug.dev
 
-    doman *.8 || die
-    doman extras/scsi_id/scsi_id.8 || die
+    doman *.8
+    doman extras/scsi_id/scsi_id.8
 
-    dodoc ChangeLog FAQ HOWTO-udev_for_dev README TODO || die
-    dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs,RFC-dev.d,libsysfs.txt} || die
-    dodoc docs/persistent_naming/* docs/writing_udev_rules/* || die
+    dodoc ChangeLog FAQ HOWTO-udev_for_dev README TODO
+    dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs,RFC-dev.d,libsysfs.txt}
+    dodoc docs/persistent_naming/* docs/writing_udev_rules/*
 
-    newdoc extras/volume_id/README README_volume_id || die
+    newdoc extras/volume_id/README README_volume_id
 }
 </codesample>

next             reply	other threads:[~2014-05-04 10:51 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-04 10:51 Markos Chandras [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-01-23  7:47 [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_install/ Ulrich Müller
2020-01-09 19:12 Ulrich Müller
2018-12-26 13:39 Ulrich Müller
2016-12-07 19:46 Göktürk Yüksek
2014-05-05 10:21 Markos Chandras
2014-05-04 12:07 Markos Chandras
2012-10-28  9:52 Markos Chandras

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b3f8fc8 dfblob:fe0a738 )
 OR (
bs:"[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_install/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399200521.ae270a6ad3300cdf9872ab671df3e13601b32b82.hwoarang@gentoo \
    --to=hwoarang@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox