From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- app-crypt/eid-mw/Manifest | 6 +- app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild | 110 +++++++++++++++++++++++++++++++ app-crypt/eid-mw/eid-mw-5.0.14.ebuild | 110 ------------------------------- app-crypt/eid-mw/eid-mw-9999.ebuild | 8 +-- app-crypt/eid-mw/metadata.xml | 1 + 5 files changed, 118 insertions(+), 117 deletions(-) create mode 100644 app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild delete mode 100644 app-crypt/eid-mw/eid-mw-5.0.14.ebuild (limited to 'app-crypt/eid-mw') diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index 4df333e69401..574643ec0440 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.0.14.tar.gz 8971565 BLAKE2B d1e6997c089c72f6b6b15fafefa227d7341721c1fa52e446f0334c3915b2e16d84ccb27053dc2e12c0f932bb3cb96e1cbfadc0d6b203098734f74fa0dbffc6ab SHA512 97a4e1359c853f14e91d5ec6c3b13d97b3113106da1e7125b558d724aea76f8a15b289dd06ed13391896d9318daea0133eba9269b6103fb1b922e8b55ceaf9cc -EBUILD eid-mw-5.0.14.ebuild 2657 BLAKE2B 9be1250a0a67ad60cad63225f7a29df1234d3c1d28282ba820b6cd8a6c930170a67341e0e50bb5916152f1987c9a481d513afe0899001d0c2bfd4e0218bec380 SHA512 bce58ec9cc79f3cbf21106221ee71861bd83d7ce15a58661999fcc2a8719024bbce8accc5467929c0bad1c18ac7d24e1f07bb757ff6447402d14237b64eea4d6 -EBUILD eid-mw-9999.ebuild 2423 BLAKE2B 600204c3d487c75471e9c9307748f09356dfccec3a466d538a243c170bca8299659d8cf8205cdffadb4c82e4f31cc5f5964f7e22b2014f45224008b4c54d60c1 SHA512 7fb482b981d58272037e5735fdebaec759b7c2de17280c8b829b3e4677c92ce37572449ab64b951a5d6a997e0041e2f0b387d924393db9b88c7ba95ee28bde15 -MISC metadata.xml 1406 BLAKE2B d61f6271dfd3770ac70c284761f50b84d01317641faac528f58f0644d916e29f167ed00035defd8814aec3d15242d28db89e3c72397826dc01f7ccd77cfe8a50 SHA512 362708706e778e86ef0d0962bd6d291f213b739470d97f324aa75ef6dd3930230847864296a0ed22a545c7cb9e802a025f5419d632b1ca81720c5b2365099bad +EBUILD eid-mw-5.0.14-r1.ebuild 2677 BLAKE2B af4b6e57e28030579a1d7fec6e68d13757a84e6ec548335dde23409ce8f170d5cac4029295c97e18f26d97a4ead833716907616c3b2147451a20778cc7b08cbe SHA512 476f700cb7870bd54b1b1c5b4c1c4dec6ed06a732e7df3923c32ed4cd21cc14eab37378221b1332ce297952a08cba95453f00b7cac466129b64ef4ad7db3466e +EBUILD eid-mw-9999.ebuild 2443 BLAKE2B 45881c1380ac143b3e9cc9014251f01202abb0288bc69291f86434a85edb85f99b13bab101827195013c837dddc7f203a06d6cbdbfc19a33fb0f65f29b0568f8 SHA512 31d078692beccaeba27f6b98da558e097f82d30799026fecd28bef5d02067a52df36f085b7733435c1e1d3831e79c959366952663eeeaf893fa1984b297a4294 +MISC metadata.xml 1435 BLAKE2B 15ae2a88aec2aa102b852b307a3d4b37f72f1e824c5f179044ec3a9b9a70203b86f9fe00493b5c2723db6ffc6dd8eeadd5df63eb7e3f8ea036131abd9828fda4 SHA512 317f8eb2fdc224afeb9ea6c9030308a98636aeed7f4328d291e1a87d31321f36d1ad7d93353febe539b3e9c4427296e5ce17831c759a3645733be6ac7b759694 diff --git a/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild b/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild new file mode 100644 index 000000000000..364d71112644 --- /dev/null +++ b/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild @@ -0,0 +1,110 @@ +# 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 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 + + # 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 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 + *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.0.14.ebuild b/app-crypt/eid-mw/eid-mw-5.0.14.ebuild deleted file mode 100644 index 93ca542eae12..000000000000 --- a/app-crypt/eid-mw/eid-mw-5.0.14.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# 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 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 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 f121b9049099..9d56a10ca2be 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -20,7 +20,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9 dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy - app-crypt/pinentry[gtk] + >=app-crypt/pinentry-1.1.0-r4[gtk] ) p11-kit? ( app-crypt/p11-kit )" @@ -85,11 +85,11 @@ pkg_postinst() { local peimpl=$(eselect --brief --colour=no pinentry show) case "${peimpl}" in - *gtk*) ;; + *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-gtk-2 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gtk-2" + ewarn "Please select pinentry-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" ;; esac fi diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml index 890881512814..6ee8ed9ff71e 100644 --- a/app-crypt/eid-mw/metadata.xml +++ b/app-crypt/eid-mw/metadata.xml @@ -3,6 +3,7 @@ vincent.hardy.be@gmail.com + Vincent Hardy proxy-maint@gentoo.org -- cgit v1.2.3