From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- app-crypt/eid-mw/Manifest | 7 +- app-crypt/eid-mw/eid-mw-5.0.11.ebuild | 111 +++++++++++++++++++++ app-crypt/eid-mw/eid-mw-5.0.8.ebuild | 108 -------------------- app-crypt/eid-mw/eid-mw-9999.ebuild | 5 +- .../eid-mw/files/use-printf-in-Makefile.patch | 21 ++++ 5 files changed, 140 insertions(+), 112 deletions(-) create mode 100644 app-crypt/eid-mw/eid-mw-5.0.11.ebuild delete mode 100644 app-crypt/eid-mw/eid-mw-5.0.8.ebuild create mode 100644 app-crypt/eid-mw/files/use-printf-in-Makefile.patch (limited to 'app-crypt/eid-mw') diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index b635821864a2..c10a9d6b0f2d 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1,7 +1,8 @@ AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6dc21eb74b0cfb6945572d0323d751ca8104ae981ae83759267081b6a16509cde3e8f5ad35b1a6613855461880c18 SHA512 01efa77441982a631e717a1bf720155bd38144cbe9e5b9cc192bdfa7ea3966b787e31a25a7e3c7d560fec30b19edeb662f6ab1db2d68b0a5b996af3c91342ec4 +AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff13fc2a0faab5c5327cea2f53ccc1bcc0e805166de93d2de8a52e8c344bdab64dae5671f238b49ecedebb657afca0823 SHA512 8207e9eb534fed58712b805df0e90bcf8406fe1c2907f91cd54500babcc49d0a72dc1d039d9fdb8077967058aaafb6c37336c1b0fcd041edfb3c4604c7cea4c2 DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1 -DIST eid-mw-5.0.8.tar.gz 8782476 BLAKE2B ece43bff5de108f4d92534aeda3d88c1109fbf54f99c4de0442c02958a9b0edef3e34d94015b9f3a865317d88c2bd21d1adbbf15010cd1fbd99787985190dee5 SHA512 dc9eaaec419082bc6e1f6cd11063c79c5aac0e7910027d9cbb34dbe8ede9d600c93b7b38a7e4491c5eb9a0068e537d78854b3fc3b2581d464dd4939185469e46 +DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd SHA512 2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324 EBUILD eid-mw-4.4.27.ebuild 2531 BLAKE2B 405338910850fab6119b7deb09c0b494dc294a661538173307976cc556e906d64bbd2f7a058545ef35ae22b461334d8df03cb0e21443629b2653a955cfeee97e SHA512 71e909609ed65bb8160a32030a6fb3c550a09f3a1db06015cf224c7a5ca41a76de30cdbe1fe016c3839508503ab711e0c8926a147cf8de4569b221d8138e35f3 -EBUILD eid-mw-5.0.8.ebuild 2621 BLAKE2B a14afec442a1d7ef34fdd6130f1ace9c729eb56a659fbf0c83b35fc334f588e09d9a04d6339a1b6bf542842bf0ad72532ecdf8c5f27a6ed2fcc6fdfe5435d7ed SHA512 4543c397a68122bb7b00a3cc84a3584e584df5064614c2bde18312ac80e8d160bc84e3506bfc1cff5cdb24e361473b3d05a44aec5879efabf11ec2dd55ac6190 -EBUILD eid-mw-9999.ebuild 2387 BLAKE2B 28af0cd0bd38b5448fa8523d6a599be574e88939ccf7ed20264864cbe21047859904f523e7b81e86cf3d828a021cdfa506170d7575c0da16c64a92dc4369d209 SHA512 8722191feed75b231229e50b483565f13f2472056d496716b8daf9b9db95b24f2faf02dede76c496804fa021deb5608e9fb95e2e267e2f9b41f707d9114996ac +EBUILD eid-mw-5.0.11.ebuild 2692 BLAKE2B cadc9352ab462ef2c516321e0e189304e0a328b17a3adf66ad27351bc668cd49c31ed1d33482e04d91c813d6c8412a0154cc8e56f93eb664252c9b85d3c44dec SHA512 3afcfe20b53d1160429f47dd2e598aab97161104bf19e9b2085ce772be4af131afae72c6002a45b66e8f78fbd70470bec98a35b51feb1255c91d42d5983e27ed +EBUILD eid-mw-9999.ebuild 2458 BLAKE2B e3a281af16221066f9b9249c224d500df889860130fe234480a06a31c39a04d1eb3e1141e5f79d32e510b1e82087aafe9123231f0684834537f79010946cdc20 SHA512 2a1d8cddaa069053de0be694b4686d618aad98022a6050590907b78d1fec015955c194dedda46178518508e968acce416fbce90a5b1b1536ec1c477922782d65 MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98 diff --git a/app-crypt/eid-mw/eid-mw-5.0.11.ebuild b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild new file mode 100644 index 000000000000..b0e0654fd5b0 --- /dev/null +++ b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop gnome2-utils xdg-utils + +DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" +HOMEPAGE="https://eid.belgium.be" +SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+dialogs +gtk +p11v220 p11-kit" + +RDEPEND=">=sys-apps/pcsc-lite-1.2.9 + gtk? ( + x11-libs/gdk-pixbuf[jpeg] + x11-libs/gtk+:3 + dev-libs/libxml2 + net-misc/curl[ssl] + net-libs/libproxy + app-crypt/pinentry[gtk] + ) + p11-kit? ( app-crypt/p11-kit )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +REQUIRED_USE="dialogs? ( gtk )" + +src_prepare() { + default + + # Buggy internal versioning when autoreconf a tarball release. + # Weird numbering is required otherwise we get a seg fault in + # about-eid-mw program. + echo "${PV}-v${PV}" > .version + + # 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 pkcs11_manifestdir + sed -i \ + -e "/pkcs11_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" + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable dialogs) \ + $(use_enable p11v220) \ + $(use_enable p11-kit p11kit) \ + $(use_with gtk gtkvers 'detect') \ + --with-gnu-ld \ + --disable-static +} + +src_install() { + default + rm -r "${ED}"/usr/$(get_libdir)/*.la || die + if use gtk; then + domenu plugins_tools/eid-viewer/eid-viewer.desktop + doicon plugins_tools/eid-viewer/gtk/eid-viewer.png + fi +} + +pkg_postinst() { + if use gtk; then + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update + + local peimpl=$(eselect --brief --colour=no pinentry show) + case "${peimpl}" in + *gtk*) ;; + *) ewarn "The pinentry front-end currently selected is not supported by eid-mw." + ewarn "You may be prompted for your pin code in an inaccessible shell!!" + ewarn "Please select pinentry-gtk-2 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gtk-2" + ;; + esac + fi +} + +pkg_postrm() { + if use gtk; then + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update + fi +} diff --git a/app-crypt/eid-mw/eid-mw-5.0.8.ebuild b/app-crypt/eid-mw/eid-mw-5.0.8.ebuild deleted file mode 100644 index 064bbcfb9d4a..000000000000 --- a/app-crypt/eid-mw/eid-mw-5.0.8.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop gnome2-utils xdg-utils - -DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" -HOMEPAGE="https://eid.belgium.be" -SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+dialogs +gtk +p11v220 p11-kit" - -RDEPEND=">=sys-apps/pcsc-lite-1.2.9 - gtk? ( - x11-libs/gdk-pixbuf[jpeg] - x11-libs/gtk+:3 - dev-libs/libxml2 - net-misc/curl[ssl] - net-libs/libproxy - app-crypt/pinentry[gtk] - ) - p11-kit? ( app-crypt/p11-kit )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="dialogs? ( gtk )" - -src_prepare() { - default - - # Buggy internal versioning when autoreconf a tarball release. - # Weird numbering is required otherwise we get a seg fault in - # about-eid-mw program. - echo "${PV}-v${PV}" > .version - - # 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 pkcs11_manifestdir - sed -i \ - -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \ - cardcomm/pkcs11/src/Makefile.am || die - - # See bug #732994 - sed -i \ - -e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable dialogs) \ - $(use_enable p11v220) \ - $(use_enable p11-kit p11kit) \ - $(use_with gtk gtkvers 'detect') \ - --with-gnu-ld \ - --disable-static -} - -src_install() { - default - rm -r "${ED}"/usr/$(get_libdir)/*.la || die - if use gtk; then - domenu plugins_tools/eid-viewer/eid-viewer.desktop - doicon plugins_tools/eid-viewer/gtk/eid-viewer.png - fi -} - -pkg_postinst() { - if use gtk; then - gnome2_schemas_update - xdg_desktop_database_update - xdg_icon_cache_update - - local peimpl=$(eselect --brief --colour=no pinentry show) - case "${peimpl}" in - *gtk*) ;; - *) ewarn "The pinentry front-end currently selected is not supported by eid-mw." - ewarn "You may be prompted for your pin code in an inaccessible shell!!" - ewarn "Please select pinentry-gtk-2 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gtk-2" - ;; - esac - fi -} - -pkg_postrm() { - if use gtk; then - gnome2_schemas_update - xdg_desktop_database_update - xdg_icon_cache_update - fi -} diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild index 19055f55bc53..5b1071332616 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -53,6 +53,9 @@ src_prepare() { -e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \ configure.ac || die + # See bug #751472 + eapply "${FILESDIR}/use-printf-in-Makefile.patch" + eautoreconf } diff --git a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch new file mode 100644 index 000000000000..5b4ef2adc07e --- /dev/null +++ b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch @@ -0,0 +1,21 @@ +diff -ur a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am +--- a/plugins_tools/eid-viewer/Makefile.am 2020-08-19 15:32:50.000000000 +0200 ++++ b/plugins_tools/eid-viewer/Makefile.am 2020-12-21 23:07:49.980421703 +0200 +@@ -125,13 +125,13 @@ + SUBDIRS = . gtk/po test uml + + resources/%.c: resources/%.png +- echo -e "#include \n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@ ++ printf '%s\n' '#include ' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@ + gdk-pixbuf-csource --struct --extern --name `basename $^ .png` $^ >> $@ +- echo -e "#pragma GCC diagnostic pop\n" >> $@ ++ printf '%s\n' '#pragma GCC diagnostic pop' >> $@ + resources/%.c: resources/%.jpg +- echo -e "#include \n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@ ++ printf '%s\n' '#include ' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@ + gdk-pixbuf-csource --struct --extern --name `basename $^ .jpg` $^ >> $@ +- echo -e "#pragma GCC diagnostic pop\n" >> $@ ++ printf '%s\n' '#pragma GCC diagnostic pop' >> $@ + + BUILT_SOURCES = gtk/viewer_glade.h \ + resources/coat_of_arms_nl.c \ -- cgit v1.2.3