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 083E1158043 for ; Sun, 14 Apr 2024 15:03:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52102E29B4; Sun, 14 Apr 2024 15:03:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 3B8F8E29B4 for ; Sun, 14 Apr 2024 15:03:33 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 766B2343381 for ; Sun, 14 Apr 2024 15:03:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 112881620 for ; Sun, 14 Apr 2024 15:03:31 +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: <1713107006.6a27d1da245a5a77992608a021ae38c6ea131686.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: 6a27d1da245a5a77992608a021ae38c6ea131686 X-VCS-Branch: master Date: Sun, 14 Apr 2024 15:03:31 +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: 00778238-0ccc-45e0-ad64-4d37fd0c2327 X-Archives-Hash: 5f50e66b1fd0344ec6b81a647569eb69 commit: 6a27d1da245a5a77992608a021ae38c6ea131686 Author: Vincent Hardy gmail com> AuthorDate: Sun Apr 14 15:02:11 2024 +0000 Commit: Amy Liffey gentoo org> CommitDate: Sun Apr 14 15:03:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a27d1da app-crypt/eid-mw: new version 9999 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 f514363c71c1..67d72f68ad1e 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -13,19 +13,19 @@ LICENSE="LGPL-3" SLOT="0" IUSE="+dialogs +gtk p11-kit" -RDEPEND=">=sys-apps/pcsc-lite-1.2.9 +RDEPEND="sys-apps/pcsc-lite gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy - >=app-crypt/pinentry-1.1.0-r4[gtk] + app-crypt/pinentry[gtk] ) p11-kit? ( app-crypt/p11-kit )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" REQUIRED_USE="dialogs? ( gtk )" @@ -43,20 +43,6 @@ src_prepare() { -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 #732994 - sed -i \ - -e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \ - configure.ac || die - - # See bug #751472 - eapply "${FILESDIR}/use-printf-in-Makefile.patch" - # See bug #811270 (remove uml build) sed -i \ -e 's:cardlayer/uml::' \ @@ -65,11 +51,6 @@ src_prepare() { -e 's:uml::' \ plugins_tools/eid-viewer/Makefile.am || die - # See bug #923375 - sed -i \ - -e 's:C_Sign(NULL,:C_Sign(NULL_PTR,:' \ - tests/unit/sign_state.c || die - eautoreconf } @@ -77,9 +58,8 @@ src_configure() { econf \ $(use_enable dialogs) \ $(use_enable p11-kit p11kit) \ - $(use_with gtk gtkvers 'detect') \ - --with-gnu-ld \ - --disable-static + $(use_with gtk gtkvers '3') \ + --with-gnu-ld } src_install() {