[gentoo-commits] proj/devmanual:master commit in: quickstart/

2022-03-17 Thread Sam James
commit: d6b166b300d41e20b5e58d2a1324af626b0fc85a
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 18 02:07:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 18 02:07:20 2022 +
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  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() {



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2022-03-12 Thread Sam James
commit: c305a14ac84919eb93abe6c7cc6da128c18ec4a5
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 13 01:46:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 13 01:46:26 2022 +
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  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 libc implementations which 
don't have their own.
 
 
 
-# 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)



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2021-12-08 Thread Sam James
commit: 22633c2132444e7398db9d6de3fcfdd6e4cf4639
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  9 04:12:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  9 04:12:11 2021 +
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  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.
 
 
 
-Often we need to apply patches. This is done in the src_prepare
-function using the eapply helper function. To use eapply
+Often we need to apply patches. This is done either by defining the
+PATCHES array in global scope or in the src_prepare function
+using the eapply helper function. To use eapply,
 one must use EAPI 7. Here's app-misc/detox/detox-1.1.0.ebuild:
 
 
@@ -266,7 +267,7 @@ one must use EAPI 7. Here's 
app-misc/detox/detox-1.1.0.ebuild:
 # 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 \



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2021-12-08 Thread Sam James
commit: 55397dd4f01ba44c3931fe77e5b9fc0f3fef967b
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  9 04:09:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  9 04:09:03 2021 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=55397dd4

quickstart: add Oxford comma (minor grammar fix)

Signed-off-by: Sam James  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.
 
 
 
-The BDEPEND, DEPEND and RDEPEND variables are how Portage
+The BDEPEND, DEPEND, and RDEPEND variables are how Portage
 determines which packages are needed to build and run the package. The
 BDEPEND variable lists build-time (executable) dependencies,
 DEPEND variable lists compile-time dependencies, and the RDEPEND



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2021-12-08 Thread Sam James
commit: 10513f99bcf89eacd4d7a55e5a939b526cbbc0fc
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  9 04:07:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  9 04:08:12 2021 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=10513f99

quickstart: mention BDEPEND

Signed-off-by: Sam James  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.
 
 
 
-The DEPEND and RDEPEND variables are how Portage determines which
-packages are needed to build and run the package. The DEPEND variable 
lists
-compile-time dependencies, and the RDEPEND lists runtime dependencies. 
See
- for some more complex examples.
+The BDEPEND, DEPEND and RDEPEND variables are how Portage
+determines which packages are needed to build and run the package. The
+BDEPEND variable lists build-time (executable) dependencies,
+DEPEND variable lists compile-time dependencies, and the RDEPEND
+lists runtime dependencies. See 
+for some more complex examples.
 
 
 



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2021-12-08 Thread Sam James
commit: de432135b7be55bb940683798eccaf6c89b341c8
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  9 04:06:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  9 04:08:11 2021 +
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  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 app-misc/detox/detox-1.1.1.ebuild:
 # 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 libc 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() {



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2020-02-16 Thread Ulrich Müller
commit: db0e1f3ac599bfda1a21d6f2ae507c158c9a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Feb 16 18:04:03 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Feb 16 18:04:03 2020 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=db0e1f3a

quickstart: Remove unnecessary escaping of quotes.

Signed-off-by: Ulrich Müller  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 https://).
 
 The SRC_URI tells Portage the address to use for downloading
 the source tarball. Here, mirror://sourceforge/ is a special
-notation meaning any of the Sourceforge mirrors.
+notation meaning "any of the Sourceforge mirrors".
 ${P} is a read-only variable set by Portage which is the package's
 name and version  in this case, it would be ctags-5.5.4.
 
@@ -116,8 +116,8 @@ or (at your option) any later version).
 
 
 
-The SLOT variable tells Portage which slot this package installs to. If
-you've not seen slots before, either just use 0 or read
+The SLOT variable tells Portage which slot this package installs to.
+If you've not seen slots before, either just use "0" or read
 .
 
 
@@ -152,11 +152,10 @@ this  see  and
 
 
 
-The canonical install method is emake DESTDIR=${D}
-install. This will work with any properly written standard
-Makefile. If this gives sandbox errors, see  for how to do manual
-installs.
+The canonical install method is emake DESTDIR="${D}" install. This will
+work with any properly written standard Makefile. If this gives sandbox
+errors, see  for how to do
+manual installs.
 
 
 



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2020-01-23 Thread Ulrich Müller
commit: 86d4107e1723f91abe2c3b85dadb55f3dcbf8c58
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Jan 23 13:08:20 2020 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Jan 23 13:08:20 2020 +
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  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.
 
 
 The HOMEPAGE is a link to the package's homepage (remember to
-include the http:// part).
+include the URI scheme, for example https://).
 
 
 



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2019-11-25 Thread Göktürk Yüksek
commit: 427c85aeee6f8766b88e1f94a564032d050dd5a7
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Tue Nov 26 02:52:25 2019 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Tue Nov 26 03:04:16 2019 +
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  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  see  and .
 
 
+
+When the src_prepare phase is overridden, it must be ensured
+that eapply_user is called.
+
+
 
 
 
@@ -383,6 +389,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
eapply "${FILESDIR}"/${PN}-namespace.diff \
"${FILESDIR}"/${PN}-procmime.diff
+   eapply_user
 }
 
 src_configure() {



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2019-11-25 Thread Göktürk Yüksek
commit: f4d4ba22f5dc64621e79fe14630959308671d92b
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  3 07:47:48 2019 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Tue Nov 26 01:47:25 2019 +
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  gentoo.org>
Signed-off-by: Göktürk Yüksek  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+"



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2019-05-13 Thread Ulrich Müller
commit: 858a4bf9eb22523b936651861d74780843d68f19
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Apr 22 07:22:44 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon May 13 18:50:22 2019 +
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  gentoo.org>
Signed-off-by: Ulrich Müller  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
-}
 
 
 
@@ -241,7 +236,9 @@ variables  see
 
 
 
-Again, we define src_configure and src_install functions.
+We define src_configure only.  src_install does not need to
+be defined since the default implementation calling emake install
+and installing common documentation files works correctly for the package.
 
 
 
@@ -291,11 +288,6 @@ src_prepare() {
 src_configure() {
econf --with-popt
 }
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodoc README CHANGES
-}
 
 
 
@@ -339,10 +331,6 @@ DEPEND="!sys-libs/glibc"
 src_configure() {
econf $(use_enable nls)
 }
-
-src_install() {
-   emake DESTDIR="${D}" install
-}
 
 
 



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2019-05-13 Thread Ulrich Müller
commit: 11a85f9596d71521a8018faf4d73d730d163187a
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Apr 22 07:14:20 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon May 13 18:50:09 2019 +
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  gentoo.org>
Signed-off-by: Ulrich Müller  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  in this case, it would be 
ctags-5.5.4.
 
 
 
-The LICENSE is GPL-2 (the GNU General Public License version 2).
+The LICENSE is GPL-2+ (the GNU General Public License version 2
+or (at your option) any later version).
 
 
 
@@ -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"



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2019-05-13 Thread Ulrich Müller
commit: 1b3f26405f688097c265702553adb19ace333ab3
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Apr 22 07:19:17 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon May 13 18:50:10 2019 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1b3f2640

quickstart: Switch to eapply

Signed-off-by: Michał Górny  gentoo.org>
Signed-off-by: Ulrich Müller  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 RDEPEND lists 
runtime dependencies. Se
 
 
 Often we need to apply patches. This is done in the src_prepare
-function using the epatch helper function. To use epatch
-one must first tell Portage that the epatch eclass (an eclass is
-like a library) is required 
-this is done via inherit epatch at the top of the ebuild. Here's
-app-misc/detox/detox-1.1.0.ebuild:
+function using the eapply helper function. To use eapply
+one must use EAPI 7. Here's app-misc/detox/detox-1.1.0.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
 }
 



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2018-10-24 Thread Brian Evans
commit: caf420c807bd52e6f0bdbf12845cf7f72a87c55f
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Oct 24 17:49:26 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Oct 24 17:49:26 2018 +
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  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 RDEPEND lists 
runtime dependencies. Se
 
 Often we need to apply patches. This is done in the src_prepare
 function using the epatch helper function. To use epatch
-one must first tell Portage that the eutils eclass (an eclass is
+one must first tell Portage that the epatch eclass (an eclass is
 like a library) is required 
-this is done via inherit eutils at the top of the ebuild. Here's
+this is done via inherit epatch at the top of the ebuild. Here's
 app-misc/detox/detox-1.1.0.ebuild:
 
 
@@ -272,7 +272,7 @@ this is done via inherit eutils 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/;



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2018-06-14 Thread Göktürk Yüksek
commit: 94bc3cc1d5939531b437a00decdedda7ff67f640
Author: Mikle Kolyada  users  noreply  github  
com>
AuthorDate: Thu May 24 17:39:26 2018 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Thu Jun 14 18:38:47 2018 +
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  see  and
 
 The canonical install method is emake DESTDIR=${D}
 install. This will work with any properly written standard
-Makefile. If this gives sandbox errors, try einstall
-instead. If this still fails, see Makefile. If this gives sandbox errors, see  for how to do manual
 installs.
 



[gentoo-commits] proj/devmanual:master commit in: quickstart/, ebuild-writing/functions/src_unpack/rpm-sources/, ...

2017-02-28 Thread Ulrich Müller
commit: 1b9cba36793d2e841718986932833845fc73ef68
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Feb 26 16:39:50 2017 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Feb 28 21:41:03 2017 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1b9cba36

Remove CVS $Id$ lines from all ebuild examples.

 ebuild-writing/eapi/text.xml |  7 ++-
 ebuild-writing/functions/src_unpack/rpm-sources/text.xml |  3 +--
 ebuild-writing/using-eclasses/text.xml   |  3 +--
 eclass-writing/text.xml  |  9 +++--
 quickstart/text.xml  | 15 +--
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml
index 6a5de05..a02b5a6 100644
--- a/ebuild-writing/eapi/text.xml
+++ b/ebuild-writing/eapi/text.xml
@@ -44,7 +44,6 @@ Most developers prefer to set the EAPI version without 
quotes. However, the PMS
 
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 EAPI=6
 
@@ -118,9 +117,8 @@ src_compile() {

 

-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 EAPI=1
 
@@ -513,9 +511,8 @@ DEPEND="

Example:

-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 EAPI=4
 inherit linux-info

diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml 
b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 0046e20..f082aca 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -52,9 +52,8 @@ patches. The filename should be 
suse-fetchmail-6.2.5.54.1.ebuild.
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 inherit eutils versionator rpm
 

diff --git a/ebuild-writing/using-eclasses/text.xml 
b/ebuild-writing/using-eclasses/text.xml
index b0dba01..83170ee 100644
--- a/ebuild-writing/using-eclasses/text.xml
+++ b/ebuild-writing/using-eclasses/text.xml
@@ -32,9 +32,8 @@ uses four eclasses:
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 EAPI=2
 

diff --git a/eclass-writing/text.xml b/eclass-writing/text.xml
index 1fe2ec1..1aef0c2 100644
--- a/eclass-writing/text.xml
+++ b/eclass-writing/text.xml
@@ -612,9 +612,8 @@ a single function, domacosapp.
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 # @ECLASS: macosapp.eclass
 # @MAINTAINER:
@@ -700,9 +699,8 @@ something like the following:
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 # @ECLASS: jmake.eclass
 # @MAINTAINER:
@@ -762,9 +760,8 @@ for an eclass to invoke die from the global scope.  For 
example:
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 # @ECLASS: eapi-die.eclass
 # @MAINTAINER:

diff --git a/quickstart/text.xml b/quickstart/text.xml
index a6f15d1..1ce4c61 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -34,9 +34,8 @@ can see real ebuilds in the main tree).
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 EAPI=6
 
@@ -205,9 +204,8 @@ Here's app-misc/detox/detox-1.1.1.ebuild:
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 EAPI=5
 
@@ -270,9 +268,8 @@ this is done via inherit eutils at the top of the 
ebuild. Here's
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 EAPI=5
 
@@ -328,9 +325,8 @@ replacement iconv for libc implementations which 
don't have their own.
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id
 
 EAPI=5
 
@@ -372,9 +368,8 @@ Another more complicated example, this time based upon
 
 
 
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Id

[gentoo-commits] proj/devmanual:master commit in: quickstart/

2016-10-28 Thread Göktürk Yüksek
commit: 003c9dc975e405c979b5fd285e23bd25ce9711e4
Author: Manuel Rüger  rueg  eu>
AuthorDate: Mon Oct  3 00:12:20 2016 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Fri Oct 28 14:38:07 2016 +
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
 }
 
 
@@ -162,7 +161,7 @@ installs.
 
 
 
-The dodoc and dohtml are helper functions for installing
+The dodoc is a helper function for installing
 files into the relevant part of /usr/share/doc.
 
 



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2015-08-09 Thread Justin Lecher
commit: 15324ebb507b0bef51cd17e64ac587470db8267d
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sun Aug  9 10:46:03 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sun Aug  9 12:39:17 2015 +
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 capp-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 cinherit 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 clibc/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
 



[gentoo-commits] proj/devmanual:master commit in: quickstart/

2015-08-09 Thread Justin Lecher
commit: c09d7be7311d6e253f9f8690503d6a0a752d4053
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sun Aug  9 10:46:03 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sun Aug  9 10:46:03 2015 +
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 capp-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 cinherit 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 clibc/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