[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/
commit: 9899125938fb558df2dbb0d7c225fd90098f53d3
Author: Sam James gentoo org>
AuthorDate: Thu Dec 9 04:23:49 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 9 04:24:31 2021 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=98991259
ebuild-writing/functions/src_unpack/rpm-sources: use EAPI 8 in example
Signed-off-by: Sam James gentoo.org>
ebuild-writing/functions/src_unpack/rpm-sources/text.xml | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index ba78d4c..d29f592 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -28,7 +28,7 @@ src_unpack() {
rpm_src_unpack ${A}
cd "${S}"
- use ssl epatch "${FILESDIR}/${PV}/${P}-ssl.patch"
+ use ssl eapply "${FILESDIR}/${PV}/${P}-ssl.patch"
}
@@ -55,16 +55,17 @@ patches. The filename should be
suse-fetchmail-6.2.5.54.1.ebuild.
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
-inherit eapi7-ver rpm
+inherit rpm
MY_PV=$(ver_rs 3 '-')
MY_P=fetchmail-${MY_PV}
-SRC_URI="https://suse.osuosl.org/suse/i386/9.2/suse/src/${MY_P}.src.rpm;
DESCRIPTION="SuSE 9.2 Fetchmail Source Package"
HOMEPAGE="https://www.suse.com;
+SRC_URI="https://suse.osuosl.org/suse/i386/9.2/suse/src/${MY_P}.src.rpm;
+S=${WORKDIR}/fetchmail-$(ver_cut 1-3)
LICENSE="GPL-2 public-domain"
SLOT="0"
@@ -75,15 +76,13 @@ RESTRICT="mirror"
# Need to test if the file can be unpacked with rpmoffset and cpio
# If it can't then set:
-#DEPEND="app-arch/rpm"
+#BDEPEND="app-arch/rpm"
# To force the use of rpmoffset and cpio instead of rpm2cpio from
# app-arch/rpm, then set the following:
#USE_RPMOFFSET_ONLY=1
-S=${WORKDIR}/fetchmail-$(ver_cut 1-3)
-
src_unpack() {
rpm_src_unpack ${A}
}
[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/
commit: d240b5e69b87c1ab35bd714634eb47b78d98f8d8
Author: Sam James gentoo org>
AuthorDate: Fri Mar 12 18:20:04 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Fri Mar 12 19:32:21 2021 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d240b5e6
ebuild-writing/functions/src_unpack/rpm-sources: update phase definition
We don't normally write 'phase_name ()', but instead 'phase_name()'.
Reflect that in our example.
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Ulrich Müller gentoo.org>
ebuild-writing/functions/src_unpack/rpm-sources/text.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 4341944..ba78d4c 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -24,7 +24,7 @@ manner such as:
-src_unpack () {
+src_unpack() {
rpm_src_unpack ${A}
cd "${S}"
@@ -84,11 +84,11 @@ RESTRICT="mirror"
S=${WORKDIR}/fetchmail-$(ver_cut 1-3)
-src_unpack () {
+src_unpack() {
rpm_src_unpack ${A}
}
-src_prepare () {
+src_prepare() {
for i in "${WORKDIR}"/*.patch ; do
eapply "${i}"
done
[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/, ...
commit: 614aa9705f89350955e02f4abc69a3de60948fa0 Author: Ulrich Müller gentoo org> AuthorDate: Sun Jan 3 14:32:01 2021 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Jan 3 14:32:01 2021 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=614aa970 Update copyright years Signed-off-by: Ulrich Müller gentoo.org> appendices/devbook-guide/text.xml| 2 +- bin/gen-eclass-html.sh | 2 +- devbook.xsl | 2 +- ebuild-writing/common-mistakes/text.xml | 2 +- ebuild-writing/eapi/text.xml | 2 +- ebuild-writing/file-format/text.xml | 2 +- ebuild-writing/functions/src_unpack/rpm-sources/text.xml | 2 +- ebuild-writing/users-and-groups/text.xml | 4 ++-- ebuild-writing/using-eclasses/text.xml | 2 +- eclass-writing/text.xml | 6 +++--- general-concepts/use-flags/text.xml | 2 +- quickstart/text.xml | 10 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/appendices/devbook-guide/text.xml b/appendices/devbook-guide/text.xml index 1924843..70b4dab 100644 --- a/appendices/devbook-guide/text.xml +++ b/appendices/devbook-guide/text.xml @@ -327,7 +327,7 @@ the following example: -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/bin/gen-eclass-html.sh b/bin/gen-eclass-html.sh index f7fcc73..4ca853a 100755 --- a/bin/gen-eclass-html.sh +++ b/bin/gen-eclass-html.sh @@ -76,7 +76,7 @@ IFS='' read -r -d '' FOOTER << 'EOF' https://www.facebook.com/gentoo.org; title="Gentoo on Facebook"> -Copyright (C) 2001-2020 Gentoo Authors +Copyright (C) 2001-2021 Gentoo Authors Gentoo is a trademark of the Gentoo Foundation, Inc. The text of this document is distributed under the https://www.gnu.org/licenses/gpl-2.0.html;>GNU General Public License, version 2. diff --git a/devbook.xsl b/devbook.xsl index 1605663..5c81497 100644 --- a/devbook.xsl +++ b/devbook.xsl @@ -636,7 +636,7 @@ - Copyright (C) 2001-2020 Gentoo Authors + Copyright (C) 2001-2021 Gentoo Authors Gentoo is a trademark of the Gentoo Foundation, Inc. The text of this document is distributed under the diff --git a/ebuild-writing/common-mistakes/text.xml b/ebuild-writing/common-mistakes/text.xml index ff9b377..67be337 100644 --- a/ebuild-writing/common-mistakes/text.xml +++ b/ebuild-writing/common-mistakes/text.xml @@ -180,7 +180,7 @@ The first two lines must look like this: -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml index 9541c02..b738640 100644 --- a/ebuild-writing/eapi/text.xml +++ b/ebuild-writing/eapi/text.xml @@ -42,7 +42,7 @@ You must set the EAPI variable by specifying it at the top of the ebuild: -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/ebuild-writing/file-format/text.xml b/ebuild-writing/file-format/text.xml index 5eb0cf8..2bd6623 100644 --- a/ebuild-writing/file-format/text.xml +++ b/ebuild-writing/file-format/text.xml @@ -178,7 +178,7 @@ header.txt in the top directory of the Gentoo repository. -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml index 9348350..4341944 100644 --- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml +++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml @@ -52,7 +52,7 @@ patches. The filename should be suse-fetchmail-6.2.5.54.1.ebuild. -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" diff --git a/ebuild-writing/users-and-groups/text.xml b/ebuild-writing/users-and-groups/text.xml index 294d558..388b97d 100644 --- a/ebuild-writing/users-and-groups/text.xml +++ b/ebuild-writing/users-and-groups/text.xml @@ -47,7 +47,7 @@ can be used as a template for writing group ebuilds: -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -76,7 +76,7 @@ can be used as a template for writing user
[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/
commit: 00a1865827862c17a4019d56afb4b5b5f8a3f658
Author: Brian Evans gentoo org>
AuthorDate: Fri Sep 14 16:55:09 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Sep 14 16:55:09 2018 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=00a18658
Bring rpm example up to EAPI 6 standards
Signed-off-by: Brian Evans gentoo.org>
.../functions/src_unpack/rpm-sources/text.xml | 22 ++
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 64ac1de..584866a 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -19,7 +19,7 @@ that will unpack the RPM files.
-If you do need to apply patches then override src_unpack in a
+If you do need to call additional unpack functions then override
src_unpack in a
manner such as:
@@ -55,9 +55,11 @@ patches. The filename should be
suse-fetchmail-6.2.5.54.1.ebuild.
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-inherit eutils versionator rpm
+EAPI="6"
-MY_PV=$(replace_version_separator 3 '-')
+inherit eapi7-ver rpm
+
+MY_PV=$(ver_rs 3 '-')
MY_P=fetchmail-${MY_PV}
SRC_URI="https://suse.osuosl.org/suse/i386/9.2/suse/src/${MY_P}.src.rpm;
@@ -80,13 +82,17 @@ RESTRICT="mirror"
#USE_RPMOFFSET_ONLY=1
-S=${WORKDIR}/fetchmail-$(get_version_component_range 1-3)
+S=${WORKDIR}/fetchmail-$(ver_cut 1-3)
src_unpack () {
- rpm_src_unpack ${A}
- cd "${S}"
- EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" epatch
+rpm_src_unpack ${A}
+}
+
+src_prepare () {
+for i in "${WORKDIR}"/*.patch ; do
+eapply "${i}"
+done
+eapply_user
}
[gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/, ebuild-writing/eapi/, ...
commit: e163dc08df7228bafeadb9a0fac092411ffb946b
Author: Göktürk Yüksek gentoo org>
AuthorDate: Sat Apr 21 02:25:48 2018 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Sat Apr 21 02:25:48 2018 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=e163dc08
Convert various 'http://' URIs to 'https://'
Here's the heuristic for conversion:
- If the https substitute is valid, always convert to https
- If it's a bogus URI used in an example, convert it to https
- If it's a valid URI used in an example with no valid https, leave it alone
appendices/contributing/text.xml | 3 ++-
ebuild-maintenance/maintenance-tasks/text.xml | 4 ++--
ebuild-writing/common-mistakes/text.xml| 6 -
ebuild-writing/eapi/text.xml | 2 +-
.../functions/src_unpack/rpm-sources/text.xml | 4 ++--
.../functions/src_unpack/svn-sources/text.xml | 2 +-
ebuild-writing/misc-files/metadata/text.xml| 2 +-
ebuild-writing/variables/text.xml | 26 +++---
general-concepts/autotools/text.xml| 3 ++-
hosted-projects/text.xml | 2 +-
quickstart/text.xml| 4 ++--
11 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/appendices/contributing/text.xml b/appendices/contributing/text.xml
index 5550aef..9ad2011 100644
--- a/appendices/contributing/text.xml
+++ b/appendices/contributing/text.xml
@@ -18,7 +18,8 @@ not be discussed.
-This document is licensed under the http://creativecommons.org/licenses/by-sa/3.0/;>
+This document is licensed under the
+https://creativecommons.org/licenses/by-sa/3.0/;>
Creative Commons Attribution-ShareAlike 3.0 Unported License.
If this is a problem, don't submit anything.
diff --git a/ebuild-maintenance/maintenance-tasks/text.xml
b/ebuild-maintenance/maintenance-tasks/text.xml
index 5e67a46..10e25d9 100644
--- a/ebuild-maintenance/maintenance-tasks/text.xml
+++ b/ebuild-maintenance/maintenance-tasks/text.xml
@@ -56,8 +56,8 @@ users that will use your package. If your package is broken,
and you are
not sure how to get it to work, check some other distributions that have
done their own versions of the package. You can check
http://cvs.mandriva.com/cgi-bin/viewvc.cgi/SPECS/;>Mandriva
-or http://www.debian.org/distrib/packages;>Debian or
-http://pkgs.fedoraproject.org/cgit/rpms/;>Fedora for some
+or https://www.debian.org/distrib/packages;>Debian or
+https://pkgs.fedoraproject.org/cgit/rpms/;>Fedora for some
examples.
diff --git a/ebuild-writing/common-mistakes/text.xml
b/ebuild-writing/common-mistakes/text.xml
index c188c1f..a66ec49 100644
--- a/ebuild-writing/common-mistakes/text.xml
+++ b/ebuild-writing/common-mistakes/text.xml
@@ -138,7 +138,11 @@ GCC can turn any specific warning into an error. A
specific -Werror flag would b
Exceptions
-Removing "-Werror" from configure.ac can cause breakage in very rare cases
where the configure phase relies on the exit code. See http://sourceforge.net/tracker/?func=detailaid=2959749group_id=204462atid=989708;>app-emulation/open-vm-tools
bug. But even then we remove it from the resulting Makefile.
+Removing "-Werror" from configure.ac can cause breakage in very rare
+cases where the configure phase relies on the exit code. See
+https://sourceforge.net/tracker/?func=detailaid=2959749group_id=204462atid=989708;>
+app-emulation/open-vm-tools bug. But even then we remove it from
+the resulting Makefile.
diff --git a/ebuild-writing/eapi/text.xml b/ebuild-writing/eapi/text.xml
index 0a2c3aa..3f60d1a 100644
--- a/ebuild-writing/eapi/text.xml
+++ b/ebuild-writing/eapi/text.xml
@@ -228,7 +228,7 @@ doman foo.lang.1
Example:
-SRC_URI="http://dl.google.com/earth/client/GE4/release_4_3/GoogleEarthLinux.bin
+SRC_URI="https://dl.google.com/earth/client/GE4/release_4_3/GoogleEarthLinux.bin
- GoogleEarthLinux-${PV}.bin"
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 0142b2f..64ac1de 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -60,9 +60,9 @@ inherit eutils versionator rpm
MY_PV=$(replace_version_separator 3 '-')
MY_P=fetchmail-${MY_PV}
-SRC_URI="http://suse.osuosl.org/suse/i386/9.2/suse/src/${MY_P}.src.rpm;
+SRC_URI="https://suse.osuosl.org/suse/i386/9.2/suse/src/${MY_P}.src.rpm;
DESCRIPTION="SuSE 9.2 Fetchmail Source Package"
-HOMEPAGE="http://www.suse.com;
+HOMEPAGE="https://www.suse.com;
LICENSE="GPL-2 public-domain"
SLOT="0"
diff --git a/ebuild-writing/functions/src_unpack/svn-sources/text.xml
b/ebuild-writing/functions/src_unpack/svn-sources/text.xml
index e436c97..9e7f62f 100644
---
