commit:     894dd5d174305bbc15088f96d73e43cc9a678954
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Wed Nov  6 13:54:47 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 14:27:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894dd5d1

dev-libs/libsecp256k1: EAPI=8 and tidy up variables

The canonical position for the `S` variable is after `SRC_URI`, and I have been
told to move it there in the past, so the changes in this commit are in keeping
consistent. (Editorial: It makes more sense to me to put it at the end of the
variables since it comes into most relevance in src_unpack(), but that's not the
status quo.)

Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild    | 5 ++---
 dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild | 5 ++---
 dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild              | 3 +--
 dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild              | 3 +--
 dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild              | 3 +--
 dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild              | 3 +--
 dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild              | 3 +--
 dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild              | 2 --
 8 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild 
b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
index 56ad3d926ecf..107ef8f831fa 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -10,6 +10,7 @@ DESCRIPTION="Optimized C library for EC operations on curve 
secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1";
 COMMITHASH="b19c000063be11018b4d1a6b0a85871ab9d0bdcf"
 SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz 
-> ${PN}-v${PV}.tgz"
+S="${WORKDIR}/${MyPN}-${COMMITHASH}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -35,8 +36,6 @@ BDEPEND="
        virtual/pkgconfig
 "
 
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild 
b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
index 6db6d3460677..efdd1974f047 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -10,6 +10,7 @@ DESCRIPTION="Optimized C library for EC operations on curve 
secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1";
 COMMITHASH="3967d96bf184519eb98b766af665b4d4b072563e"
 SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz 
-> ${PN}-v${PV}.tgz"
+S="${WORKDIR}/${MyPN}-${COMMITHASH}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -32,8 +33,6 @@ DEPEND="${RDEPEND}
        valgrind? ( dev-debug/valgrind )
 "
 
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild 
b/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
index 79a0e0645c56..f14a0cdf3970 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
@@ -9,6 +9,7 @@ MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1";
 SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from 
configure.ac
@@ -30,8 +31,6 @@ PATCHES=(
        "${FILESDIR}/0.3.0-fix-cross-compile.patch"
 )
 
-S="${WORKDIR}/${MyPN}-${PV}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild 
b/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
index 79a0e0645c56..f14a0cdf3970 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
@@ -9,6 +9,7 @@ MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1";
 SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from 
configure.ac
@@ -30,8 +31,6 @@ PATCHES=(
        "${FILESDIR}/0.3.0-fix-cross-compile.patch"
 )
 
-S="${WORKDIR}/${MyPN}-${PV}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild 
b/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
index 2dec25ffea39..02ed025f0683 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
@@ -9,6 +9,7 @@ MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1";
 SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from 
configure.ac
@@ -30,8 +31,6 @@ PATCHES=(
        "${FILESDIR}/0.3.0-fix-cross-compile.patch"
 )
 
-S="${WORKDIR}/${MyPN}-${PV}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild 
b/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
index 844d982a0447..f60e51f02605 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
@@ -9,6 +9,7 @@ MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1";
 SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from 
configure.ac
@@ -30,8 +31,6 @@ PATCHES=(
        "${FILESDIR}/0.4.0-fix-cross-compile.patch"
 )
 
-S="${WORKDIR}/${MyPN}-${PV}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild 
b/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
index 192acd0850fc..a61fe7d80bae 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
@@ -9,6 +9,7 @@ MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1";
 SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from 
configure.ac
@@ -30,8 +31,6 @@ PATCHES=(
        "${FILESDIR}/0.4.0-fix-cross-compile.patch"
 )
 
-S="${WORKDIR}/${MyPN}-${PV}"
-
 src_prepare() {
        default
        eautoreconf

diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild 
b/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
index 8fe239598e0a..55280246676e 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
@@ -6,11 +6,9 @@ EAPI=8
 inherit autotools
 
 MyPN=secp256k1
-
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1";
 SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
 S="${WORKDIR}/${MyPN}-${PV}"
 
 LICENSE="MIT"

Reply via email to