From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- app-crypt/eid-mw/Manifest | 6 ++- app-crypt/eid-mw/eid-mw-4.4.11.ebuild | 93 +++++++++++++++++++++++++++++++++++ app-crypt/eid-mw/eid-mw-9999.ebuild | 48 ++++++------------ app-crypt/eid-mw/metadata.xml | 6 +-- 4 files changed, 114 insertions(+), 39 deletions(-) create mode 100644 app-crypt/eid-mw/eid-mw-4.4.11.ebuild (limited to 'app-crypt/eid-mw') diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index ed4eb457075c..a8c8491cff81 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1,4 +1,6 @@ DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc +DIST eid-mw-4.4.11.tar.gz 7975630 BLAKE2B e7b052736cba98c53e97e9de15ea8e54f508c28471a7a936c5d28539648f5d3454983d9c9a21cf5959a070849865de5ca58d5d29ad64eb08209afd40959c56ae SHA512 35273492abc0efa7146848c82770bcd5e4ce1b7c9971ce45686b4d3244332456011db6df05154ad6a204854fd13ac3dce8f7b8cd6112a2e60a7b8434f3c4a196 EBUILD eid-mw-4.4.1.ebuild 2109 BLAKE2B 2f9f1eec44db4c236d8a94a0e1e23a11b0c8bb204d8dff6de0a62314a687bbb5216a4cf4fbfd5418d1ef2e991bec479a517b6c1efd4e3ba31fb55d570a5130bb SHA512 2c6f5760f4a4501b3c4a5f591d9962b74147d30f14c645a54fce70558b1bec4cd93c89317525a843e32f594c118e3d1201701a02bb49c21428072c06c5560026 -EBUILD eid-mw-9999.ebuild 2500 BLAKE2B 47067bc95c8983684ae00c5f1b98c174e52526ca895dca8141b6578957a45a457abc9d55b2fb23ec4d8ac0180f79933474af28084ea6220e9f427a59943918ba SHA512 9d5d96e062832820be1a6290507a1e91041a32c219df205f60168f57e54d92367f24a3f1bb8dc438850f0fab3a912f6a38b823def485af02abf668691f6899f2 -MISC metadata.xml 1464 BLAKE2B 6f179b170658fc6b084e4ef8c6a89443b1dc39307b9d52083214d75fdb386ec3c3c9f0a6522e6a52eb6c33c792216db27115f017eff6ad922254d1ffcb671c0b SHA512 ed78298a9b246f9f8f9591dbb9fe54ab311d525db86166bcf66574c9e365f1476234d5bac3180226dfbdb5c4014dd5dae4598b670cd7c6c9538282940a0fa9eb +EBUILD eid-mw-4.4.11.ebuild 2151 BLAKE2B 3350790665454d681dc7513c33a8f3d1a74caebd5bd2f1683b02a32b4bbee85c64c5457ff50a4f14819ec421832fd0a372df7c60f313bc20a6d67229246e6b9e SHA512 b7c555ef7eb1ef96bc4a8df040648548698408fcf81f72c3fa5d37641287080101593d49f628de9ae9f8ddb42ebd45f55c40ec8c73aecf3b7ba8f954027d5cc2 +EBUILD eid-mw-9999.ebuild 1832 BLAKE2B c6c9b0de69514b1d036e8e3566e8ecbcfdd6426bcc55bdbcfce15de389dca83d65a0cf50d3e9eb5b35fca7114e02e13cf3bfd3139e46298874ea5b872248b007 SHA512 1c4383bb1764fe4f8dbeabad9be447d682e2ee08e8174a7d7aa4a978c1243048cfcae54dc0d7b45e6acaa415b52cde1199aee6f94f5b9ef1f790f632dfbc28ee +MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98 diff --git a/app-crypt/eid-mw/eid-mw-4.4.11.ebuild b/app-crypt/eid-mw/eid-mw-4.4.11.ebuild new file mode 100644 index 000000000000..e496d37797e7 --- /dev/null +++ b/app-crypt/eid-mw/eid-mw-4.4.11.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools 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 ~x86" +IUSE="+dialogs +gtk +p11v220 p11-kit" + +RDEPEND=">=sys-apps/pcsc-lite-1.2.9 + gtk? ( + x11-libs/gdk-pixbuf[jpeg] + x11-libs/gtk+:* + dev-libs/libxml2 + net-misc/curl[ssl] + net-libs/libproxy + !app-misc/eid-viewer-bin + ) + p11-kit? ( app-crypt/p11-kit )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +REQUIRED_USE="dialogs? ( gtk )" + +src_prepare() { + default + + sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die + sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die + + # 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 + sed -i \ + -e '/^GITDESC/ d' \ + -e '/^VERCLEAN/ d' \ + scripts/build-aux/genver.sh + + # legacy 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 + + 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 + gnome2_icon_cache_update + fi +} + +pkg_postrm(){ + if use gtk; then + gnome2_schemas_update + gnome2_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 9c2c887e6186..4f93816f0b92 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -1,25 +1,17 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools mozextension gnome2-utils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/Fedict/${PN}.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" - KEYWORDS="~x86 ~amd64 ~arm" -fi +inherit autotools gnome2-utils git-r3 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" HOMEPAGE="https://eid.belgium.be" +EGIT_REPO_URI="https://github.com/Fedict/${PN}.git" LICENSE="LGPL-3" SLOT="0" -IUSE="+dialogs +gtk p11-kit +xpi" +IUSE="+dialogs +gtk +p11v220 p11-kit" RDEPEND=">=sys-apps/pcsc-lite-1.2.9 gtk? ( @@ -30,9 +22,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9 net-libs/libproxy !app-misc/eid-viewer-bin ) - p11-kit? ( app-crypt/p11-kit ) - xpi? ( || ( >=www-client/firefox-bin-3.6.24 - >=www-client/firefox-3.6.20 ) )" + p11-kit? ( app-crypt/p11-kit )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -45,6 +35,10 @@ src_prepare() { sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die + # legacy 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\")):" \ @@ -58,33 +52,19 @@ src_prepare() { src_configure() { econf \ $(use_enable dialogs) \ + $(use_enable p11v220) \ $(use_enable p11-kit p11kit) \ $(use_with gtk gtkvers 'detect') \ --with-gnu-ld \ - --disable-static \ - --disable-signed + --disable-static } src_install() { default - - if use xpi; then - declare MOZILLA_FIVE_HOME - if has_version '>=www-client/firefox-3.6.20'; then - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" - xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" - fi - if has_version '>=www-client/firefox-bin-3.6.24'; then - MOZILLA_FIVE_HOME="/opt/firefox" - xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" - fi - else - rm -r "${ED}"/usr/lib/mozilla || die - fi - rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die - + rm -r "${ED}"/usr/$(get_libdir)/*.la || die if use gtk; then - rm -r "${ED}/usr/include/eid-util" || die + domenu plugins_tools/eid-viewer/eid-viewer.desktop + doicon plugins_tools/eid-viewer/gtk/eid-viewer.png fi } diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml index 5a0c5666c030..99549db6384a 100644 --- a/app-crypt/eid-mw/metadata.xml +++ b/app-crypt/eid-mw/metadata.xml @@ -24,12 +24,12 @@ These three functions form the basis of the countless applications for your eID. Enable "askaccess" dialog box, by using x11-libs/gtk+ - - - Build and install an extension for Mozilla browsers. Support for app-crypt/p11-kit. + + Enable PKCS#11 v2.20 features. + -- cgit v1.2.3