* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2012-10-12 17:44 Ulrich Mueller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Mueller @ 2012-10-12 17:44 UTC (permalink / raw
To: gentoo-commits
commit: 796a0a89ab6e42099dc45a21e06a5a2533b9ff8f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 10:10:11 2012 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 9 15:50:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=796a0a89
Quickstart ebuild guide: Update examples to EAPI 4.
See bug 428412.
---
quickstart/text.xml | 124 +++++++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 58 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index ee49773..d0a3bb1 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -34,10 +34,12 @@ can see real ebuilds in the main tree).
</p>
<codesample lang="ebuild">
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=4
+
DESCRIPTION="Exuberant ctags generates tags files for quick source navigation"
HOMEPAGE="http://ctags.sourceforge.net"
SRC_URI="mirror://sourceforge/ctags/${P}.tar.gz"
@@ -47,15 +49,14 @@ SLOT="0"
KEYWORDS="~mips ~sparc ~x86"
IUSE=""
-src_compile() {
+src_configure() {
econf --with-posix-regex
- emake || die
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
- dodoc FAQ NEWS README || die
+ dodoc FAQ NEWS README
dohtml EXTENDING.html ctags.html
}
</codesample>
@@ -91,6 +92,10 @@ the ebuild and package in question.
</p>
<p>
+The <c>EAPI</c> of the ebuild, see <uri link="::ebuild-writing/eapi"/>.
+</p>
+
+<p>
The <c>DESCRIPTION</c> variable is set to a <e>short</e> description
of the package and its purpose.
</p>
@@ -101,10 +106,6 @@ include the <c>http://</c> part).
</p>
<p>
-The <c>LICENSE</c> is <c>GPL-2</c> (the GNU General Public License version 2).
-</p>
-
-<p>
The <c>SRC_URI</c> tells Portage the address to use for downloading
the source tarball. Here, <c>mirror://sourceforge/</c> is a special
notation meaning "any of the Sourceforge mirrors".
@@ -113,6 +114,10 @@ name and version <d/> in this case, it would be <c>ctags-5.5.4</c>.
</p>
<p>
+The <c>LICENSE</c> is <c>GPL-2</c> (the GNU General Public License version 2).
+</p>
+
+<p>
The <c>SLOT</c> variable tells Portage which slot this package installs to. If
you've not seen slots before, either just use <c>"0"</c> or read
<uri link="::general-concepts/slotting"/>.
@@ -132,15 +137,11 @@ details.
<body>
<p>
-Next, a function named <c>src_compile</c>. Portage will call this
-function when it wants to <e>compile</e> the package. The <c>econf</c>
-function is a wrapper for calling <c>./configure</c>, and <c>emake</c>
-is a wrapper for <c>make</c>. In the case of emake, the common <c>|| die
-"something went wrong"</c> idiom is used <d/> this is to
-ensure that if for some reason an error occurs, Portage will stop
-rather than trying to continue with the install. Note that <c>econf</c>
-does not need the <c>|| die</c> idiom, as it dies by itself if something
-failed.
+Next, a function named <c>src_configure</c>. Portage will call this
+function when it wants to <e>configure</e> the package. The <c>econf</c>
+function is a wrapper for calling <c>./configure</c>. If for some reason
+an error occurs in <c>econf</c>, Portage will stop rather than trying to
+continue with the install.
</p>
<p>
@@ -149,8 +150,7 @@ to <e>install</e> the package. A slight subtlety here <d/> rather than
installing straight to the live filesystem, we must install to a
special location which is given by the <c>${D}</c> variable (Portage sets
this <d/> see <uri link="::general-concepts/install-destinations"/> and
-<uri link="::general-concepts/sandbox"/>). Again, we check
-for errors using the <c>|| die</c> construct.
+<uri link="::general-concepts/sandbox"/>).
</p>
<note>
@@ -169,12 +169,22 @@ files into the relevant part of <c>/usr/share/doc</c>.
<p>
Ebuilds can define other functions (see <uri link="::ebuild-writing/functions"/>).
-In all cases, Portage provides a reasonable default implementation which quite
-often does the 'right thing'. There was no need to define a <c>src_unpack</c>
-function here, for example <d/> this function is used to do any unpacking of
-tarballs or patching of source files, but the default implementation does
-everything we need in this case.
+In all cases, Portage provides a reasonable default implementation which
+quite often does the 'right thing'. There was no need to define
+<c>src_unpack</c> and <c>src_compile</c> functions here, for example
+<d/> the <c>src_unpack</c> function is used to do any unpacking of
+tarballs or patching of source files, but the default implementation
+does everything we need in this case.
+Similarly, the default <c>src_compile</c> function will call
+<c>emake</c> which is a wrapper for <c>make</c>.
</p>
+
+<note>
+Formerly, the <c>|| die</c> construct had to be used after every command
+to check for errors. This is no longer necessary in EAPI 4 <d/>
+functions provided by Portage will die by themselves if something
+failed.
+</note>
</body>
</subsection>
@@ -197,10 +207,12 @@ Here's <c>app-misc/detox/detox-1.1.1.ebuild</c>:
</p>
<codesample lang="ebuild">
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=4
+
DESCRIPTION="detox safely removes spaces and strange characters from filenames"
HOMEPAGE="http://detox.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -215,14 +227,13 @@ DEPEND="${RDEPEND}
sys-devel/flex
sys-devel/bison"
-src_compile() {
+src_configure() {
econf --with-popt
- emake || die
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc README CHANGES || die
+ emake DESTDIR="${D}" install
+ dodoc README CHANGES
}
</codesample>
@@ -235,7 +246,7 @@ variables <d/> see
</p>
<p>
-Again, we define <c>src_compile</c> and <c>src_install</c> functions.
+Again, we define <c>src_configure</c> and <c>src_install</c> functions.
</p>
<p>
@@ -253,18 +264,21 @@ compile-time dependencies, and the <c>RDEPEND</c> lists runtime dependencies. Se
<body>
<p>
-Often we need to apply patches. This is done in the <c>src_unpack</c> function
-using the <c>epatch</c> helper function. To use <c>epatch</c> one must first tell
-Portage that the <c>eutils</c> eclass (an eclass is like a library) is required <d/>
+Often we need to apply patches. This is done in the <c>src_prepare</c>
+function using the <c>epatch</c> helper function. To use <c>epatch</c>
+one must first tell Portage that the <c>eutils</c> eclass (an eclass is
+like a library) is required <d/>
this is done via <c>inherit eutils</c> at the top of the ebuild. Here's
<c>app-misc/detox/detox-1.1.0.ebuild</c>:
</p>
<codesample lang="ebuild">
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=4
+
inherit eutils
DESCRIPTION="detox safely removes spaces and strange characters from filenames"
@@ -276,27 +290,23 @@ SLOT="0"
KEYWORDS="~hppa ~mips ~sparc ~x86"
IUSE=""
-RDEPEND="dev-libs/popt
+RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}
sys-devel/flex
sys-devel/bison"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
epatch "${FILESDIR}"/${P}-destdir.patch \
"${FILESDIR}"/${P}-parallel_build.patch
}
-src_compile() {
+src_configure() {
econf --with-popt
- emake || die
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc README CHANGES || die
+ emake DESTDIR="${D}" install
+ dodoc README CHANGES
}
</codesample>
@@ -321,10 +331,12 @@ replacement iconv for <c>libc</c> implementations which don't have their own.
</p>
<codesample lang="ebuild">
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=4
+
DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
HOMEPAGE="http://www.gnu.org/software/libiconv/"
SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz"
@@ -336,13 +348,12 @@ IUSE="nls"
DEPEND="!sys-libs/glibc"
-src_compile() {
+src_configure() {
econf $(use_enable nls)
- emake || die
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
}
</codesample>
@@ -364,10 +375,12 @@ Another more complicated example, this time based upon
</p>
<codesample lang="ebuild">
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=4
+
inherit eutils
DESCRIPTION="A lightweight email client and newsreader"
@@ -392,15 +405,12 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
nls? ( >=sys-devel/gettext-0.12.1 )"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
epatch "${FILESDIR}"/${PN}-namespace.diff \
"${FILESDIR}"/${PN}-procmime.diff
}
-src_compile() {
+src_configure() {
econf \
$(use_enable nls) \
$(use_enable ssl) \
@@ -410,17 +420,15 @@ src_compile() {
$(use_enable ipv6) \
$(use_enable imlib) \
$(use_enable xface compface)
-
- emake || die
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
doicon sylpheed.png
domenu sylpheed.desktop
- dodoc [A-Z][A-Z]* ChangeLog* || die
+ dodoc [A-Z][A-Z]* ChangeLog*
}
</codesample>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2013-01-21 8:18 Pacho Ramos
0 siblings, 0 replies; 20+ messages in thread
From: Pacho Ramos @ 2013-01-21 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 9a57744aa1d9799cad176afeeab09d1e3cf1a4ca
Author: Pacho Ramos <pachoramos <AT> gmail <DOT> com>
AuthorDate: Sun Jan 20 07:18:44 2013 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 22:35:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=9a57744a
Update place to put big patches, bug #453064
---
quickstart/text.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 0fa4e09..380b994 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -310,8 +310,9 @@ src_install() {
<p>
Note the <c>${FILESDIR}/${P}-destdir.patch</c> <d/> this refers to
<c>detox-1.1.0-destdir.patch</c>, which lives in the <c>files/</c>
-subdirectory in the Portage tree. Larger patch files must go on the
-mirrors rather than in <c>files/</c> <d/> see <uri
+subdirectory in the Portage tree. Larger patch files must go on your
+developer's space at <c>dev.gentoo.org</c> rather than in <c>files/</c> or
+mirrors <d/> see <uri link="::general-concepts/mirrors#Gentoo Mirrors"/> and <uri
link="::ebuild-writing/functions/src_prepare/epatch/"/>.
</p>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2015-08-09 12:39 Justin Lecher
0 siblings, 0 replies; 20+ messages in thread
From: Justin Lecher @ 2015-08-09 12:39 UTC (permalink / raw
To: gentoo-commits
commit: c09d7be7311d6e253f9f8690503d6a0a752d4053
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 10:46:03 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 10:46:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c09d7be7
Quickstart guide update
Using the new header according to git migration and bump EAPI to latest.
quickstart/text.xml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 380b994..561e4cd 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -34,11 +34,11 @@ can see real ebuilds in the main tree).
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
DESCRIPTION="Exuberant ctags generates tags files for quick source navigation"
HOMEPAGE="http://ctags.sourceforge.net"
@@ -206,11 +206,11 @@ Here's <c>app-misc/detox/detox-1.1.1.ebuild</c>:
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
DESCRIPTION="detox safely removes spaces and strange characters from filenames"
HOMEPAGE="http://detox.sourceforge.net/"
@@ -271,11 +271,11 @@ this is done via <c>inherit eutils</c> at the top of the ebuild. Here's
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
inherit eutils
@@ -329,11 +329,11 @@ replacement iconv for <c>libc</c> implementations which don't have their own.
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
HOMEPAGE="http://www.gnu.org/software/libiconv/"
@@ -373,11 +373,11 @@ Another more complicated example, this time based upon
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
inherit eutils
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2015-08-09 12:39 Justin Lecher
0 siblings, 0 replies; 20+ messages in thread
From: Justin Lecher @ 2015-08-09 12:39 UTC (permalink / raw
To: gentoo-commits
commit: 15324ebb507b0bef51cd17e64ac587470db8267d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 10:46:03 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 12:39:17 2015 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=15324ebb
Quickstart guide update
Using the new header according to git migration and bump EAPI to latest.
quickstart/text.xml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 380b994..561e4cd 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -34,11 +34,11 @@ can see real ebuilds in the main tree).
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
DESCRIPTION="Exuberant ctags generates tags files for quick source navigation"
HOMEPAGE="http://ctags.sourceforge.net"
@@ -206,11 +206,11 @@ Here's <c>app-misc/detox/detox-1.1.1.ebuild</c>:
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
DESCRIPTION="detox safely removes spaces and strange characters from filenames"
HOMEPAGE="http://detox.sourceforge.net/"
@@ -271,11 +271,11 @@ this is done via <c>inherit eutils</c> at the top of the ebuild. Here's
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
inherit eutils
@@ -329,11 +329,11 @@ replacement iconv for <c>libc</c> implementations which don't have their own.
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
HOMEPAGE="http://www.gnu.org/software/libiconv/"
@@ -373,11 +373,11 @@ Another more complicated example, this time based upon
</p>
<codesample lang="ebuild">
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
-EAPI=4
+EAPI=5
inherit eutils
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2016-10-28 14:41 Göktürk Yüksek
0 siblings, 0 replies; 20+ messages in thread
From: Göktürk Yüksek @ 2016-10-28 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 003c9dc975e405c979b5fd285e23bd25ce9711e4
Author: Manuel Rüger <manuel <AT> rueg <DOT> eu>
AuthorDate: Mon Oct 3 00:12:20 2016 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 14:38:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=003c9dc9
quickstart: Update the first ebuild to the latest EAPI
Drop dohtml, as it is deprecated in EAPI=6 and we should not encourage
new users to use it.
quickstart/text.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index e919716..25d66bd 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -38,7 +38,7 @@ can see real ebuilds in the main tree).
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
DESCRIPTION="Exuberant ctags generates tags files for quick source navigation"
HOMEPAGE="http://ctags.sourceforge.net"
@@ -56,7 +56,6 @@ src_install() {
emake DESTDIR="${D}" install
dodoc FAQ NEWS README
- dohtml EXTENDING.html ctags.html
}
</codesample>
</body>
@@ -162,7 +161,7 @@ installs.
</note>
<p>
-The <c>dodoc</c> and <c>dohtml</c> are helper functions for installing
+The <c>dodoc</c> is a helper function for installing
files into the relevant part of <c>/usr/share/doc</c>.
</p>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2018-06-14 18:43 Göktürk Yüksek
0 siblings, 0 replies; 20+ messages in thread
From: Göktürk Yüksek @ 2018-06-14 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 94bc3cc1d5939531b437a00decdedda7ff67f640
Author: Mikle Kolyada <Zlogene <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu May 24 17:39:26 2018 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Jun 14 18:38:47 2018 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=94bc3cc1
quickstart: Remove einstall reference
It is banned since EAPI=6, older EAPIs are deprecated.
quickstart/text.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index fd7e677..b82185d 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -153,8 +153,7 @@ this <d/> see <uri link="::general-concepts/install-destinations"/> and
<note>
The canonical install method is <c>emake DESTDIR="${D}"
install</c>. This will work with any properly written standard
-<c>Makefile</c>. If this gives sandbox errors, try <c>einstall</c>
-instead. If this still fails, see <uri
+<c>Makefile</c>. If this gives sandbox errors, see <uri
link="::ebuild-writing/functions/src_install/"/> for how to do manual
installs.
</note>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2018-10-24 17:49 Brian Evans
0 siblings, 0 replies; 20+ messages in thread
From: Brian Evans @ 2018-10-24 17:49 UTC (permalink / raw
To: gentoo-commits
commit: caf420c807bd52e6f0bdbf12845cf7f72a87c55f
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 17:49:26 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 17:49:26 2018 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=caf420c8
Change eutils in quickstart to epatch and desktop where necessary
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
quickstart/text.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index b82185d..19a2b9e 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -260,9 +260,9 @@ compile-time dependencies, and the <c>RDEPEND</c> lists runtime dependencies. Se
<p>
Often we need to apply patches. This is done in the <c>src_prepare</c>
function using the <c>epatch</c> helper function. To use <c>epatch</c>
-one must first tell Portage that the <c>eutils</c> eclass (an eclass is
+one must first tell Portage that the <c>epatch</c> eclass (an eclass is
like a library) is required <d/>
-this is done via <c>inherit eutils</c> at the top of the ebuild. Here's
+this is done via <c>inherit epatch</c> at the top of the ebuild. Here's
<c>app-misc/detox/detox-1.1.0.ebuild</c>:
</p>
@@ -272,7 +272,7 @@ this is done via <c>inherit eutils</c> at the top of the ebuild. Here's
EAPI=5
-inherit eutils
+inherit epatch
DESCRIPTION="detox safely removes spaces and strange characters from filenames"
HOMEPAGE="http://detox.sourceforge.net/"
@@ -372,7 +372,7 @@ Another more complicated example, this time based upon
EAPI=5
-inherit eutils
+inherit epatch desktop
DESCRIPTION="A lightweight email client and newsreader"
HOMEPAGE="https://sylpheed.good-day.net/"
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2019-05-13 18:52 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2019-05-13 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 1b3f26405f688097c265702553adb19ace333ab3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 07:19:17 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 18:50:10 2019 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1b3f2640
quickstart: Switch to eapply
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
quickstart/text.xml | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 5a33ead..51f9962 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -260,20 +260,15 @@ compile-time dependencies, and the <c>RDEPEND</c> lists runtime dependencies. Se
<body>
<p>
Often we need to apply patches. This is done in the <c>src_prepare</c>
-function using the <c>epatch</c> helper function. To use <c>epatch</c>
-one must first tell Portage that the <c>epatch</c> eclass (an eclass is
-like a library) is required <d/>
-this is done via <c>inherit epatch</c> at the top of the ebuild. Here's
-<c>app-misc/detox/detox-1.1.0.ebuild</c>:
+function using the <c>eapply</c> helper function. To use <c>eapply</c>
+one must use EAPI 7. Here's <c>app-misc/detox/detox-1.1.0.ebuild</c>:
</p>
<codesample lang="ebuild">
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit epatch
+EAPI=7
DESCRIPTION="detox safely removes spaces and strange characters from filenames"
HOMEPAGE="http://detox.sourceforge.net/"
@@ -289,7 +284,7 @@ DEPEND="${RDEPEND}
sys-devel/bison"
src_prepare() {
- epatch "${FILESDIR}"/${P}-destdir.patch \
+ eapply "${FILESDIR}"/${P}-destdir.patch \
"${FILESDIR}"/${P}-parallel_build.patch
}
@@ -371,9 +366,9 @@ Another more complicated example, this time based upon
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit epatch desktop
+inherit desktop
DESCRIPTION="A lightweight email client and newsreader"
HOMEPAGE="https://sylpheed.good-day.net/"
@@ -398,7 +393,7 @@ DEPEND="${RDEPEND}
nls? ( >=sys-devel/gettext-0.12.1 )"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-namespace.diff \
+ eapply "${FILESDIR}"/${PN}-namespace.diff \
"${FILESDIR}"/${PN}-procmime.diff
}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2019-05-13 18:52 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2019-05-13 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 11a85f9596d71521a8018faf4d73d730d163187a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 07:14:20 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 18:50:09 2019 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=11a85f95
quickstart: Correct LICENSE in ebuild snippets
While there's no real reason for those snippets to be correct, I think
it'd be generally beneficial to show developers that the '+' license
variants do exist and are quite common.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
quickstart/text.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index e47433e..5a33ead 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -43,7 +43,7 @@ DESCRIPTION="Exuberant ctags generates tags files for quick source navigation"
HOMEPAGE="http://ctags.sourceforge.net"
SRC_URI="mirror://sourceforge/ctags/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~mips ~sparc ~x86"
@@ -111,7 +111,8 @@ name and version <d/> in this case, it would be <c>ctags-5.5.4</c>.
</p>
<p>
-The <c>LICENSE</c> is <c>GPL-2</c> (the GNU General Public License version 2).
+The <c>LICENSE</c> is <c>GPL-2+</c> (the GNU General Public License version 2
+or (at your option) any later version).
</p>
<p>
@@ -333,7 +334,7 @@ DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
HOMEPAGE="https://www.gnu.org/software/libiconv/"
SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2+ GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="nls"
@@ -378,7 +379,7 @@ DESCRIPTION="A lightweight email client and newsreader"
HOMEPAGE="https://sylpheed.good-day.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE="crypt imlib ipv6 ldap nls pda ssl xface"
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2019-05-13 18:52 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2019-05-13 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 858a4bf9eb22523b936651861d74780843d68f19
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 07:22:44 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 18:50:22 2019 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=858a4bf9
quickstart: Remove unnecessary src_install() from most examples
Remove most of src_install() redefinitions since they completely match
the default. Leave the initial one for demonstration purposes,
and the last one since it is more complex.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
quickstart/text.xml | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 51f9962..d913374 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -225,11 +225,6 @@ DEPEND="${RDEPEND}
src_configure() {
econf --with-popt
}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README CHANGES
-}
</codesample>
<p>
@@ -241,7 +236,9 @@ variables <d/> see
</p>
<p>
-Again, we define <c>src_configure</c> and <c>src_install</c> functions.
+We define <c>src_configure</c> only. <c>src_install</c> does not need to
+be defined since the default implementation calling <c>emake install</c>
+and installing common documentation files works correctly for the package.
</p>
<p>
@@ -291,11 +288,6 @@ src_prepare() {
src_configure() {
econf --with-popt
}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README CHANGES
-}
</codesample>
<p>
@@ -339,10 +331,6 @@ DEPEND="!sys-libs/glibc"
src_configure() {
econf $(use_enable nls)
}
-
-src_install() {
- emake DESTDIR="${D}" install
-}
</codesample>
<p>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2019-11-26 1:49 Göktürk Yüksek
0 siblings, 0 replies; 20+ messages in thread
From: Göktürk Yüksek @ 2019-11-26 1:49 UTC (permalink / raw
To: gentoo-commits
commit: f4d4ba22f5dc64621e79fe14630959308671d92b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 3 07:47:48 2019 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 01:47:25 2019 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=f4d4ba22
quickstart: Update ctags HOMEPAGE to provide multi-value example
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
quickstart/text.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index d913374..46435fc 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -40,7 +40,7 @@ can see real ebuilds in the main tree).
EAPI=6
DESCRIPTION="Exuberant ctags generates tags files for quick source navigation"
-HOMEPAGE="http://ctags.sourceforge.net"
+HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
SRC_URI="mirror://sourceforge/ctags/${P}.tar.gz"
LICENSE="GPL-2+"
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2019-11-26 3:05 Göktürk Yüksek
0 siblings, 0 replies; 20+ messages in thread
From: Göktürk Yüksek @ 2019-11-26 3:05 UTC (permalink / raw
To: gentoo-commits
commit: 427c85aeee6f8766b88e1f94a564032d050dd5a7
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 26 02:52:25 2019 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 03:04:16 2019 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=427c85ae
quickstart/text.xml: call default in src_prepare()
It seems when converting epatch to eapply, the information about a
call eapply_user being mandatory was missed.
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>
quickstart/text.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 46435fc..24903ec 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -283,6 +283,7 @@ DEPEND="${RDEPEND}
src_prepare() {
eapply "${FILESDIR}"/${P}-destdir.patch \
"${FILESDIR}"/${P}-parallel_build.patch
+ eapply_user
}
src_configure() {
@@ -299,6 +300,11 @@ mirrors <d/> see <uri link="::general-concepts/mirrors#Gentoo Mirrors"/> and <ur
link="::ebuild-writing/functions/src_prepare/epatch/"/>.
</p>
+<p>
+When the <c>src_prepare</c> phase is overridden, it must be ensured
+that <c>eapply_user</c> is called.
+</p>
+
</body>
</section>
@@ -383,6 +389,7 @@ DEPEND="${RDEPEND}
src_prepare() {
eapply "${FILESDIR}"/${PN}-namespace.diff \
"${FILESDIR}"/${PN}-procmime.diff
+ eapply_user
}
src_configure() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2020-01-23 13:50 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2020-01-23 13:50 UTC (permalink / raw
To: gentoo-commits
commit: 86d4107e1723f91abe2c3b85dadb55f3dcbf8c58
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 13:08:20 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 13:08:20 2020 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=86d4107e
quickstart: Generalize note about HOMEPAGE.
Closes: https://bugs.gentoo.org/533552
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
quickstart/text.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index d98f43f..f8e65bb 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -99,7 +99,7 @@ of the package and its purpose.
<p>
The <c>HOMEPAGE</c> is a link to the package's homepage (remember to
-include the <c>http://</c> part).
+include the URI scheme, for example <c>https://</c>).
</p>
<p>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2020-02-16 18:05 Ulrich Müller
0 siblings, 0 replies; 20+ messages in thread
From: Ulrich Müller @ 2020-02-16 18:05 UTC (permalink / raw
To: gentoo-commits
commit: db0e1f3ac599beeeefda1a21d6f2ae507c158c9a
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 18:04:03 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 18:04:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=db0e1f3a
quickstart: Remove unnecessary escaping of quotes.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
quickstart/text.xml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index f8e65bb..1655f8d 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -105,7 +105,7 @@ include the URI scheme, for example <c>https://</c>).
<p>
The <c>SRC_URI</c> tells Portage the address to use for downloading
the source tarball. Here, <c>mirror://sourceforge/</c> is a special
-notation meaning "any of the Sourceforge mirrors".
+notation meaning "any of the Sourceforge mirrors".
<c>${P}</c> is a read-only variable set by Portage which is the package's
name and version <d/> in this case, it would be <c>ctags-5.5.4</c>.
</p>
@@ -116,8 +116,8 @@ or (at your option) any later version).
</p>
<p>
-The <c>SLOT</c> variable tells Portage which slot this package installs to. If
-you've not seen slots before, either just use <c>"0"</c> or read
+The <c>SLOT</c> variable tells Portage which slot this package installs to.
+If you've not seen slots before, either just use <c>"0"</c> or read
<uri link="::general-concepts/slotting"/>.
</p>
@@ -152,11 +152,10 @@ this <d/> see <uri link="::general-concepts/install-destinations"/> and
</p>
<note>
-The canonical install method is <c>emake DESTDIR="${D}"
-install</c>. This will work with any properly written standard
-<c>Makefile</c>. If this gives sandbox errors, see <uri
-link="::ebuild-writing/functions/src_install/"/> for how to do manual
-installs.
+The canonical install method is <c>emake DESTDIR="${D}" install</c>. This will
+work with any properly written standard <c>Makefile</c>. If this gives sandbox
+errors, see <uri link="::ebuild-writing/functions/src_install/"/> for how to do
+manual installs.
</note>
<p>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2021-12-09 4:08 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-12-09 4:08 UTC (permalink / raw
To: gentoo-commits
commit: 10513f99bcf89eacd4d7a55e5a939b526cbbc0fc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 04:07:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 04:08:12 2021 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=10513f99
quickstart: mention BDEPEND
Signed-off-by: Sam James <sam <AT> gentoo.org>
quickstart/text.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index fd8e26b..da2142b 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -241,10 +241,12 @@ and installing common documentation files works correctly for the package.
</p>
<p>
-The <c>DEPEND</c> and <c>RDEPEND</c> variables are how Portage determines which
-packages are needed to build and run the package. The <c>DEPEND</c> variable lists
-compile-time dependencies, and the <c>RDEPEND</c> lists runtime dependencies. See
-<uri link="::general-concepts/dependencies"/> for some more complex examples.
+The <c>BDEPEND</c>, <c>DEPEND</c> and <c>RDEPEND</c> variables are how Portage
+determines which packages are needed to build and run the package. The
+<c>BDEPEND</c> variable lists build-time (executable) dependencies,
+<c>DEPEND</c> variable lists compile-time dependencies, and the <c>RDEPEND</c>
+lists runtime dependencies. See <uri link="::general-concepts/dependencies"/>
+for some more complex examples.
</p>
</body>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2021-12-09 4:08 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-12-09 4:08 UTC (permalink / raw
To: gentoo-commits
commit: de432135b7be55bb940683798eccaf6c89b341c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 04:06:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 04:08:11 2021 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=de432135
quickstart: use EAPI 8 in examples
Also adjust to ~alpha/~ia64 as both of these arches
are pure ~arch (no stable keywords) now.
Signed-off-by: Sam James <sam <AT> gentoo.org>
quickstart/text.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 09dbaad..fd8e26b 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -37,7 +37,7 @@ can see real ebuilds in the main tree).
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Exuberant ctags generates tags files for quick source navigation"
HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
@@ -206,7 +206,7 @@ Here's <c>app-misc/detox/detox-1.1.1.ebuild</c>:
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
DESCRIPTION="detox safely removes spaces and strange characters from filenames"
HOMEPAGE="http://detox.sourceforge.net/"
@@ -219,7 +219,7 @@ KEYWORDS="~hppa ~mips sparc x86"
RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}
sys-devel/flex
- sys-devel/bison"
+BDEPEND="sys-devel/bison"
src_configure() {
econf --with-popt
@@ -276,8 +276,8 @@ KEYWORDS="~hppa ~mips ~sparc ~x86"
RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison"
+ sys-devel/flex"
+BDEPEND="sys-devel/bison"
src_prepare() {
eapply "${FILESDIR}"/${P}-destdir.patch \
@@ -320,7 +320,7 @@ replacement iconv for <c>libc</c> implementations which don't have their own.
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
HOMEPAGE="https://www.gnu.org/software/libiconv/"
@@ -359,7 +359,7 @@ Another more complicated example, this time based upon
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop
@@ -369,7 +369,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE="crypt imlib ipv6 ldap nls pda ssl xface"
RDEPEND="=x11-libs/gtk+-2*
@@ -381,8 +381,8 @@ RDEPEND="=x11-libs/gtk+-2*
xface? ( >=media-libs/compface-1.4 )
app-misc/mime-types
x11-misc/shared-mime-info"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/pkgconfig
nls? ( >=sys-devel/gettext-0.12.1 )"
src_prepare() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2021-12-09 4:09 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-12-09 4:09 UTC (permalink / raw
To: gentoo-commits
commit: 55397dd4f01ba44c3931fe77e5b9fc0f3fef967b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 04:09:03 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 04:09:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=55397dd4
quickstart: add Oxford comma (minor grammar fix)
Signed-off-by: Sam James <sam <AT> gentoo.org>
quickstart/text.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index da2142b..fb9461e 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -241,7 +241,7 @@ and installing common documentation files works correctly for the package.
</p>
<p>
-The <c>BDEPEND</c>, <c>DEPEND</c> and <c>RDEPEND</c> variables are how Portage
+The <c>BDEPEND</c>, <c>DEPEND</c>, and <c>RDEPEND</c> variables are how Portage
determines which packages are needed to build and run the package. The
<c>BDEPEND</c> variable lists build-time (executable) dependencies,
<c>DEPEND</c> variable lists compile-time dependencies, and the <c>RDEPEND</c>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2021-12-09 4:12 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-12-09 4:12 UTC (permalink / raw
To: gentoo-commits
commit: 22633c2132444e7398db9d6de3fcfdd6e4cf4639
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 04:12:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 04:12:11 2021 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=22633c21
quickstart: mention PATCHES, use .patch and not .diff
- We expect contributions to use .patch and not .diff nowadays.
- Mention PATCHES so people are aware it's an option.
Signed-off-by: Sam James <sam <AT> gentoo.org>
quickstart/text.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index fb9461e..caff4e5 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -257,8 +257,9 @@ for some more complex examples.
<body>
<p>
-Often we need to apply patches. This is done in the <c>src_prepare</c>
-function using the <c>eapply</c> helper function. To use <c>eapply</c>
+Often we need to apply patches. This is done either by defining the
+<c>PATCHES</c> array in global scope or in the <c>src_prepare</c> function
+using the <c>eapply</c> helper function. To use <c>eapply</c>,
one must use EAPI 7. Here's <c>app-misc/detox/detox-1.1.0.ebuild</c>:
</p>
@@ -266,7 +267,7 @@ one must use EAPI 7. Here's <c>app-misc/detox/detox-1.1.0.ebuild</c>:
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="detox safely removes spaces and strange characters from filenames"
HOMEPAGE="http://detox.sourceforge.net/"
@@ -387,11 +388,10 @@ DEPEND="${RDEPEND}"
BDEPEND="dev-util/pkgconfig
nls? ( >=sys-devel/gettext-0.12.1 )"
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-namespace.diff \
- "${FILESDIR}"/${PN}-procmime.diff
- eapply_user
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-namespace.patch
+ "${FILESDIR}"/${PN}-procmime.patch
+)
src_configure() {
econf \
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2022-03-13 1:47 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-03-13 1:47 UTC (permalink / raw
To: gentoo-commits
commit: c305a14ac84919eb93abe6c7cc6da128c18ec4a5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 01:46:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 01:46:26 2022 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c305a14a
quickstart: make blocker non-pure-DEPEND
Blockers need to be in RDEPEND too, per
devmanual guidance :)
Signed-off-by: Sam James <sam <AT> gentoo.org>
quickstart/text.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index caff4e5..9847477 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -320,7 +320,7 @@ replacement iconv for <c>libc</c> implementations which don't have their own.
</p>
<codesample lang="ebuild">
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -334,7 +334,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="nls"
-DEPEND="!sys-libs/glibc"
+RDEPEND="!sys-libs/glibc"
+DEPEND="${RDEPEND}"
src_configure() {
econf $(use_enable nls)
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: quickstart/
@ 2022-03-18 2:07 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-03-18 2:07 UTC (permalink / raw
To: gentoo-commits
commit: d6b166b300d41e20b5e58d2a1324af626b0fc85a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 02:07:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 02:07:20 2022 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d6b166b3
quickstart: add missing quote in example
Reported-by: dfdx
Signed-off-by: Sam James <sam <AT> gentoo.org>
quickstart/text.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 9847477..c15af51 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -218,7 +218,7 @@ KEYWORDS="~hppa ~mips sparc x86"
RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}
- sys-devel/flex
+ sys-devel/flex"
BDEPEND="sys-devel/bison"
src_configure() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2022-03-18 2:07 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-09 4:09 [gentoo-commits] proj/devmanual:master commit in: quickstart/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-03-18 2:07 Sam James
2022-03-13 1:47 Sam James
2021-12-09 4:12 Sam James
2021-12-09 4:08 Sam James
2021-12-09 4:08 Sam James
2020-02-16 18:05 Ulrich Müller
2020-01-23 13:50 Ulrich Müller
2019-11-26 3:05 Göktürk Yüksek
2019-11-26 1:49 Göktürk Yüksek
2019-05-13 18:52 Ulrich Müller
2019-05-13 18:52 Ulrich Müller
2019-05-13 18:52 Ulrich Müller
2018-10-24 17:49 Brian Evans
2018-06-14 18:43 Göktürk Yüksek
2016-10-28 14:41 Göktürk Yüksek
2015-08-09 12:39 Justin Lecher
2015-08-09 12:39 Justin Lecher
2013-01-21 8:18 Pacho Ramos
2012-10-12 17:44 Ulrich Mueller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox