From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7D2C1159C9B for ; Sat, 10 Aug 2024 13:58:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DCF0E29F6; Sat, 10 Aug 2024 13:58:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57893E29F1 for ; Sat, 10 Aug 2024 13:58:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 83DD4343111 for ; Sat, 10 Aug 2024 13:58:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD81D1EB4 for ; Sat, 10 Aug 2024 13:58:41 +0000 (UTC) From: "Amy Liffey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" Message-ID: <1723298260.34d02a04653bbe96bf4c2b2cc075c5a5702b7aec.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/eid-mw/eid-mw-9999.ebuild X-VCS-Directories: app-crypt/eid-mw/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Liffey X-VCS-Revision: 34d02a04653bbe96bf4c2b2cc075c5a5702b7aec X-VCS-Branch: master Date: Sat, 10 Aug 2024 13:58:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b1e1c3e7-80b6-4cf6-a1c1-9898af61cd7d X-Archives-Hash: 62eef573b1dd5c40e536cbfeec0b25ef commit: 34d02a04653bbe96bf4c2b2cc075c5a5702b7aec Author: Vincent Hardy gmail com> AuthorDate: Sat Aug 10 13:56:53 2024 +0000 Commit: Amy Liffey gentoo 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 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 }