public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Amy Liffey" <amynka@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/
Date: Sat, 10 Aug 2024 13:58:41 +0000 (UTC)	[thread overview]
Message-ID: <1723298260.34d02a04653bbe96bf4c2b2cc075c5a5702b7aec.amynka@gentoo> (raw)

commit:     34d02a04653bbe96bf4c2b2cc075c5a5702b7aec
Author:     Vincent Hardy <vincent.hardy.be <AT> gmail <DOT> com>
AuthorDate: Sat Aug 10 13:56:53 2024 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 13:57:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d02a04

app-crypt/eid-mw: replace sed with patches

Closes: https://bugs.gentoo.org/928106
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 app-crypt/eid-mw/eid-mw-9999.ebuild | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 3c461d2daa95..6b11be857dc4 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -29,34 +29,14 @@ BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="dialogs? ( gtk )"
 
+PATCHES=(
+	"${FILESDIR}/0001-Do-not-build-xpi-module.patch"
+	"${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch"
+	"${FILESDIR}/0001-Remove-uml-build.patch"
+	)
+
 src_prepare() {
 	default
-
-	# xpi module : we don't want it anymore
-	sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
-	sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
-
-	# hardcoded lsb_info
-	sed -i \
-		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
-		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
-		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
-		plugins_tools/aboutmw/gtk/about-main.c || die
-
-	# Fix libdir for manifestdir
-	sed -i \
-		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
-		-e "/managed_storage_manifestdir/ s:prefix)/lib:libdir):" \
-		cardcomm/pkcs11/src/Makefile.am || die
-
-	# See bug #811270 (remove uml build)
-	sed -i \
-		-e 's:cardlayer/uml::' \
-		cardcomm/pkcs11/src/Makefile.am || die
-	sed -i \
-		-e 's:uml::' \
-		plugins_tools/eid-viewer/Makefile.am || die
-
 	eautoreconf
 }
 


             reply	other threads:[~2024-08-10 13:58 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-10 13:58 Amy Liffey [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-10 13:58 [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/ Amy Liffey
2024-05-18 16:46 Amy Liffey
2024-04-14 15:03 Amy Liffey
2024-02-12 11:48 Amy Liffey
2024-02-12 11:48 Amy Liffey
2024-01-02 19:56 Amy Liffey
2024-01-02 19:56 Amy Liffey
2023-09-21 17:01 Amy Liffey
2023-09-21 11:58 Amy Liffey
2023-06-30 15:52 Amy Liffey
2023-06-30 15:52 Amy Liffey
2023-03-15 12:18 Arthur Zamarin
2023-03-14 18:11 Amy Liffey
2023-03-14 18:11 Amy Liffey
2022-08-01  9:17 Amy Liffey
2022-08-01  9:17 Amy Liffey
2022-05-28  9:37 Amy Liffey
2021-09-09 20:30 Amy Liffey
2021-09-09 20:30 Amy Liffey
2021-06-25 21:05 Amy Liffey
2021-04-02  9:20 Amy Liffey
2021-04-01 19:16 Amy Liffey
2021-04-01 19:16 Amy Liffey
2021-04-01 19:16 Amy Liffey
2021-03-10 19:05 Amy Liffey
2021-01-03 20:56 Amy Liffey
2020-11-12 15:43 Amy Liffey
2020-11-12 15:43 Amy Liffey
2020-08-10  7:33 Amy Liffey
2020-08-04 18:39 Amy Liffey
2020-08-04 18:39 Amy Liffey
2020-08-04 18:39 Amy Liffey
2019-10-10  8:16 Amy Liffey
2019-08-15 19:20 Amy Liffey
2018-11-23 20:38 Amy Liffey
2018-10-12 16:06 Thomas Deutschmann
2018-05-16 21:07 Amy Liffey
2018-05-16 21:07 Amy Liffey
2018-01-19 13:50 Amy Liffey
2018-01-12 16:53 Amy Liffey
2018-01-12 16:53 Amy Liffey
2018-01-12 16:53 Amy Liffey
2017-02-12 16:18 Amy Liffey
2016-09-11 10:17 Amy Winston
2016-07-01 17:15 Amy Winston
2016-04-18  8:13 Patrice Clement
2015-11-11 17:10 Ian Delaney

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=1723298260.34d02a04653bbe96bf4c2b2cc075c5a5702b7aec.amynka@gentoo \
    --to=amynka@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