From 7fa8a1e3f149eea4c844c47cfe26136ed7614c58 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 15 Apr 2024 12:04:03 +0100 Subject: gentoo auto-resync : 15:04:2024 - 12:04:02 --- app-crypt/eid-mw/Manifest | 2 +- app-crypt/eid-mw/eid-mw-9999.ebuild | 32 ++++++-------------------------- 2 files changed, 7 insertions(+), 27 deletions(-) (limited to 'app-crypt/eid-mw') diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index bf9305d7a1e8..f3aaa4a95ce6 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1,5 +1,5 @@ AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff13fc2a0faab5c5327cea2f53ccc1bcc0e805166de93d2de8a52e8c344bdab64dae5671f238b49ecedebb657afca0823 SHA512 8207e9eb534fed58712b805df0e90bcf8406fe1c2907f91cd54500babcc49d0a72dc1d039d9fdb8077967058aaafb6c37336c1b0fcd041edfb3c4604c7cea4c2 DIST eid-mw-5.1.15.tar.gz 16296281 BLAKE2B 12efbc884ff250d5497ace6b9670e4dac934a8aa87e2e77d4c083d3e0325c7b0a57dd137506f62a6e3ada57459b5b23e7d5e0d86a80616a64e05948560ce265b SHA512 4cf352ba912db6252f864430bacc895d29b478d3ec13ef3716089e5cb6019b2db2de08a99775dcd71a4ac9f13f3e3c6e1013f36bb2d458bbb0e851f7b45451e5 EBUILD eid-mw-5.1.15.ebuild 3148 BLAKE2B 8bf0586a6a4b89c1a680173ff1b97f3b99bbf79b919c1eb43e471d8141cc7dd45a0472eb8e42d103c4c5dc1052a56884da31f4c10d6530ec12ea89fb9e093b1e SHA512 abb40d2ac51128cc0c6ae3e5b77c930ffb9dfeeb91ee0b5c88b4d2c435b9c9d42769d105b0dbab10a4cac02a7ec2e47cd825d246c7b47153b6ec403e1414e801 -EBUILD eid-mw-9999.ebuild 2788 BLAKE2B 3c185f797520e6a6a2f324ba8c69f09383ea7e77bf3862fa7e73cc5f96d15082ff67c6e875723fd97bc8994989731f24171b2fe162d196787cb8d0e0efa01463 SHA512 a0eba21637cffca04644ac3d6c9b5a9efa3ea7e109f7b6c0290c403a20dadda01764c53c063c78fedee5d2a4536cc18016c7b6c482f29cb943a96bf1bc32ca03 +EBUILD eid-mw-9999.ebuild 2284 BLAKE2B 598d04e5607e8fb050ba00d24589f64debb101caf90e13c4aac18ff5028d9ada07ababb09c50c5ee544cca30033e9c83ff5a644ebf4e9b74954ac627d329b777 SHA512 a6899bfdadefcb560e920dd3b5962fa5e06f4735ec5b0b47f870b7db018f7905efca90e9392cc7c5952874496a0e395073401f1cacd2cd9253676e9e41dca5ab MISC metadata.xml 1447 BLAKE2B bf97d239f8d44f8a3bd31e35868335a6286a8ded9d6904a919a5a69eb89a61173aca5eb988455df2ca201e0d687e932a84ff8ed7012a3f9ca3e1eda0627ae9ec SHA512 6c27500bb1dd72027a540745e3916c41af548c1cd277fad02f975dd6431a22a9083bc0a7cdd00d316e2c7a536be0ac484f9b47bebb53121b7647da8699321838 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() { -- cgit v1.2.3