From 9d4810f84de876ec9d0ae03d0d44224500b41188 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 May 2024 00:01:59 +0100 Subject: gentoo auto-resync : 19:05:2024 - 00:01:59 --- app-crypt/Manifest.gz | Bin 24956 -> 24960 bytes app-crypt/eid-mw/Manifest | 7 +- app-crypt/eid-mw/eid-mw-5.1.15.ebuild | 129 --------------------- app-crypt/eid-mw/eid-mw-5.1.18.ebuild | 110 ++++++++++++++++++ app-crypt/eid-mw/eid-mw-9999.ebuild | 6 + .../eid-mw/files/use-printf-in-Makefile.patch | 21 ---- 6 files changed, 119 insertions(+), 154 deletions(-) delete mode 100644 app-crypt/eid-mw/eid-mw-5.1.15.ebuild create mode 100644 app-crypt/eid-mw/eid-mw-5.1.18.ebuild delete mode 100644 app-crypt/eid-mw/files/use-printf-in-Makefile.patch (limited to 'app-crypt') diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index b8a85143e9af..4fecd7e3c1fe 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index f3aaa4a95ce6..4f4f016b17cf 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1,5 +1,4 @@ -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 2284 BLAKE2B 598d04e5607e8fb050ba00d24589f64debb101caf90e13c4aac18ff5028d9ada07ababb09c50c5ee544cca30033e9c83ff5a644ebf4e9b74954ac627d329b777 SHA512 a6899bfdadefcb560e920dd3b5962fa5e06f4735ec5b0b47f870b7db018f7905efca90e9392cc7c5952874496a0e395073401f1cacd2cd9253676e9e41dca5ab +DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76 SHA512 1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7 +EBUILD eid-mw-5.1.18.ebuild 2722 BLAKE2B 97c9396d17975db0c9bd60316631be378d9076388a5f1138c7c46980bd4084b58c74a5b37ef5f1c9b263fd3a8185483794b2a7769d59cb84f3e12bdd533ce8fb SHA512 857bb597cc53c60fdd6983b3649dbd663f83d2e7c7f7393b5473c47284c9e124906c1a02b3eebecf5c61b808f085cc1ae01698cbf2f33ad3af3c802a886e4510 +EBUILD eid-mw-9999.ebuild 2481 BLAKE2B ee16cfa263d10a0d1c5775279e6678c3c6f24503d83ff1a2721cbf11468104de9f02b861e3519490cfe24e5ea166c76c326679c5b123930c1354aa1b5b6db383 SHA512 e8dd7c1b5ddeecb6248d439c284d62ee3887c2b75e0dc7c6477d12be292c16b5cf365d7b305c0ec483e2d8d5638618ed6a016424d30336572314af8a6b336f60 MISC metadata.xml 1447 BLAKE2B bf97d239f8d44f8a3bd31e35868335a6286a8ded9d6904a919a5a69eb89a61173aca5eb988455df2ca201e0d687e932a84ff8ed7012a3f9ca3e1eda0627ae9ec SHA512 6c27500bb1dd72027a540745e3916c41af548c1cd277fad02f975dd6431a22a9083bc0a7cdd00d316e2c7a536be0ac484f9b47bebb53121b7647da8699321838 diff --git a/app-crypt/eid-mw/eid-mw-5.1.15.ebuild b/app-crypt/eid-mw/eid-mw-5.1.15.ebuild deleted file mode 100644 index 1c782e3b1ce9..000000000000 --- a/app-crypt/eid-mw/eid-mw-5.1.15.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools desktop gnome2-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 ~arm64 ~x86" -IUSE="+dialogs +gtk 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-1.1.0-r4[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 - - # See bug #862306 - sed -i \ - -e 's:PACKAGE_VERSION:MAINVERSION:' \ - cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die - - # 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 #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::' \ - cardcomm/pkcs11/src/Makefile.am || die - sed -i \ - -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 -} - -src_configure() { - econf \ - $(use_enable dialogs) \ - $(use_enable p11-kit p11kit) \ - $(use_with gtk gtkvers 'detect') \ - --with-gnu-ld \ - --disable-static -} - -src_install() { - default - find "${ED}" -type f -name '*.la' -delete || 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 - *gnome*|*qt*) ;; - *) 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-gnome3 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gnome3" - ;; - 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.1.18.ebuild b/app-crypt/eid-mw/eid-mw-5.1.18.ebuild new file mode 100644 index 000000000000..bd390d5174b7 --- /dev/null +++ b/app-crypt/eid-mw/eid-mw-5.1.18.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop gnome2-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 ~arm64 ~x86" +IUSE="+dialogs +gtk p11-kit" + +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[gtk] + ) + p11-kit? ( app-crypt/p11-kit )" + +DEPEND="${RDEPEND}" +BDEPEND="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 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 +} + +src_configure() { + econf \ + $(use_enable dialogs) \ + $(use_enable p11-kit p11kit) \ + $(use_with gtk gtkvers '3') \ + --with-gnu-ld +} + +src_install() { + default + find "${ED}" -type f -name '*.la' -delete || 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 + *gnome*|*qt*) ;; + *) 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-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" + ;; + 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 67d72f68ad1e..3c461d2daa95 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -43,6 +43,12 @@ 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 #811270 (remove uml build) sed -i \ -e 's:cardlayer/uml::' \ diff --git a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch deleted file mode 100644 index 5b4ef2adc07e..000000000000 --- a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -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