public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg-pkcs11-scd/
Date: Mon, 28 Oct 2024 13:36:58 +0000 (UTC)	[thread overview]
Message-ID: <1730122592.c971d56225dd39f10bd3d16fa86adfcc38dd8aaf.sam@gentoo> (raw)

commit:     c971d56225dd39f10bd3d16fa86adfcc38dd8aaf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 13:35:03 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 13:36:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c971d562

app-crypt/gnupg-pkcs11-scd: sync 0.10.0 with live template, fixups

* Sync 0.10.0 with the new live template
* Move eautoreconf to src_prepare and only call it conditionally

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gnupg-pkcs11-scd-0.10.0.ebuild                 | 22 ++++++++++++++++++----
 .../gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild  | 15 +++++++++++----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
index 9eace6ea0546..3a54b3d1ca4a 100644
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
@@ -5,11 +5,17 @@ EAPI=8
 
 DESCRIPTION="PKCS#11 support for GnuPG"
 HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
-SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/alonbl/gnupg-pkcs11-scd.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="proxy"
 
 DEPEND="
@@ -17,16 +23,24 @@ DEPEND="
 	<dev-libs/libassuan-3:=
 	dev-libs/libgcrypt:=
 	dev-libs/libgpg-error:=
-	dev-libs/pkcs11-helper:="
+	dev-libs/pkcs11-helper:=
+"
 RDEPEND="
 	${DEPEND}
 	proxy? (
 		acct-group/gnupg-pkcs11
 		acct-group/gnupg-pkcs11-scd-proxy
 		acct-user/gnupg-pkcs11-scd-proxy
-	)"
+	)
+"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable proxy)

diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild
index 338e9e3bd924..57940c3a99e9 100644
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild
@@ -9,11 +9,11 @@ HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/alonbl/gnupg-pkcs11-scd.git"
 	inherit autotools git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
+
 LICENSE="BSD"
 SLOT="0"
 IUSE="proxy"
@@ -23,18 +23,25 @@ DEPEND="
 	dev-libs/libassuan:=
 	dev-libs/libgcrypt:=
 	dev-libs/libgpg-error:=
-	dev-libs/pkcs11-helper:="
+	dev-libs/pkcs11-helper:=
+"
 RDEPEND="
 	${DEPEND}
 	proxy? (
 		acct-group/gnupg-pkcs11
 		acct-group/gnupg-pkcs11-scd-proxy
 		acct-user/gnupg-pkcs11-scd-proxy
-	)"
+	)
+"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
 src_configure() {
-	eautoreconf
 	local myeconfargs=(
 		$(use_enable proxy)
 		--with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd


             reply	other threads:[~2024-10-28 13:37 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-28 13:36 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-23 12:15 [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg-pkcs11-scd/ Petr Vaněk
2024-10-28 18:52 Sam James
2024-10-28 13:36 Sam James
2024-08-31 15:44 Petr Vaněk
2024-07-04  9:57 David Seifert
2023-11-19 11:21 Ulrich Müller
2021-07-15 19:02 Conrad Kostecki
2021-05-02 17:22 Mikle Kolyada
2021-04-11 19:24 Conrad Kostecki
2019-04-29  5:31 Alon Bar-Lev
2019-01-05 20:19 Alon Bar-Lev
2019-01-05 19:13 Alon Bar-Lev
2017-10-04  6:21 Alon Bar-Lev
2017-10-04  6:21 Alon Bar-Lev
2017-07-15  7:51 Alon Bar-Lev
2017-04-18 19:31 Alon Bar-Lev
2017-03-01 21:14 Alon Bar-Lev
2017-01-18 20:27 Alon Bar-Lev
2016-06-03  9:05 Anthony G. Basile

Reply instructions:

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

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

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

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

  git send-email \
    --in-reply-to=1730122592.c971d56225dd39f10bd3d16fa86adfcc38dd8aaf.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox