[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2024-08-10 Thread Amy Liffey
commit: 34d02a04653bbe96bf4c2b2cc075c5a5702b7aec
Author: Vincent Hardy  gmail  com>
AuthorDate: Sat Aug 10 13:56:53 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Aug 10 13:57:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d02a04

app-crypt/eid-mw: replace sed with patches

Closes: https://bugs.gentoo.org/928106
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/eid-mw-.ebuild | 32 ++--
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 3c461d2daa95..6b11be857dc4 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -29,34 +29,14 @@ BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="dialogs? ( gtk )"
 
+PATCHES=(
+   "${FILESDIR}/0001-Do-not-build-xpi-module.patch"
+   "${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch"
+   "${FILESDIR}/0001-Remove-uml-build.patch"
+   )
+
 src_prepare() {
default
-
-   # 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
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2024-08-10 Thread Amy Liffey
commit: 3d486b0a8806f02fa434727e2ea12ab6abc87b82
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat Aug 10 13:58:10 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Aug 10 13:58:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d486b0a

app-crypt/eid-mw: drop 5.1.18

Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 -
 app-crypt/eid-mw/eid-mw-5.1.18.ebuild | 110 --
 2 files changed, 111 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index f2415a4abd3b..996fa9e7d6a9 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 
417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76
 SHA512 
1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7
 DIST eid-mw-5.1.19.tar.gz 16299622 BLAKE2B 
a66c861c1120851ecbfd66de4b61db2c2f0951735982365ad516f2cf31249e7241180829e2992738821ecbd09c0fd83a0cba11cf34b23cdc45bfd9899072777a
 SHA512 
9383fa4661a6e46510c3c0f1509aa9c9ee772b7222faacdad3de9433529591c9e7b102d954363f345e47104f4f0473e241c0be57d1049936842e67dac45adc2f

diff --git a/app-crypt/eid-mw/eid-mw-5.1.18.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.18.ebuild
deleted file mode 100644
index bd390d5174b7..
--- a/app-crypt/eid-mw/eid-mw-5.1.18.ebuild
+++ /dev/null
@@ -1,110 +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
-   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
-   

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2024-08-10 Thread Amy Liffey
commit: 8ebd1d9a0846f5e8110a22bb88f428ae343c19c3
Author: Vincent Hardy  gmail  com>
AuthorDate: Sat Aug 10 13:51:24 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Aug 10 13:52:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebd1d9a

app-crypt/eid-mw: add 5.1.19

Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest  |  1 +
 app-crypt/eid-mw/eid-mw-5.1.19.ebuild  | 91 ++
 .../files/0001-Do-not-build-xpi-module.patch   | 38 +
 .../files/0001-Fix-libdir-for-manifestdir.patch| 30 +++
 app-crypt/eid-mw/files/0001-Remove-uml-build.patch | 48 
 5 files changed, 208 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 623c7a009f28..f2415a4abd3b 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 
417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76
 SHA512 
1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7
+DIST eid-mw-5.1.19.tar.gz 16299622 BLAKE2B 
a66c861c1120851ecbfd66de4b61db2c2f0951735982365ad516f2cf31249e7241180829e2992738821ecbd09c0fd83a0cba11cf34b23cdc45bfd9899072777a
 SHA512 
9383fa4661a6e46510c3c0f1509aa9c9ee772b7222faacdad3de9433529591c9e7b102d954363f345e47104f4f0473e241c0be57d1049936842e67dac45adc2f

diff --git a/app-crypt/eid-mw/eid-mw-5.1.19.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
new file mode 100644
index ..905a49b49f47
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
@@ -0,0 +1,91 @@
+# 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 )"
+
+PATCHES=(
+   "${FILESDIR}/0001-Do-not-build-xpi-module.patch"
+   "${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch"
+   "${FILESDIR}/0001-Remove-uml-build.patch"
+   )
+
+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
+
+   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/files/0001-Do-not-build-xpi-module.patch 
b/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch
new file mode 100644
index ..6bea1b0056a6
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch
@@ -0,0 +1,38 @@
+From 2e5b6e80acc9ffc42afe329facdcb443dca21a34 Mon Sep 17 00:00:00 2001
+From: Vincent Hardy 
+Date: Thu, 8 Aug 2024 10:30:27 +0200
+Subject: [PATCH] Do not build xpi module
+
+xpi module has to be installed by the users
+---
+ Makefile.am  |

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/

2024-05-18 Thread Amy Liffey
commit: d7b2484619fb6e0388a144086bd7ba5ca615f288
Author: Vincent Hardy  gmail  com>
AuthorDate: Sat May 18 16:42:31 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat May 18 16:45:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b24846

app-crypt/eid-mw: drop 5.1.15

Closes: https://bugs.gentoo.org/928091
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest  |   1 -
 app-crypt/eid-mw/eid-mw-5.1.15.ebuild  | 129 -
 .../eid-mw/files/use-printf-in-Makefile.patch  |  21 
 3 files changed, 151 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c48adf78962f..623c7a009f28 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-5.1.15.tar.gz 16296281 BLAKE2B 
12efbc884ff250d5497ace6b9670e4dac934a8aa87e2e77d4c083d3e0325c7b0a57dd137506f62a6e3ada57459b5b23e7d5e0d86a80616a64e05948560ce265b
 SHA512 
4cf352ba912db6252f864430bacc895d29b478d3ec13ef3716089e5cb6019b2db2de08a99775dcd71a4ac9f13f3e3c6e1013f36bb2d458bbb0e851f7b45451e5
 DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 
417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76
 SHA512 
1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7

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..
--- 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_datab

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2024-05-18 Thread Amy Liffey
commit: c8ed3afe60bae354036f5ae8d4e6717cf74b6429
Author: Vincent Hardy  gmail  com>
AuthorDate: Sat May 18 16:40:25 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat May 18 16:45:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8ed3afe

app-crypt/eid-mw: update 5.1.18

Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest|  1 +
 .../eid-mw/{eid-mw-.ebuild => eid-mw-5.1.18.ebuild}  | 16 ++--
 app-crypt/eid-mw/eid-mw-.ebuild  |  6 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 637aeca4c155..c48adf78962f 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-5.1.15.tar.gz 16296281 BLAKE2B 
12efbc884ff250d5497ace6b9670e4dac934a8aa87e2e77d4c083d3e0325c7b0a57dd137506f62a6e3ada57459b5b23e7d5e0d86a80616a64e05948560ce265b
 SHA512 
4cf352ba912db6252f864430bacc895d29b478d3ec13ef3716089e5cb6019b2db2de08a99775dcd71a4ac9f13f3e3c6e1013f36bb2d458bbb0e851f7b45451e5
+DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 
417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76
 SHA512 
1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.18.ebuild
similarity index 80%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-5.1.18.ebuild
index 67d72f68ad1e..bd390d5174b7 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.18.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
-inherit autotools desktop gnome2-utils git-r3
+inherit autotools desktop gnome2-utils
 
 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";
+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
@@ -32,6 +33,11 @@ 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
@@ -43,6 +49,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/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 67d72f68ad1e..3c461d2daa95 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.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::' \



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2024-04-14 Thread Amy Liffey
commit: 6a27d1da245a5a77992608a021ae38c6ea131686
Author: Vincent Hardy  gmail  com>
AuthorDate: Sun Apr 14 15:02:11 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Apr 14 15:03:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a27d1da

app-crypt/eid-mw: new version 

Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/eid-mw-.ebuild | 32 ++--
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index f514363c71c1..67d72f68ad1e 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.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() {



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2024-02-12 Thread Amy Liffey
commit: 7765a0573c8f6214bee764ef6c200d86017ba201
Author: Amy Liffey  gentoo  org>
AuthorDate: Mon Feb 12 11:46:20 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Feb 12 11:46:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7765a057

app-crypt/eid-mw: update 5.1.15

Closes: https://bugs.gentoo.org/923375

Submitted-by: Vincent Hardy  gmail.com>
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest  |  1 +
 .../{eid-mw-.ebuild => eid-mw-5.1.15.ebuild}   | 22 +++---
 app-crypt/eid-mw/eid-mw-.ebuild|  7 ++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c331d5100830..4ec5af4820bf 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-5.1.13.tar.gz 15369717 BLAKE2B 
99c70445abddd85ae7df917380a91d64ccefb7e3b73db4d2a5887a1dfc7d54e575ca0df5cbccdab41ce7ffb0648d6cb6c456da4f65ae2b0f0c4844ed2d5b343e
 SHA512 
b7c024163d1eedb3cf5558be130fbe7fb3045c31bda541ed3402ac11514308c2ed9dd692972c8ddbe81a4923f67fb8205f761a0834abf65927991dade30e4ea4
+DIST eid-mw-5.1.15.tar.gz 16296281 BLAKE2B 
12efbc884ff250d5497ace6b9670e4dac934a8aa87e2e77d4c083d3e0325c7b0a57dd137506f62a6e3ada57459b5b23e7d5e0d86a80616a64e05948560ce265b
 SHA512 
4cf352ba912db6252f864430bacc895d29b478d3ec13ef3716089e5cb6019b2db2de08a99775dcd71a4ac9f13f3e3c6e1013f36bb2d458bbb0e851f7b45451e5

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.15.ebuild
similarity index 80%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-5.1.15.ebuild
index 567bbb9a1cd9..1c782e3b1ce9 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.15.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools desktop gnome2-utils git-r3
+inherit autotools desktop gnome2-utils
 
 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";
+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
@@ -32,6 +33,16 @@ 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
@@ -65,6 +76,11 @@ 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
 }
 

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 567bbb9a1cd9..f514363c71c1 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -65,6 +65,11 @@ 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
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2024-02-12 Thread Amy Liffey
commit: b660b757580cdd07f072fd2c4199df8cfdaf5f36
Author: Amy Liffey  gentoo  org>
AuthorDate: Mon Feb 12 11:48:06 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Feb 12 11:48:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b660b757

app-crypt/eid-mw: drop 5.1.13

Submitted-by: Vincent Hardy  gmail.com>
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 -
 app-crypt/eid-mw/eid-mw-5.1.13.ebuild | 124 --
 2 files changed, 125 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 4ec5af4820bf..637aeca4c155 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-5.1.13.tar.gz 15369717 BLAKE2B 
99c70445abddd85ae7df917380a91d64ccefb7e3b73db4d2a5887a1dfc7d54e575ca0df5cbccdab41ce7ffb0648d6cb6c456da4f65ae2b0f0c4844ed2d5b343e
 SHA512 
b7c024163d1eedb3cf5558be130fbe7fb3045c31bda541ed3402ac11514308c2ed9dd692972c8ddbe81a4923f67fb8205f761a0834abf65927991dade30e4ea4
 DIST eid-mw-5.1.15.tar.gz 16296281 BLAKE2B 
12efbc884ff250d5497ace6b9670e4dac934a8aa87e2e77d4c083d3e0325c7b0a57dd137506f62a6e3ada57459b5b23e7d5e0d86a80616a64e05948560ce265b
 SHA512 
4cf352ba912db6252f864430bacc895d29b478d3ec13ef3716089e5cb6019b2db2de08a99775dcd71a4ac9f13f3e3c6e1013f36bb2d458bbb0e851f7b45451e5

diff --git a/app-crypt/eid-mw/eid-mw-5.1.13.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.13.ebuild
deleted file mode 100644
index 9a577da21c28..
--- a/app-crypt/eid-mw/eid-mw-5.1.13.ebuild
+++ /dev/null
@@ -1,124 +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
-
-   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 "

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2024-01-02 Thread Amy Liffey
commit: e8aa55ebf1bbecde392e86dd1d8a77201b8f1dbc
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Jan  2 19:53:58 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Jan  2 19:56:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8aa55eb

app-crypt/eid-mw: add 5.1.13

Signed-off-by: Amy Liffey  gentoo.org>
Submitted-by: Vincent Hardy  gmail.com>

 app-crypt/eid-mw/Manifest |   1 +
 app-crypt/eid-mw/eid-mw-5.1.13.ebuild | 124 ++
 2 files changed, 125 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 71dd84474e94..eb009b893943 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-5.1.11.tar.gz 15368318 BLAKE2B 
34a49084bf5e1fb62b7975b14b8300c3400f0c1aeec8a9a01122097b0a3d8245974c7a9c5d9c6d91a419c796a56954b945ec838699fe9d7623f102523c4e0f67
 SHA512 
7f286a6ff14e62652ec36b68121639bcaa55cf50364da5d11aed4c9f13a2d7813d2b69c13a3335ece6ed0660ca67a8dd1724d3498d8bae03f144d268cefb731d
+DIST eid-mw-5.1.13.tar.gz 15369717 BLAKE2B 
99c70445abddd85ae7df917380a91d64ccefb7e3b73db4d2a5887a1dfc7d54e575ca0df5cbccdab41ce7ffb0648d6cb6c456da4f65ae2b0f0c4844ed2d5b343e
 SHA512 
b7c024163d1eedb3cf5558be130fbe7fb3045c31bda541ed3402ac11514308c2ed9dd692972c8ddbe81a4923f67fb8205f761a0834abf65927991dade30e4ea4

diff --git a/app-crypt/eid-mw/eid-mw-5.1.13.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.13.ebuild
new file mode 100644
index ..9a577da21c28
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.13.ebuild
@@ -0,0 +1,124 @@
+# 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
+
+   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 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2024-01-02 Thread Amy Liffey
commit: e45f7dcbbffe1a072c586aaf5eed7309a26a17ba
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Jan  2 19:55:28 2024 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Jan  2 19:56:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45f7dcb

app-crypt/eid-mw: drop 5.1.11-r1

Submitted-by: Vincent Hardy  gmail.com>
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest|   1 -
 app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild | 124 ---
 2 files changed, 125 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index eb009b893943..c331d5100830 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-5.1.11.tar.gz 15368318 BLAKE2B 
34a49084bf5e1fb62b7975b14b8300c3400f0c1aeec8a9a01122097b0a3d8245974c7a9c5d9c6d91a419c796a56954b945ec838699fe9d7623f102523c4e0f67
 SHA512 
7f286a6ff14e62652ec36b68121639bcaa55cf50364da5d11aed4c9f13a2d7813d2b69c13a3335ece6ed0660ca67a8dd1724d3498d8bae03f144d268cefb731d
 DIST eid-mw-5.1.13.tar.gz 15369717 BLAKE2B 
99c70445abddd85ae7df917380a91d64ccefb7e3b73db4d2a5887a1dfc7d54e575ca0df5cbccdab41ce7ffb0648d6cb6c456da4f65ae2b0f0c4844ed2d5b343e
 SHA512 
b7c024163d1eedb3cf5558be130fbe7fb3045c31bda541ed3402ac11514308c2ed9dd692972c8ddbe81a4923f67fb8205f761a0834abf65927991dade30e4ea4

diff --git a/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
deleted file mode 100644
index 4316ad5bec68..
--- a/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 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
-
-   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*) ;;
-   

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2023-09-21 Thread Amy Liffey
commit: 8b592a221569b27ba8fe6f329fa75ad7cabe1e7f
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Sep 21 17:01:35 2023 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Sep 21 17:01:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b592a22

app-crypt/eid-mw: drop 5.1.11

Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/eid-mw-5.1.11.ebuild | 124 --
 1 file changed, 124 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-5.1.11.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.11.ebuild
deleted file mode 100644
index 137251cc5019..
--- a/app-crypt/eid-mw/eid-mw-5.1.11.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 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
-
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2023-09-21 Thread Amy Liffey
commit: c3d5198f3cb06003085c650168cdaf546e69c9fe
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Sep 21 11:55:47 2023 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Sep 21 11:58:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d5198f

app-crypt/eid-mw: fix bug 913727

Closes: https://bugs.gentoo.org/913727
Submitted-by: Vincent Hardy  gmail.com>

Signed-off-by: Amy Liffey  gentoo.org>

 .../{eid-mw-.ebuild => eid-mw-5.1.11-r1.ebuild} | 17 ++---
 app-crypt/eid-mw/eid-mw-.ebuild |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
similarity index 83%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
index b94eb12ffc53..4316ad5bec68 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
-inherit autotools desktop gnome2-utils git-r3
+inherit autotools desktop gnome2-utils
 
 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";
+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
@@ -32,6 +33,16 @@ 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
@@ -79,7 +90,7 @@ src_configure() {
 
 src_install() {
default
-   rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+   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

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index b94eb12ffc53..567bbb9a1cd9 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 
 src_install() {
default
-   rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+   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



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2023-06-30 Thread Amy Liffey
commit: 66da1da5633b87f167a0f877f23fc2123bbb42c0
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Jun 30 15:51:53 2023 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Jun 30 15:51:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66da1da5

app-crypt/eid-mw: drop 5.1.10

Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 -
 app-crypt/eid-mw/eid-mw-5.1.10.ebuild | 123 --
 2 files changed, 124 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index da96175213ae..71dd84474e94 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-5.1.10.tar.gz 15368173 BLAKE2B 
4776bfd3ba66347c53424e1f36a6f8fa7042a7be329008a841bd37d6b1e715494e13bcc977e595575b655d2820451962e1cf2b7f0a12c1a54c9ebcbf61b27d6a
 SHA512 
e8e241fe2bef3331032bb18e88f25ba355258bfd7f7cb3e295aecd5765683bb083dce0a97bfd55c62e44f297798208681d54a91b5cd136d2826be505e4759e09
 DIST eid-mw-5.1.11.tar.gz 15368318 BLAKE2B 
34a49084bf5e1fb62b7975b14b8300c3400f0c1aeec8a9a01122097b0a3d8245974c7a9c5d9c6d91a419c796a56954b945ec838699fe9d7623f102523c4e0f67
 SHA512 
7f286a6ff14e62652ec36b68121639bcaa55cf50364da5d11aed4c9f13a2d7813d2b69c13a3335ece6ed0660ca67a8dd1724d3498d8bae03f144d268cefb731d

diff --git a/app-crypt/eid-mw/eid-mw-5.1.10.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.10.ebuild
deleted file mode 100644
index ab46c1f922c8..
--- a/app-crypt/eid-mw/eid-mw-5.1.10.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~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 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"
-
-   # 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 '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 "Y

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2023-06-30 Thread Amy Liffey
commit: 0c92947b8abdb3b68214972103fa34aa3f327cf1
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Jun 30 15:49:02 2023 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Jun 30 15:51:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c92947b

app-crypt/eid-mw: version bump 5.1.11

- remove redundant inherit
- Fix a (second) libdir item.

Submitted-by: Vincent Hardy  gmail.com>
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest  |  1 +
 .../{eid-mw-.ebuild => eid-mw-5.1.11.ebuild}   | 22 +-
 app-crypt/eid-mw/eid-mw-.ebuild|  9 +
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 133b9dc38c3e..da96175213ae 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-5.1.10.tar.gz 15368173 BLAKE2B 
4776bfd3ba66347c53424e1f36a6f8fa7042a7be329008a841bd37d6b1e715494e13bcc977e595575b655d2820451962e1cf2b7f0a12c1a54c9ebcbf61b27d6a
 SHA512 
e8e241fe2bef3331032bb18e88f25ba355258bfd7f7cb3e295aecd5765683bb083dce0a97bfd55c62e44f297798208681d54a91b5cd136d2826be505e4759e09
+DIST eid-mw-5.1.11.tar.gz 15368318 BLAKE2B 
34a49084bf5e1fb62b7975b14b8300c3400f0c1aeec8a9a01122097b0a3d8245974c7a9c5d9c6d91a419c796a56954b945ec838699fe9d7623f102523c4e0f67
 SHA512 
7f286a6ff14e62652ec36b68121639bcaa55cf50364da5d11aed4c9f13a2d7813d2b69c13a3335ece6ed0660ca67a8dd1724d3498d8bae03f144d268cefb731d

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.11.ebuild
similarity index 80%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-5.1.11.ebuild
index cce8d5f2d95f..137251cc5019 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.11.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools desktop gnome2-utils xdg-utils git-r3
+inherit autotools desktop gnome2-utils
 
 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";
+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
@@ -32,6 +33,16 @@ 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
@@ -43,9 +54,10 @@ src_prepare() {
-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
plugins_tools/aboutmw/gtk/about-main.c || die
 
-   # Fix libdir for pkcs11_manifestdir
+   # 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

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index cce8d5f2d95f..b94eb12ffc53 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools desktop gnome2-utils xdg-utils git-r3
+inherit autotools desktop gnome2-utils git-r3
 
 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
 HOMEPAGE="https://eid.belgium.be";
@@ -43,9 +43,10 @@ src_prepare() {
-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
plugins_tools/aboutmw/gtk/about-main.c || die
 
-   # Fix libdir for pkcs11_manifestdir
+   # 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



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2023-03-15 Thread Arthur Zamarin
commit: 19ccf86d26fbfdd3db83b19ed25f55599290e0ab
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 15 12:18:09 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 15 12:18:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19ccf86d

app-crypt/eid-mw: Keyword 5.1.10 arm64, #901235

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-crypt/eid-mw/eid-mw-5.1.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/eid-mw/eid-mw-5.1.10.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.10.ebuild
index 638ecc418844..ab46c1f922c8 100644
--- a/app-crypt/eid-mw/eid-mw-5.1.10.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.10.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+dialogs +gtk p11-kit"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.2.9



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2023-03-14 Thread Amy Liffey
commit: dbc45b1f9e41ec0832af235b948028c7afa531fc
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Mar 14 18:07:44 2023 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Mar 14 18:10:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc45b1f

app-crypt/eid-mw: drop 5.1.4-r1

Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest   |   1 -
 app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild | 123 
 2 files changed, 124 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 64012e809f05..133b9dc38c3e 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
 DIST eid-mw-5.1.10.tar.gz 15368173 BLAKE2B 
4776bfd3ba66347c53424e1f36a6f8fa7042a7be329008a841bd37d6b1e715494e13bcc977e595575b655d2820451962e1cf2b7f0a12c1a54c9ebcbf61b27d6a
 SHA512 
e8e241fe2bef3331032bb18e88f25ba355258bfd7f7cb3e295aecd5765683bb083dce0a97bfd55c62e44f297798208681d54a91b5cd136d2826be505e4759e09
-DIST eid-mw-5.1.4.tar.gz 13646645 BLAKE2B 
3d1ede2078e4293a082bbdc19b942f4aa5a71cf5b852edb68a18cfa78f2d5b53a609b1190bc9b81dc87938de4619e99c9d4b19b4980e62631910e30683bf983b
 SHA512 
903ca2dd7566e760badfb9fb1ea40e7cada42173d7d8f3795c1df16643f082c1cb8dd1ee3cd9e031b6306ca2dd2118df179f547a6b1f5f1a7ba05a45f247cc1d

diff --git a/app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild
deleted file mode 100644
index 0d4cefdf0e1d..
--- a/app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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
-
-   # 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 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"
-
-   # 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 '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 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2023-03-14 Thread Amy Liffey
commit: 917326dfb6674ad256d3b11b7af6f485f3b15be2
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Mar 14 18:05:30 2023 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Mar 14 18:10:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917326df

app-crypt/eid-mw: add 5.1.10

Submitted-by: Vincent Hardy  gmail.com>
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 +
 app-crypt/eid-mw/eid-mw-5.1.10.ebuild | 123 ++
 2 files changed, 124 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 782b8b374f0e..64012e809f05 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
+DIST eid-mw-5.1.10.tar.gz 15368173 BLAKE2B 
4776bfd3ba66347c53424e1f36a6f8fa7042a7be329008a841bd37d6b1e715494e13bcc977e595575b655d2820451962e1cf2b7f0a12c1a54c9ebcbf61b27d6a
 SHA512 
e8e241fe2bef3331032bb18e88f25ba355258bfd7f7cb3e295aecd5765683bb083dce0a97bfd55c62e44f297798208681d54a91b5cd136d2826be505e4759e09
 DIST eid-mw-5.1.4.tar.gz 13646645 BLAKE2B 
3d1ede2078e4293a082bbdc19b942f4aa5a71cf5b852edb68a18cfa78f2d5b53a609b1190bc9b81dc87938de4619e99c9d4b19b4980e62631910e30683bf983b
 SHA512 
903ca2dd7566e760badfb9fb1ea40e7cada42173d7d8f3795c1df16643f082c1cb8dd1ee3cd9e031b6306ca2dd2118df179f547a6b1f5f1a7ba05a45f247cc1d

diff --git a/app-crypt/eid-mw/eid-mw-5.1.10.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.10.ebuild
new file mode 100644
index ..638ecc418844
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.10.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+
+   # 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 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"
+
+   # 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 '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."
+   

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2022-08-01 Thread Amy Liffey
commit: e9e6a39f8b28493af5b9335ed290a4fd9a05e339
Author: Amy Liffey  gentoo  org>
AuthorDate: Mon Aug  1 09:16:48 2022 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Aug  1 09:16:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e6a39f

app-crypt/eid-mw: remove old 5.0.28, 5.1.4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 -
 app-crypt/eid-mw/eid-mw-5.0.28.ebuild | 118 --
 app-crypt/eid-mw/eid-mw-5.1.4.ebuild  | 118 --
 3 files changed, 237 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 5da7ad8089b2..782b8b374f0e 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 
1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc
 SHA512 
05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898
 DIST eid-mw-5.1.4.tar.gz 13646645 BLAKE2B 
3d1ede2078e4293a082bbdc19b942f4aa5a71cf5b852edb68a18cfa78f2d5b53a609b1190bc9b81dc87938de4619e99c9d4b19b4980e62631910e30683bf983b
 SHA512 
903ca2dd7566e760badfb9fb1ea40e7cada42173d7d8f3795c1df16643f082c1cb8dd1ee3cd9e031b6306ca2dd2118df179f547a6b1f5f1a7ba05a45f247cc1d

diff --git a/app-crypt/eid-mw/eid-mw-5.0.28.ebuild 
b/app-crypt/eid-mw/eid-mw-5.0.28.ebuild
deleted file mode 100644
index 97045c329e89..
--- a/app-crypt/eid-mw/eid-mw-5.0.28.ebuild
+++ /dev/null
@@ -1,118 +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-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"
-
-   # 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 '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 pi

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2022-08-01 Thread Amy Liffey
commit: 5e4122492921483d49a2084a9dfd2e2d88975e67
Author: Amy Liffey  gentoo  org>
AuthorDate: Mon Aug  1 09:15:53 2022 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Aug  1 09:15:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e412249

app-crypt/eid-mw: fix pkg-config installation

Closes: https://bugs.gentoo.org/862306
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild | 123 
 1 file changed, 123 insertions(+)

diff --git a/app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild
new file mode 100644
index ..0d4cefdf0e1d
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+
+   # 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 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"
+
+   # 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 '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
+}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2022-05-28 Thread Amy Liffey
commit: 5cf01d18a4dbdb53c832dd42c50b1c97adaa5a4b
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat May 28 09:35:10 2022 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat May 28 09:35:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf01d18

app-crypt/eid-mw: version bump 5.1.4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Submitted-by: Vincent Hardy  gmail.com>
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest|   1 +
 app-crypt/eid-mw/eid-mw-5.1.4.ebuild | 118 +++
 2 files changed, 119 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 115ca9888bda..5da7ad8089b2 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 
1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc
 SHA512 
05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898
+DIST eid-mw-5.1.4.tar.gz 13646645 BLAKE2B 
3d1ede2078e4293a082bbdc19b942f4aa5a71cf5b852edb68a18cfa78f2d5b53a609b1190bc9b81dc87938de4619e99c9d4b19b4980e62631910e30683bf983b
 SHA512 
903ca2dd7566e760badfb9fb1ea40e7cada42173d7d8f3795c1df16643f082c1cb8dd1ee3cd9e031b6306ca2dd2118df179f547a6b1f5f1a7ba05a45f247cc1d

diff --git a/app-crypt/eid-mw/eid-mw-5.1.4.ebuild 
b/app-crypt/eid-mw/eid-mw-5.1.4.ebuild
new file mode 100644
index ..cb218b605e07
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+   # 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 '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!!"
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-09-09 Thread Amy Liffey
commit: bc57119caf12eeec8666d6550e5c271e2cd76038
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Sep  9 20:29:43 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Sep  9 20:30:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc57119c

app-crypt/eid-mw: remove old 5.0.23

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 -
 app-crypt/eid-mw/eid-mw-5.0.23.ebuild | 110 --
 2 files changed, 111 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index e0c3eb7c79a..115ca9888bd 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-5.0.23.tar.gz 13614039 BLAKE2B 
5df1ad1cfd658586352800119eca17b2c57f642678cb131bd46af7b3cd3e4599e4d84b91c139d47082f07a1a80d6719f352151982085c6a577b01a75b6875782
 SHA512 
35be133c81cd5824dcffd9d74dae2aaf4cecffc56cf0e106832ea930d7d8a9a7ae115aab19d21cc79d011fe98108b0d67a3a69e5cb27ff3ec0ec059a9d9e0035
 DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 
1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc
 SHA512 
05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898

diff --git a/app-crypt/eid-mw/eid-mw-5.0.23.ebuild 
b/app-crypt/eid-mw/eid-mw-5.0.23.ebuild
deleted file mode 100644
index 364d7111264..000
--- a/app-crypt/eid-mw/eid-mw-5.0.23.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-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
-   gnom

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-09-09 Thread Amy Liffey
commit: 4e8ff830c254550978fa4956dec76086712d6306
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Sep  9 20:28:44 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Sep  9 20:30:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8ff830

app-crypt/eid-mw: fix sandbox issue, bump 5.0.28

Closes: https://bugs.gentoo.org/811270
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest  |  1 +
 .../{eid-mw-.ebuild => eid-mw-5.0.28.ebuild}   | 18 --
 app-crypt/eid-mw/eid-mw-.ebuild|  8 
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 61ef6b68174..e0c3eb7c79a 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-5.0.23.tar.gz 13614039 BLAKE2B 
5df1ad1cfd658586352800119eca17b2c57f642678cb131bd46af7b3cd3e4599e4d84b91c139d47082f07a1a80d6719f352151982085c6a577b01a75b6875782
 SHA512 
35be133c81cd5824dcffd9d74dae2aaf4cecffc56cf0e106832ea930d7d8a9a7ae115aab19d21cc79d011fe98108b0d67a3a69e5cb27ff3ec0ec059a9d9e0035
+DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 
1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc
 SHA512 
05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-5.0.28.ebuild
similarity index 81%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-5.0.28.ebuild
index 9d56a10ca2b..97045c329e8 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.28.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=7
 
-inherit autotools desktop gnome2-utils xdg-utils git-r3
+inherit autotools desktop gnome2-utils xdg-utils
 
 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";
+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
@@ -32,6 +33,11 @@ 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
@@ -56,6 +62,14 @@ src_prepare() {
# 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
+
eautoreconf
 }
 

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 9d56a10ca2b..cce8d5f2d95 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -56,6 +56,14 @@ src_prepare() {
# 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
+
eautoreconf
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-06-25 Thread Amy Liffey
commit: 1486e5d2e1b63a53a8fd805916cf098063f173bf
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Jun 25 21:03:32 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Jun 25 21:03:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1486e5d2

app-crypt/eid-mw: version bump 5.0.23

Closes: https://bugs.gentoo.org/798450
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest  | 2 +-
 app-crypt/eid-mw/{eid-mw-5.0.14-r1.ebuild => eid-mw-5.0.23.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 0af6a426942..61ef6b68174 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1 @@
-DIST eid-mw-5.0.14.tar.gz 8971565 BLAKE2B 
d1e6997c089c72f6b6b15fafefa227d7341721c1fa52e446f0334c3915b2e16d84ccb27053dc2e12c0f932bb3cb96e1cbfadc0d6b203098734f74fa0dbffc6ab
 SHA512 
97a4e1359c853f14e91d5ec6c3b13d97b3113106da1e7125b558d724aea76f8a15b289dd06ed13391896d9318daea0133eba9269b6103fb1b922e8b55ceaf9cc
+DIST eid-mw-5.0.23.tar.gz 13614039 BLAKE2B 
5df1ad1cfd658586352800119eca17b2c57f642678cb131bd46af7b3cd3e4599e4d84b91c139d47082f07a1a80d6719f352151982085c6a577b01a75b6875782
 SHA512 
35be133c81cd5824dcffd9d74dae2aaf4cecffc56cf0e106832ea930d7d8a9a7ae115aab19d21cc79d011fe98108b0d67a3a69e5cb27ff3ec0ec059a9d9e0035

diff --git a/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild 
b/app-crypt/eid-mw/eid-mw-5.0.23.ebuild
similarity index 100%
rename from app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild
rename to app-crypt/eid-mw/eid-mw-5.0.23.ebuild



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-04-02 Thread Amy Liffey
commit: 9b4b39cbf32716ada6cb3f0fb947fac845f0e378
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Apr  2 09:19:38 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Apr  2 09:20:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4b39cb

app-crypt/eid-mw: Remove useless space metadata.xml

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 4250e12ee73..6ee8ed9ff71 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -3,7 +3,7 @@
 
 
   vincent.hardy...@gmail.com
-   Vincent Hardy
+  Vincent Hardy
 
 
proxy-ma...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-04-01 Thread Amy Liffey
commit: 462ed36ef2760c1d8371b5a7ed9c47f5b357c972
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Apr  1 19:16:11 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Apr  1 19:16:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462ed36e

app-crypt/eid-mw: remove old

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/eid-mw-5.0.14.ebuild | 110 --
 1 file changed, 110 deletions(-)

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 93ca542eae1..000
--- 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
-}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-04-01 Thread Amy Liffey
commit: 52ebb58530c388ef2d5e20fc1d4f78eb0f4e2434
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Apr  1 19:14:20 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Apr  1 19:16:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ebb585

app-crypt/eid-mw: add maintainer name to metadata

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 89088151281..4250e12ee73 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -3,6 +3,7 @@
 
 
   vincent.hardy...@gmail.com
+   Vincent Hardy
 
 
proxy-ma...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-04-01 Thread Amy Liffey
commit: 897bb891e5485145b13db1c7a850fa3d122e0a77
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Apr  1 19:13:23 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Apr  1 19:16:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897bb891

app-crypt/eid-mw: Fix Target pinentry-gtk-2

Closes: https://bugs.gentoo.org/778353
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 .../{eid-mw-.ebuild => eid-mw-5.0.14-r1.ebuild}| 18 --
 app-crypt/eid-mw/eid-mw-.ebuild|  8 
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild
similarity index 80%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild
index f121b904909..364d7111264 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=7
 
-inherit autotools desktop gnome2-utils xdg-utils git-r3
+inherit autotools desktop gnome2-utils xdg-utils
 
 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";
+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
@@ -20,7 +21,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 )"
 
@@ -32,6 +33,11 @@ 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
@@ -85,11 +91,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/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index f121b904909..9d56a10ca2b 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.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



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/

2021-03-10 Thread Amy Liffey
commit: 3b8a376e2734c94174127aa3ac6d1563e3555b28
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Mar 10 19:05:15 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Mar 10 19:05:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b8a376e

app-crypt/eid-mw: remove old 4.4.27, 5.0.11

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   2 -
 app-crypt/eid-mw/eid-mw-4.4.27.ebuild | 108 -
 app-crypt/eid-mw/eid-mw-5.0.11.ebuild | 111 -
 app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch | 272 --
 app-crypt/eid-mw/metadata.xml |   3 -
 5 files changed, 496 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 198a92e64ad..0af6a426942 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1 @@
-DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 
5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b
 SHA512 
c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
-DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 
36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd
 SHA512 
2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
 DIST eid-mw-5.0.14.tar.gz 8971565 BLAKE2B 
d1e6997c089c72f6b6b15fafefa227d7341721c1fa52e446f0334c3915b2e16d84ccb27053dc2e12c0f932bb3cb96e1cbfadc0d6b203098734f74fa0dbffc6ab
 SHA512 
97a4e1359c853f14e91d5ec6c3b13d97b3113106da1e7125b558d724aea76f8a15b289dd06ed13391896d9318daea0133eba9269b6103fb1b922e8b55ceaf9cc

diff --git a/app-crypt/eid-mw/eid-mw-4.4.27.ebuild 
b/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
deleted file mode 100644
index 38d7672f996..000
--- a/app-crypt/eid-mw/eid-mw-4.4.27.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+:*
-   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
-
-   # Fix libdir for pkcs11_manifestdir
-   sed -i \
-   -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
-   cardcomm/pkcs11/src/Makefile.am || die
-
-   # See bug #691308
-   eapply "${FILESDIR}/eid-sign-test-4.4.19.patch"
-
-   # 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 pl

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-03-10 Thread Amy Liffey
commit: aca828b777ef4060cf3e3c5cd003560ec020acb5
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Mar 10 19:01:46 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Mar 10 19:02:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca828b7

app-crypt/eid-mw: version bump 5.0.14

- Remove p11v220 useflag not option anymore
- Update  ebuild
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest   |  1 +
 .../eid-mw/{eid-mw-.ebuild => eid-mw-5.0.14.ebuild} | 13 +
 app-crypt/eid-mw/eid-mw-.ebuild |  3 +--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 0d7a5adcda5..198a92e64ad 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 
5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b
 SHA512 
c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
 DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 
36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd
 SHA512 
2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
+DIST eid-mw-5.0.14.tar.gz 8971565 BLAKE2B 
d1e6997c089c72f6b6b15fafefa227d7341721c1fa52e446f0334c3915b2e16d84ccb27053dc2e12c0f932bb3cb96e1cbfadc0d6b203098734f74fa0dbffc6ab
 SHA512 
97a4e1359c853f14e91d5ec6c3b13d97b3113106da1e7125b558d724aea76f8a15b289dd06ed13391896d9318daea0133eba9269b6103fb1b922e8b55ceaf9cc

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-5.0.14.ebuild
similarity index 86%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-5.0.14.ebuild
index 5b107133261..93ca542eae1 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.14.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=7
 
-inherit autotools desktop gnome2-utils xdg-utils git-r3
+inherit autotools desktop gnome2-utils xdg-utils
 
 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";
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="+dialogs +gtk +p11v220 p11-kit"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+dialogs +gtk p11-kit"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.2.9
gtk? (
@@ -32,6 +33,11 @@ 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
@@ -62,7 +68,6 @@ src_prepare() {
 src_configure() {
econf \
$(use_enable dialogs) \
-   $(use_enable p11v220) \
$(use_enable p11-kit p11kit) \
$(use_with gtk gtkvers 'detect') \
--with-gnu-ld \

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 5b107133261..f121b904909 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/Fedict/${PN}.git";
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="+dialogs +gtk +p11v220 p11-kit"
+IUSE="+dialogs +gtk p11-kit"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.2.9
gtk? (
@@ -62,7 +62,6 @@ src_prepare() {
 src_configure() {
econf \
$(use_enable dialogs) \
-   $(use_enable p11v220) \
$(use_enable p11-kit p11kit) \
$(use_with gtk gtkvers 'detect') \
--with-gnu-ld \



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2021-01-03 Thread Amy Liffey
commit: 78ff0e4f916757ea85442d009b9506dcf333511f
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Jan  3 20:56:11 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Jan  3 20:56:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ff0e4f

app-crypt/eid-mw: remove old 5.0.8

Package-Manager: Portage-3.0.9, Repoman-2.3.23
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest|   1 -
 app-crypt/eid-mw/eid-mw-5.0.8.ebuild | 108 ---
 2 files changed, 109 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 43ea89c2253..0d7a5adcda5 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,2 @@
 DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 
5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b
 SHA512 
c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
 DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 
36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd
 SHA512 
2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
-DIST eid-mw-5.0.8.tar.gz 8782476 BLAKE2B 
ece43bff5de108f4d92534aeda3d88c1109fbf54f99c4de0442c02958a9b0edef3e34d94015b9f3a865317d88c2bd21d1adbbf15010cd1fbd99787985190dee5
 SHA512 
dc9eaaec419082bc6e1f6cd11063c79c5aac0e7910027d9cbb34dbe8ede9d600c93b7b38a7e4491c5eb9a0068e537d78854b3fc3b2581d464dd4939185469e46

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 064bbcfb9d4..000
--- 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 p

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2021-01-03 Thread Amy Liffey
commit: 0cf87b70d683bb210882ef7f171bbd8b44123d63
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Jan  3 20:50:57 2021 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Jan  3 20:54:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf87b70

app-crypt/eid-mw: version bump 5.0.11, fix bug #751472

Closes: https://bugs.gentoo.org/751472
Submitted-by: Vincent Hardy  gmail.com>

Package-Manager: Portage-3.0.9, Repoman-2.3.23
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest   |  1 +
 .../{eid-mw-.ebuild => eid-mw-5.0.11.ebuild}| 15 ---
 app-crypt/eid-mw/eid-mw-.ebuild |  5 -
 app-crypt/eid-mw/files/use-printf-in-Makefile.patch | 21 +
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 466fd851283..43ea89c2253 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 
5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b
 SHA512 
c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
+DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 
36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd
 SHA512 
2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
 DIST eid-mw-5.0.8.tar.gz 8782476 BLAKE2B 
ece43bff5de108f4d92534aeda3d88c1109fbf54f99c4de0442c02958a9b0edef3e34d94015b9f3a865317d88c2bd21d1adbbf15010cd1fbd99787985190dee5
 SHA512 
dc9eaaec419082bc6e1f6cd11063c79c5aac0e7910027d9cbb34dbe8ede9d600c93b7b38a7e4491c5eb9a0068e537d78854b3fc3b2581d464dd4939185469e46

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
similarity index 83%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-5.0.11.ebuild
index 19055f55bc5..b0e0654fd5b 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 git-r3
+inherit autotools desktop gnome2-utils xdg-utils
 
 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";
+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
@@ -32,6 +33,11 @@ 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
@@ -53,6 +59,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/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 19055f55bc5..5b107133261 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.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 000..5b4ef2adc07
--- /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.0 
+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 pu

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2020-11-12 Thread Amy Liffey
commit: 4d2f30e530c56fe412d279e0f742c5b23648a46a
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Nov 12 15:37:07 2020 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Nov 12 15:43:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2f30e5

app-crypt/eid-mw: Update live ebuild

- eid-mw now relies on pinentry for entering pin code.
- outdated blocking dependency removed
- eid-mw does not support GTK+:2 anymore.
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.8, Repoman-2.3.23
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/eid-mw-.ebuild | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index c7f49603d0a..19055f55bc5 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9
dev-libs/libxml2
net-misc/curl[ssl]
net-libs/libproxy
-   !app-misc/eid-viewer-bin
+   app-crypt/pinentry[gtk]
)
p11-kit? ( app-crypt/p11-kit )"
 
@@ -80,6 +80,16 @@ pkg_postinst() {
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
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2020-11-12 Thread Amy Liffey
commit: b872ac43bc8d3bdc2c5dab0de4ba12cea5a40e33
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Nov 12 15:42:05 2020 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Nov 12 15:43:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b872ac43

app-crypt/eid-mw: version bump 5.0.8

- eid-mw now relies on pinentry for entering pin code.
- outdated blocking dependency removed
- eid-mw does not support GTK+:2 anymore.
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-3.0.8, Repoman-2.3.23
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest|   1 +
 app-crypt/eid-mw/eid-mw-5.0.8.ebuild | 108 +++
 2 files changed, 109 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c8855194e4a..466fd851283 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 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

diff --git a/app-crypt/eid-mw/eid-mw-5.0.8.ebuild 
b/app-crypt/eid-mw/eid-mw-5.0.8.ebuild
new file mode 100644
index 000..064bbcfb9d4
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.0.8.ebuild
@@ -0,0 +1,108 @@
+# 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
+  

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2020-08-10 Thread Amy Liffey
commit: b84481700ded15a6b01677fd00ad1f644bbeeec2
Author: Amy Liffey  gentoo  org>
AuthorDate: Mon Aug 10 07:32:15 2020 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Aug 10 07:32:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8448170

app-crypt/eid-mw:  remove not needed xpi module

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/eid-mw-.ebuild | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 2535311a44f..c7f49603d0a 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -32,10 +32,7 @@ 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
-
-   # legacy xpi module : we don't want it anymore
+   # 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
 



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2020-08-04 Thread Amy Liffey
commit: f716edb5328be368ff494084d02f59c59b6f41c5
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Aug  4 18:36:58 2020 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Aug  4 18:36:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f716edb5

app-crypt/eid-mw: Update live ebuild to latest

Bug: https://bugs.gentoo.org/732994
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.99, Repoman-2.3.20
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/eid-mw-.ebuild | 22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 023f52ee56b..2535311a44f 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools gnome2-utils git-r3
+inherit autotools desktop gnome2-utils xdg-utils git-r3
 
 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
 HOMEPAGE="https://eid.belgium.be";
@@ -16,7 +16,7 @@ IUSE="+dialogs +gtk +p11v220 p11-kit"
 RDEPEND=">=sys-apps/pcsc-lite-1.2.9
gtk? (
x11-libs/gdk-pixbuf[jpeg]
-   x11-libs/gtk+:*
+   x11-libs/gtk+:3
dev-libs/libxml2
net-misc/curl[ssl]
net-libs/libproxy
@@ -46,6 +46,16 @@ src_prepare() {
-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
 }
 
@@ -71,13 +81,15 @@ src_install() {
 pkg_postinst() {
if use gtk; then
gnome2_schemas_update
-   gnome2_icon_cache_update
+   xdg_desktop_database_update
+   xdg_icon_cache_update
fi
 }
 
 pkg_postrm() {
if use gtk; then
gnome2_schemas_update
-   gnome2_icon_cache_update
+   xdg_desktop_database_update
+   xdg_icon_cache_update
fi
 }



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2020-08-04 Thread Amy Liffey
commit: 26392245bfed2d56ef2aa45fdb7db5ea76b24eb3
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Aug  4 18:35:18 2020 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Aug  4 18:35:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26392245

app-crypt/eid-mw: version bump 4.4.27

Closes: https://bugs.gentoo.org/732994
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.99, Repoman-2.3.20
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 +
 app-crypt/eid-mw/eid-mw-4.4.27.ebuild | 108 ++
 2 files changed, 109 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 587b27afaad..a427a2fe6d3 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,4 @@
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 
7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e
 SHA512 
9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
 DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B 
c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848
 SHA512 
21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
 DIST eid-mw-4.4.23.tar.gz 7502185 BLAKE2B 
ab223c2d860f44806a6043a40891d89ab3418dd232bba1d60bd9b0b6871a77e6e24bc73c49afcffabc8ae7f16c235aabfb17efb8af7543b0e2bd3fe76ba655f7
 SHA512 
7c90d7ca08dcd2ba4d0c918b5ba6305da6107de457209acb9a0cc3243891c9b654b1c12fe4da53ec8bad65617198c0caffdb0482e343a8d807f00762e6672310
+DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 
5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b
 SHA512 
c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1

diff --git a/app-crypt/eid-mw/eid-mw-4.4.27.ebuild 
b/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
new file mode 100644
index 000..38d7672f996
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
@@ -0,0 +1,108 @@
+# 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+:*
+   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
+
+   # Fix libdir for pkcs11_manifestdir
+   sed -i \
+   -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+   cardcomm/pkcs11/src/Makefile.am || die
+
+   # See bug #691308
+   eapply "${FILESDIR}/eid-sign-test-4.4.19.patch"
+
+   # 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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2020-08-04 Thread Amy Liffey
commit: fdce75e117c0d43ab13194ba87fabe09ef50aba1
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Aug  4 18:38:25 2020 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Aug  4 18:38:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdce75e1

app-crypt/eid-mw: remove old 4.4.1*,4.4.23

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.99, Repoman-2.3.20
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   3 -
 app-crypt/eid-mw/eid-mw-4.4.1.ebuild  |  92 --
 app-crypt/eid-mw/eid-mw-4.4.19.ebuild | 103 --
 app-crypt/eid-mw/eid-mw-4.4.23.ebuild | 103 --
 4 files changed, 301 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index a427a2fe6d3..c8855194e4a 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,4 +1 @@
-DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 
7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e
 SHA512 
9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
-DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B 
c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848
 SHA512 
21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
-DIST eid-mw-4.4.23.tar.gz 7502185 BLAKE2B 
ab223c2d860f44806a6043a40891d89ab3418dd232bba1d60bd9b0b6871a77e6e24bc73c49afcffabc8ae7f16c235aabfb17efb8af7543b0e2bd3fe76ba655f7
 SHA512 
7c90d7ca08dcd2ba4d0c918b5ba6305da6107de457209acb9a0cc3243891c9b654b1c12fe4da53ec8bad65617198c0caffdb0482e343a8d807f00762e6672310
 DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 
5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b
 SHA512 
c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1

diff --git a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild 
b/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
deleted file mode 100644
index f446179c580..000
--- a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 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 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 '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 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 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2019-10-10 Thread Amy Liffey
commit: b0e38d1d701bbd51755dee5e3c3bb476c47497f6
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Oct 10 08:14:40 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Oct 10 08:15:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e38d1d

app-crypt/eid-mw: version bump 4.4.23

Submitted-by: Vincent Hardy  gmail.com>
Closes: https://bugs.gentoo.org/696426
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 +
 app-crypt/eid-mw/eid-mw-4.4.23.ebuild | 103 ++
 2 files changed, 104 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 79288d7cf0c..587b27afaad 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 
7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e
 SHA512 
9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
 DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B 
c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848
 SHA512 
21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
+DIST eid-mw-4.4.23.tar.gz 7502185 BLAKE2B 
ab223c2d860f44806a6043a40891d89ab3418dd232bba1d60bd9b0b6871a77e6e24bc73c49afcffabc8ae7f16c235aabfb17efb8af7543b0e2bd3fe76ba655f7
 SHA512 
7c90d7ca08dcd2ba4d0c918b5ba6305da6107de457209acb9a0cc3243891c9b654b1c12fe4da53ec8bad65617198c0caffdb0482e343a8d807f00762e6672310

diff --git a/app-crypt/eid-mw/eid-mw-4.4.23.ebuild 
b/app-crypt/eid-mw/eid-mw-4.4.23.ebuild
new file mode 100644
index 000..95d518b2d3f
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.4.23.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 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+:*
+   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
+
+   # Fix libdir for pkcs11_manifestdir
+   sed -i \
+   -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+   cardcomm/pkcs11/src/Makefile.am || die
+
+   # See bug #691308
+   eapply "${FILESDIR}/eid-sign-test-4.4.19.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
+   fi
+}
+
+pkg_postrm(){
+   if use gtk; then
+   gnome2_schemas_upda

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2019-08-15 Thread Amy Liffey
commit: 5724b3d83e696251df1fee776afdf55226f85cd9
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Aug 15 19:18:00 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Aug 15 19:19:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5724b3d8

app-crypt/eid-mw: remove old 4.4.11

Closes: https://bugs.gentoo.org/691308
Suggested-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |  1 -
 app-crypt/eid-mw/eid-mw-4.4.11.ebuild | 93 ---
 2 files changed, 94 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 644dc3133d4..79288d7cf0c 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,2 @@
 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
 DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B 
c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848
 SHA512 
21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634

diff --git a/app-crypt/eid-mw/eid-mw-4.4.11.ebuild 
b/app-crypt/eid-mw/eid-mw-4.4.11.ebuild
deleted file mode 100644
index e496d37797e..000
--- a/app-crypt/eid-mw/eid-mw-4.4.11.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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
-}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/

2019-08-15 Thread Amy Liffey
commit: e2c4faef071d1e2210ea330d5f14f1fe80403527
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Aug 15 19:14:35 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Aug 15 19:19:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c4faef

app-crypt/eid-mw: version bump 4.4.19

Closes: https://bugs.gentoo.org/690038
Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Amy Liffey  gentoo.org>

 app-crypt/eid-mw/Manifest |   1 +
 app-crypt/eid-mw/eid-mw-4.4.19.ebuild | 103 
 app-crypt/eid-mw/files/eid-sign-test-4.4.19.patch | 272 ++
 3 files changed, 376 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index debf3f3f29b..644dc3133d4 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 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
+DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B 
c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848
 SHA512 
21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634

diff --git a/app-crypt/eid-mw/eid-mw-4.4.19.ebuild 
b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
new file mode 100644
index 000..98c8bfee6ce
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 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+:*
+   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
+
+   # Fix libdir for pkcs11_manifestdir
+   sed -i \
+   -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+   cardcomm/pkcs11/src/Makefile.am || die
+
+   # See bug #691308
+   eapply "${FILESDIR}/eid-sign-test-${PV}.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
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2018-11-23 Thread Amy Liffey
commit: 7235361ed93100b1319b5cb83d1ab9dfae3ddf0e
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Nov 23 20:20:15 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Nov 23 20:38:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7235361e

app-crypt/eid-mw: version bump 4.4.11, adjust live ebuild

- Add p11v220 use flag (PKCS11 standard version 2.20)
- Remove xpi obsolete useflag
Submitted-by: Vincent Hardy  gmail.com>

Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 app-crypt/eid-mw/Manifest  |  1 +
 .../{eid-mw-.ebuild => eid-mw-4.4.11.ebuild}   | 58 +-
 app-crypt/eid-mw/eid-mw-.ebuild| 48 ++
 app-crypt/eid-mw/metadata.xml  |  6 +--
 4 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 39a3279d955..debf3f3f29b 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 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

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-4.4.11.ebuild
similarity index 50%
copy from app-crypt/eid-mw/eid-mw-.ebuild
copy to app-crypt/eid-mw/eid-mw-4.4.11.ebuild
index 9c2c887e618..e496d37797e 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.4.11.ebuild
@@ -1,25 +1,18 @@
-# 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} == "" ]] ; 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
 
 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"
-IUSE="+dialogs +gtk p11-kit +xpi"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+dialogs +gtk +p11v220 p11-kit"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.2.9
gtk? (
@@ -30,9 +23,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 +36,19 @@ src_prepare() {
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\")):" \
@@ -58,33 +62,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}/belgium...@eid.belgium.be"
-   fi
-   if has

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2018-10-12 Thread Thomas Deutschmann
commit: 5dbd613b9d04bd9020a4df64d0f6bf373613e755
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct 12 16:05:54 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 12 16:06:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dbd613b

app-crypt/eid-mw: drop old

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-crypt/eid-mw/Manifest|  1 -
 app-crypt/eid-mw/eid-mw-4.3.6.ebuild | 96 
 2 files changed, 97 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 55c4d55466f..39a3279d955 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1 @@
-DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 
8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c
 SHA512 
336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 
7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e
 SHA512 
9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc

diff --git a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild 
b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
deleted file mode 100644
index 322eaafd9ef..000
--- a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools mozextension 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="~x86 ~amd64 ~arm"
-IUSE="+dialogs +gtk p11-kit +xpi"
-
-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 )
-   xpi? ( || ( >=www-client/firefox-bin-3.6.24
-   >=www-client/firefox-3.6.20 ) )"
-
-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
-
-   # 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 p11-kit p11kit) \
-   $(use_with gtk gtkvers 'detect') \
-   --with-gnu-ld \
-   --disable-static \
-   --disable-signed
-}
-
-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}/belgium...@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}/belgium...@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
-
-   if use gtk; then
-   rm -r "${ED}/usr/include/eid-util" || die
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/

2018-05-18 Thread Aaron Bauman
commit: ae946489b28c15941ceb2f1607e0c3f16feb3845
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu May 17 08:23:42 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May 18 12:33:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae946489

app-crypt/eid-mw: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/8447

 app-crypt/eid-mw/files/fix_libressl_check.patch| 45 -
 .../eid-mw/files/gtk_not_required_4_2_5.patch  | 75 --
 2 files changed, 120 deletions(-)

diff --git a/app-crypt/eid-mw/files/fix_libressl_check.patch 
b/app-crypt/eid-mw/files/fix_libressl_check.patch
deleted file mode 100644
index 5476e3e4aaf..000
--- a/app-crypt/eid-mw/files/fix_libressl_check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 53289f71c53f3aa8047b34d6db9b0ca2ac35f4cb
-Author: Cédric Krier 
-Date:   Wed Jun 7 11:29:13 2017 +0200
-
-Fix OpenSSL version check for LibreSSL
-
-diff --git a/plugins_tools/eid-viewer/certhelpers.c 
b/plugins_tools/eid-viewer/certhelpers.c
-index de9f8bf4..1e3d1ee1 100644
 a/plugins_tools/eid-viewer/certhelpers.c
-+++ b/plugins_tools/eid-viewer/certhelpers.c
-@@ -12,7 +12,7 @@
- 
- #include "backend.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_get0_extensions(ce) ((ce)->cert_info->extensions)
- #define ASN1_STRING_get0_data ASN1_STRING_data
- #endif
-diff --git a/plugins_tools/eid-viewer/verify.c 
b/plugins_tools/eid-viewer/verify.c
-index 04016a44..f144d2cb 100644
 a/plugins_tools/eid-viewer/verify.c
-+++ b/plugins_tools/eid-viewer/verify.c
-@@ -22,7 +22,7 @@
- #endif
- // All valid OCSP URLs should have the following as their prefix:
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_get0_extensions(ce) ((ce)->cert_info->extensions)
- 
- #define X509_get0_tbs_sigalg(ci) ((ci)->sig_alg)
-diff --git a/tests/unit/sign.c b/tests/unit/sign.c
-index 31a1ab7a..0e0e3011 100644
 a/tests/unit/sign.c
-+++ b/tests/unit/sign.c
-@@ -37,7 +37,7 @@
- #include 
- #include 
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
-   if(!r || !n || !e) {
-   return 0;

diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch 
b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch
deleted file mode 100644
index a1680c2353d..000
--- a/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 393ecb3..0e14661 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh 
.version debian rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi
- 
- xpipackage:
-   $(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 02e4e36..86d607b 100644
 a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
-   dialogs/dialogsgtk/single_dialog.c
- endif
- 
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
- 
- if P11KIT
- dist_p11kitcf_DATA = beid.module
-@@ -176,30 +175,4 @@ install-exec-hook:
-   $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
- endif
- 
--beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src 
-I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_askpin_LDADD = @GTK_LIBS@
--
--beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-changepin.c
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
--beid_changepin_LDADD = @GTK_LIBS@
--
--beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-badpin.c
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
--beid_badpin_LDADD = @GTK_LIBS@
--
--beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askaccess.c
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
--beid_aska

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2018-05-16 Thread Amy Liffey
commit: 35cb795c64f72c812a228dcd28d6cd53582d9929
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed May 16 20:58:47 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed May 16 21:07:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cb795c

app-crypt/eid-mw: remove old 4.2.5,4.28

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/eid-mw/Manifest|  2 -
 app-crypt/eid-mw/eid-mw-4.2.5.ebuild | 97 
 app-crypt/eid-mw/eid-mw-4.2.8.ebuild | 94 --
 3 files changed, 193 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 7ffa7deb42f..55c4d55466f 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,4 +1,2 @@
-DIST eid-mw-4.2.5.tar.gz 7751526 BLAKE2B 
4836dc3a5ba4d781b8c342231cbbe74411fc6f0bf4b32eaa42ac28ea7688815361f74a1def371a05e250d3249af7ff58d24a66062fe169717872d6789ffb54f1
 SHA512 
cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
-DIST eid-mw-4.2.8.tar.gz 7076407 BLAKE2B 
e1d9b375adb326cb710da9eb5cd125086cb40b6ee37ce2ac3912ac4b5fa9c92d66c8af002a47c9ce73ff98ad2306e96529e1c87486eb0f36e61a1f4eb2231b9f
 SHA512 
bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
 DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 
8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c
 SHA512 
336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b
 DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 
7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e
 SHA512 
9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc

diff --git a/app-crypt/eid-mw/eid-mw-4.2.5.ebuild 
b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild
deleted file mode 100644
index fe66ca2e579..000
--- a/app-crypt/eid-mw/eid-mw-4.2.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools mozextension
-
-if [[ ${PV} == "" ]] ; 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
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
-
-HOMEPAGE="https://eid.belgium.be";
-
-IUSE="+dialogs +gtk p11-kit +xpi"
-
-REQUIRED_USE="
-   dialogs? ( gtk )"
-
-RDEPEND="gtk? (
-   x11-libs/gdk-pixbuf[jpeg]
-   x11-libs/gtk+:*
-   dev-libs/libxml2
-   net-misc/curl[ssl]
-   net-libs/libproxy
-   !app-misc/eid-viewer-bin
-   )
-   >=sys-apps/pcsc-lite-1.2.9
-   p11-kit? ( app-crypt/p11-kit )
-   xpi? ( || ( >=www-client/firefox-bin-3.6.24
-   >=www-client/firefox-3.6.20 ) )"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   eapply_user
-
-   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || 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
-
-   if [[ ${PV} == "" ]] ; then
-   use gtk || eapply "${FILESDIR}"/gtk_not_required_.patch
-   else
-   use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2_5.patch
-   fi
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable dialogs) \
-   $(use_enable p11-kit p11kit) \
-   --with-gnu-ld \
-   --disable-static \
-   --disable-signed
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-
-   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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
-   fi
-   if has_version '>=www-client/firefox-bin-3.6.24'; then
-   MOZILLA_FIVE_HOME="/opt/fire

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2018-05-16 Thread Amy Liffey
commit: 65717f08d563f39bb0e745111cbe8727722e4c32
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed May 16 20:57:13 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed May 16 21:07:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65717f08

app-crypt/eid-mw: version bump 4.4.1

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/eid-mw/Manifest|  1 +
 app-crypt/eid-mw/eid-mw-4.4.1.ebuild | 92 
 2 files changed, 93 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c383ae8d683..7ffa7deb42f 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,4 @@
 DIST eid-mw-4.2.5.tar.gz 7751526 BLAKE2B 
4836dc3a5ba4d781b8c342231cbbe74411fc6f0bf4b32eaa42ac28ea7688815361f74a1def371a05e250d3249af7ff58d24a66062fe169717872d6789ffb54f1
 SHA512 
cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 DIST eid-mw-4.2.8.tar.gz 7076407 BLAKE2B 
e1d9b375adb326cb710da9eb5cd125086cb40b6ee37ce2ac3912ac4b5fa9c92d66c8af002a47c9ce73ff98ad2306e96529e1c87486eb0f36e61a1f4eb2231b9f
 SHA512 
bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
 DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 
8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c
 SHA512 
336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b
+DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 
7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e
 SHA512 
9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc

diff --git a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild 
b/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
new file mode 100644
index 000..26f6f9f8d33
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="~x86 ~amd64 ~arm"
+IUSE="+dialogs +gtk 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 '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 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
+}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2018-01-19 Thread Amy Liffey
commit: fef08a4e3c9c8e3d577056c2735b40d216db50aa
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Jan 19 13:42:38 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Jan 19 13:49:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef08a4e

app-crypt/eid-mw: update lib removal for mozilla

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-crypt/eid-mw/eid-mw-4.3.6.ebuild | 2 +-
 app-crypt/eid-mw/eid-mw-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild 
b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
index b75d2070e20..322eaafd9ef 100644
--- a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
@@ -72,7 +72,7 @@ src_install() {
xpi_install 
"${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
else
-   rm -r "${ED}"/usr/$(get_libdir)/mozilla || die
+   rm -r "${ED}"/usr/lib/mozilla || die
fi
rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
 

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 2b7c0eb2f88..9c2c887e618 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -79,7 +79,7 @@ src_install() {
xpi_install 
"${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
else
-   rm -r "${ED}"/usr/$(get_libdir)/mozilla || die
+   rm -r "${ED}"/usr/lib/mozilla || die
fi
rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
 



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/

2018-01-13 Thread David Seifert
commit: b01f5c6f8297e0493d963734f9dd3239369464cb
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Jan 13 20:01:53 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 13 22:40:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01f5c6f

app-crypt/eid-mw: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6853

 app-crypt/eid-mw/files/gtk_not_required_4_2.patch | 74 ---
 1 file changed, 74 deletions(-)

diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch 
b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
deleted file mode 100644
index 7990acaebdd..000
--- a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index de5416f..8e55277 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi 
- 
- xpipackage:
-   $(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 6e33315..fce4494 100644
 a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
-   dialogs/dialogsgtk/single_dialog.c
- endif
- 
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
--
- if P11KIT
- dist_p11kitcf_DATA = beid.module
- install-exec-hook:
-@@ -176,28 +174,4 @@ install-exec-hook:
-   $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
- endif
- 
--beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src 
-I$(srcdir)/src @GTK_CFLAGS@
--beid_askpin_LDADD = @GTK_LIBS@
--
--beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-changepin.c
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_changepin_LDADD = @GTK_LIBS@
--
--beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-badpin.c
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_badpin_LDADD = @GTK_LIBS@
--
--beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askaccess.c
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_askaccess_LDADD = @GTK_LIBS@
--
--beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-askpin.c
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_spr_askpin_LDADD = @GTK_LIBS@
--
--beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-changepin.c
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
-diff --git a/configure.ac b/configure.ac
-index 92bbb3b..a47e7c2 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -59,14 +59,6 @@ fi
- 
- AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
- 
--if test "$have_gtk" = "no"
--then
--  AC_MSG_ERROR([At least one version of GTK is required.])
--fi
--
--PKG_CHECK_MODULES([XML2], [libxml-2.0])
--PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
--
- ###
- ### read user-specific requests from --enable directives ##
- ###



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2018-01-12 Thread Amy Liffey
commit: dd88a5f7931f651b1728c492d9fb5132a7d7035c
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Jan 12 16:48:28 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Jan 12 16:53:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd88a5f7

app-crypt/eid-mw: version bump 4.3.6

Submitted-by: Vincent Hardy  gmail.com>
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-crypt/eid-mw/Manifest|  1 +
 app-crypt/eid-mw/eid-mw-4.3.6.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 79a3531baf4..29fb5147ce8 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,4 @@
 DIST eid-mw-4.2.0.tar.gz 8508064 BLAKE2B 
bccca84b2ec08e4237816f61c0f2416325f4c34c66756f87c72208f5b79ebafffe91062f9fd3109562f0150793c1b849a5b57bd08533fbf4a8d0e78441131435
 SHA512 
c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f
 DIST eid-mw-4.2.5.tar.gz 7751526 BLAKE2B 
4836dc3a5ba4d781b8c342231cbbe74411fc6f0bf4b32eaa42ac28ea7688815361f74a1def371a05e250d3249af7ff58d24a66062fe169717872d6789ffb54f1
 SHA512 
cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 DIST eid-mw-4.2.8.tar.gz 7076407 BLAKE2B 
e1d9b375adb326cb710da9eb5cd125086cb40b6ee37ce2ac3912ac4b5fa9c92d66c8af002a47c9ce73ff98ad2306e96529e1c87486eb0f36e61a1f4eb2231b9f
 SHA512 
bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
+DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 
8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c
 SHA512 
336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b

diff --git a/app-crypt/eid-mw/eid-mw-4.3.6.ebuild 
b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
new file mode 100644
index 000..b75d2070e20
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools mozextension 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="~x86 ~amd64 ~arm"
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+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 )
+   xpi? ( || ( >=www-client/firefox-bin-3.6.24
+   >=www-client/firefox-3.6.20 ) )"
+
+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
+
+   # 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 p11-kit p11kit) \
+   $(use_with gtk gtkvers 'detect') \
+   --with-gnu-ld \
+   --disable-static \
+   --disable-signed
+}
+
+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}/belgium...@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}/belgium...@eid.belgium.be"
+   fi
+   else
+   rm -r "${ED}"/usr/$(get_libdir)/mozilla || die
+   fi
+   rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
+
+   if use gtk; then
+   rm -r "${ED}/usr/include/eid-util" || die

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2018-01-12 Thread Amy Liffey
commit: f694b8d3b19e068ad9116dd89d0f72325ca00874
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Jan 12 16:49:05 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Jan 12 16:53:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f694b8d3

app-crypt/eid-mw: remove old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-crypt/eid-mw/Manifest|  1 -
 app-crypt/eid-mw/eid-mw-4.2.0.ebuild | 97 
 2 files changed, 98 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 29fb5147ce8..c383ae8d683 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,4 +1,3 @@
-DIST eid-mw-4.2.0.tar.gz 8508064 BLAKE2B 
bccca84b2ec08e4237816f61c0f2416325f4c34c66756f87c72208f5b79ebafffe91062f9fd3109562f0150793c1b849a5b57bd08533fbf4a8d0e78441131435
 SHA512 
c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f
 DIST eid-mw-4.2.5.tar.gz 7751526 BLAKE2B 
4836dc3a5ba4d781b8c342231cbbe74411fc6f0bf4b32eaa42ac28ea7688815361f74a1def371a05e250d3249af7ff58d24a66062fe169717872d6789ffb54f1
 SHA512 
cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 DIST eid-mw-4.2.8.tar.gz 7076407 BLAKE2B 
e1d9b375adb326cb710da9eb5cd125086cb40b6ee37ce2ac3912ac4b5fa9c92d66c8af002a47c9ce73ff98ad2306e96529e1c87486eb0f36e61a1f4eb2231b9f
 SHA512 
bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
 DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 
8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c
 SHA512 
336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b

diff --git a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild 
b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
deleted file mode 100644
index 3ca653162f9..000
--- a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools mozextension
-
-if [[ ${PV} == "" ]] ; 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
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
-
-HOMEPAGE="https://eid.belgium.be";
-
-IUSE="+dialogs +gtk p11-kit +xpi"
-
-REQUIRED_USE="
-   dialogs? ( gtk )"
-
-RDEPEND="gtk? (
-   x11-libs/gdk-pixbuf[jpeg]
-   x11-libs/gtk+:*
-   dev-libs/libxml2
-   net-misc/curl[ssl]
-   net-libs/libproxy
-   !app-misc/eid-viewer-bin
-   )
-   >=sys-apps/pcsc-lite-1.2.9
-   p11-kit? ( app-crypt/p11-kit )
-   xpi? ( || ( >=www-client/firefox-bin-3.6.24
-   >=www-client/firefox-3.6.20 ) )"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   eapply_user
-
-   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || 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
-
-   if [[ ${PV} == "" ]] ; then
-   use gtk || eapply "${FILESDIR}"/gtk_not_required_.patch
-   else
-   use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
-   fi
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable dialogs) \
-   $(use_enable p11-kit p11kit) \
-   --with-gnu-ld \
-   --disable-static \
-   --disable-signed
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-
-   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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
-   fi
-   if has_version '>=www-client/firefox-bin-3.6.24'; then
-   MOZILLA_FIVE_HOME="/opt/firefox"
-   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-4

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2018-01-12 Thread Amy Liffey
commit: 4288d7493b56b3db54abd330c62b15fd69158eb8
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Jan 12 16:50:08 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Jan 12 16:53:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4288d749

app-crypt/eid-mw: update live ebuild

Vincent Hardy  gmail.com>

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-crypt/eid-mw/eid-mw-.ebuild | 55 ++---
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 4b7c9eadb75..2b7c0eb2f88 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools mozextension multilib
+inherit autotools mozextension gnome2-utils
 
 if [[ ${PV} == "" ]] ; 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"
+   SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
KEYWORDS="~x86 ~amd64 ~arm"
 fi
 
-SLOT="0"
-LICENSE="LGPL-3"
 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
-
 HOMEPAGE="https://eid.belgium.be";
 
+LICENSE="LGPL-3"
+SLOT="0"
 IUSE="+dialogs +gtk p11-kit +xpi"
 
-REQUIRED_USE="
-   dialogs? ( gtk )"
-
-RDEPEND="gtk? (
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+   gtk? (
x11-libs/gdk-pixbuf[jpeg]
x11-libs/gtk+:*
dev-libs/libxml2
@@ -34,7 +30,6 @@ RDEPEND="gtk? (
net-libs/libproxy
!app-misc/eid-viewer-bin
)
-   >=sys-apps/pcsc-lite-1.2.9
p11-kit? ( app-crypt/p11-kit )
xpi? ( || ( >=www-client/firefox-bin-3.6.24
>=www-client/firefox-3.6.20 ) )"
@@ -42,8 +37,10 @@ RDEPEND="gtk? (
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
+REQUIRED_USE="dialogs? ( gtk )"
+
 src_prepare() {
-   eapply_user
+   default
 
sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
@@ -62,31 +59,45 @@ src_configure() {
econf \
$(use_enable dialogs) \
$(use_enable p11-kit p11kit) \
-   $(use_with gtk gtkvers)$(use gtk && echo =detect) \
+   $(use_with gtk gtkvers 'detect') \
--with-gnu-ld \
--disable-static \
--disable-signed
 }
 
 src_install() {
-   emake DESTDIR="${D}" 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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   xpi_install 
"${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
if has_version '>=www-client/firefox-bin-3.6.24'; then
MOZILLA_FIVE_HOME="/opt/firefox"
-   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   xpi_install 
"${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
+   else
+   rm -r "${ED}"/usr/$(get_libdir)/mozilla || die
+   fi
+   rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
+
+   if use gtk; then
+   rm -r "${ED}/usr/include/eid-util" || die
+   fi
+}
+
+pkg_postinst(){
+   if use gtk; then
+   gnome2_schemas_update
+   gnome2_icon_cache_update
fi
-   rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
-   use gtk || rm -r "${D}/usr/include/eid-util" || die
 }
 
-pkg_postinst()
-{
-   use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+pkg_postrm(){
+   if use gtk; then
+   gnome2_schemas_update
+   gnome2_icon_cache_update
+   fi
 }



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/

2017-06-28 Thread Amy Liffey
commit: 4f52555b9db0977023230e4520831272aeb8b0c4
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Jun 28 08:24:29 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Jun 28 08:27:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f52555b

app-crypt/eid-mw: version bump 4.2.8

Submitted-by: Vincent Hardy  gmail.com>

- fix bug 608450, usage of libressl instead of openssl

Submitted-by: Cédric Krier  gentoo.org>

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-crypt/eid-mw/Manifest   |  1 +
 app-crypt/eid-mw/eid-mw-4.2.8.ebuild| 95 +
 app-crypt/eid-mw/files/fix_libressl_check.patch | 45 
 3 files changed, 141 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 881a3d0dc69..be14ea38968 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 
4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 
c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f
 WHIRLPOOL 
b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
 DIST eid-mw-4.2.5.tar.gz 7751526 SHA256 
d2c46a65026790485f39db0b6d9b66a65b1d19061f3682a0b6da2e2b0c54bc81 SHA512 
cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 WHIRLPOOL 
c24186b1f2b6b02df4a790e3a8c3d1f8e762b1e556d8f55aeeb4523a71387045827b47444246334933fc3d746485ea14086cfe41c5ec23f43826e6a7375c7fc3
+DIST eid-mw-4.2.8.tar.gz 7076407 SHA256 
6b998bd14897f640e29f9140ee457ea963162a409c7aff646e3346b0b0ae2e65 SHA512 
bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
 WHIRLPOOL 
12f998d6065ed0eddbee5c6f99ef75f2bd3b3344314c7dd2e2e8a5652ea0f5adc9159af22d30ff8c4349bf75a71f982c26de886bf287d379fc99e5b341b4c303

diff --git a/app-crypt/eid-mw/eid-mw-4.2.8.ebuild 
b/app-crypt/eid-mw/eid-mw-4.2.8.ebuild
new file mode 100644
index 000..cadd463d766
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.8.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+   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
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
+
+HOMEPAGE="https://eid.belgium.be";
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+   dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+   x11-libs/gdk-pixbuf[jpeg]
+   x11-libs/gtk+:*
+   dev-libs/libxml2
+   net-misc/curl[ssl]
+   net-libs/libproxy
+   !app-misc/eid-viewer-bin
+   )
+   >=sys-apps/pcsc-lite-1.2.9
+   p11-kit? ( app-crypt/p11-kit )
+   xpi? ( || ( >=www-client/firefox-bin-3.6.24
+   >=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+src_prepare() {
+   eapply_user
+
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || 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
+
+   use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2_5.patch
+   eapply "${FILESDIR}"/fix_libressl_check.patch
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable dialogs) \
+   $(use_enable p11-kit p11kit) \
+   --with-gnu-ld \
+   --disable-static \
+   --disable-signed
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   fi
+   if has_version '>=www-client/firefox-bin-3.6.24'; then
+   MOZILLA_FIVE_HOME="/opt/firefox"
+   xpi_insta

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2017-06-28 Thread Amy Liffey
commit: e90698c633420aeeffe3b365383b189f2d771838
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Jun 28 08:10:35 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Jun 28 08:15:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90698c6

app-crypt/eid-mw: update live ebuild. Vincent Hardy

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-crypt/eid-mw/eid-mw-.ebuild|  7 +-
 app-crypt/eid-mw/files/gtk_not_required_.patch | 75 --
 2 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 0f64029e0d8..4ccf556d280 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -56,12 +56,6 @@ src_prepare() {
-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
plugins_tools/aboutmw/gtk/about-main.c || die
 
-   if [[ ${PV} == "" ]] ; then
-   use gtk || eapply "${FILESDIR}"/gtk_not_required_.patch
-   else
-   use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
-   fi
-
eautoreconf
 }
 
@@ -69,6 +63,7 @@ src_configure() {
econf \
$(use_enable dialogs) \
$(use_enable p11-kit p11kit) \
+   $(use_with gtk gtkvers)$(use gtk && echo =detect) \
--with-gnu-ld \
--disable-static \
--disable-signed

diff --git a/app-crypt/eid-mw/files/gtk_not_required_.patch 
b/app-crypt/eid-mw/files/gtk_not_required_.patch
deleted file mode 100644
index a1680c2353d..000
--- a/app-crypt/eid-mw/files/gtk_not_required_.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 393ecb3..0e14661 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh 
.version debian rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi
- 
- xpipackage:
-   $(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 02e4e36..86d607b 100644
 a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
-   dialogs/dialogsgtk/single_dialog.c
- endif
- 
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
- 
- if P11KIT
- dist_p11kitcf_DATA = beid.module
-@@ -176,30 +175,4 @@ install-exec-hook:
-   $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
- endif
- 
--beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src 
-I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_askpin_LDADD = @GTK_LIBS@
--
--beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-changepin.c
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
--beid_changepin_LDADD = @GTK_LIBS@
--
--beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-badpin.c
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
--beid_badpin_LDADD = @GTK_LIBS@
--
--beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askaccess.c
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
--beid_askaccess_LDADD = @GTK_LIBS@
--
--beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-askpin.c
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
--beid_spr_askpin_LDADD = @GTK_LIBS@
--
--beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-changepin.c
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
--beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
--
--SUBDIRS = dialogs/dialogsgtk/po
-diff --git a/configure.ac b/configure.ac
-index 9bf10f9..f0120b1 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -59,14 +59,6 @@ fi
- 
- AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
- 
--if test "$have_gtk" = "no"
--then
--  AC_MSG_ERR

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2017-04-12 Thread Amy Liffey
commit: e100d4676d821df59fe477088a28b1775c003149
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Apr 12 16:56:28 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Apr 12 16:59:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e100d467

app-crypt/eid-mw: version bump 4.2.5. Vincent Hardy

Package-Manager: portage-2.3.3

 app-crypt/eid-mw/Manifest  |  1 +
 app-crypt/eid-mw/eid-mw-4.2.5.ebuild   | 98 ++
 .../eid-mw/files/gtk_not_required_4_2_5.patch  | 75 +
 app-crypt/eid-mw/metadata.xml  |  2 +-
 4 files changed, 175 insertions(+), 1 deletion(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index d6c050028fb..881a3d0dc69 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 
4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 
c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f
 WHIRLPOOL 
b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
+DIST eid-mw-4.2.5.tar.gz 7751526 SHA256 
d2c46a65026790485f39db0b6d9b66a65b1d19061f3682a0b6da2e2b0c54bc81 SHA512 
cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 WHIRLPOOL 
c24186b1f2b6b02df4a790e3a8c3d1f8e762b1e556d8f55aeeb4523a71387045827b47444246334933fc3d746485ea14086cfe41c5ec23f43826e6a7375c7fc3

diff --git a/app-crypt/eid-mw/eid-mw-4.2.5.ebuild 
b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild
new file mode 100644
index 000..f77817c88b4
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+   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
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
+
+HOMEPAGE="https://eid.belgium.be";
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+   dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+   x11-libs/gdk-pixbuf[jpeg]
+   x11-libs/gtk+:*
+   dev-libs/libxml2
+   net-misc/curl[ssl]
+   net-libs/libproxy
+   !app-misc/eid-viewer-bin
+   )
+   >=sys-apps/pcsc-lite-1.2.9
+   p11-kit? ( app-crypt/p11-kit )
+   xpi? ( || ( >=www-client/firefox-bin-3.6.24
+   >=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+src_prepare() {
+   eapply_user
+
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || 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
+
+   if [[ ${PV} == "" ]] ; then
+   use gtk || eapply "${FILESDIR}"/gtk_not_required_.patch
+   else
+   use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2_5.patch
+   fi
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable dialogs) \
+   $(use_enable p11-kit p11kit) \
+   --with-gnu-ld \
+   --disable-static \
+   --disable-signed
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   fi
+   if has_version '>=www-client/firefox-bin-3.6.24'; then
+   MOZILLA_FIVE_HOME="/opt/firefox"
+   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   fi
+   fi
+   rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+   use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+   use

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/

2017-04-08 Thread Amy Liffey
commit: eaa706cbf986a2b286670f1a180f5886149bada0
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat Apr  8 08:04:42 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Apr  8 08:08:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa706cb

app-crypt/eid-mw: live ebuild patch updated. Vincent Hardy

Package-Manager: portage-2.3.0

 app-crypt/eid-mw/files/gtk_not_required_.patch | 31 +++---
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/app-crypt/eid-mw/files/gtk_not_required_.patch 
b/app-crypt/eid-mw/files/gtk_not_required_.patch
index 7990acaebdd..a1680c2353d 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_.patch
@@ -1,60 +1,61 @@
 diff --git a/Makefile.am b/Makefile.am
-index de5416f..8e55277 100644
+index 393ecb3..0e14661 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,7 @@
  ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian rpm doc
+ EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh 
.version debian rpm doc
  
 -SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi 
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util 
tests/unit plugins_tools/xpi
  
  xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage
 diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 6e33315..fce4494 100644
+index 02e4e36..86d607b 100644
 --- a/cardcomm/pkcs11/src/Makefile.am
 +++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
+@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
dialogs/dialogsgtk/single_dialog.c
  endif
  
 -libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
--
+ 
  if P11KIT
  dist_p11kitcf_DATA = beid.module
- install-exec-hook:
-@@ -176,28 +174,4 @@ install-exec-hook:
+@@ -176,30 +175,4 @@ install-exec-hook:
$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
  endif
  
 -beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src 
-I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src 
-I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
 -beid_askpin_LDADD = @GTK_LIBS@
 -
 -beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-changepin.c
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
 -beid_changepin_LDADD = @GTK_LIBS@
 -
 -beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-badpin.c
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
 -beid_badpin_LDADD = @GTK_LIBS@
 -
 -beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askaccess.c
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
 -beid_askaccess_LDADD = @GTK_LIBS@
 -
 -beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-askpin.c
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
 -beid_spr_askpin_LDADD = @GTK_LIBS@
 -
 -beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-changepin.c
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ 
-DDATAROOTDIR='"$(datarootdir)"'
 -beid_spr_changepin_LDADD = @GTK_LIBS@
 -
  pkgconfig_DATA=libbeidpkcs11.pc
+-
+-SUBDIRS = dialogs/dialogsgtk/po
 diff --git a/configure.ac b/configure.ac
-index 92bbb3b..a47e7c2 100644
+index 9bf10f9..f0120b1 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -59,

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2017-02-12 Thread Amy Liffey
commit: 5f98d057f9e43ec1ba03eb0751728099cc15511b
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Feb 12 16:17:00 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Feb 12 16:18:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f98d057

app-crypt/eid-mw: add missing dep bug #608434. Vincent Hardy

Package-Manager: portage-2.3.0

 app-crypt/eid-mw/eid-mw-4.2.0.ebuild | 1 +
 app-crypt/eid-mw/eid-mw-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild 
b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
index 2ff1843316..65f94c71bd 100644
--- a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
@@ -29,6 +29,7 @@ REQUIRED_USE="
dialogs? ( gtk )"
 
 RDEPEND="gtk? (
+   x11-libs/gdk-pixbuf[jpeg]
x11-libs/gtk+:*
dev-libs/libxml2
net-misc/curl[ssl]

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index c5f5f8f799..c6e513b86e 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -29,6 +29,7 @@ REQUIRED_USE="
dialogs? ( gtk )"
 
 RDEPEND="gtk? (
+   x11-libs/gdk-pixbuf[jpeg]
x11-libs/gtk+:*
dev-libs/libxml2
net-misc/curl[ssl]



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/

2017-02-04 Thread Amy Liffey
commit: 4da08d060ef1009569798c3d29ff94e7b56e62ae
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat Feb  4 16:47:43 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Feb  4 16:50:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da08d06

app-crypt/eid-mw: remove old. Vincent Hardy

Package-Manager: portage-2.3.0

 app-crypt/eid-mw/Manifest  |  3 -
 app-crypt/eid-mw/eid-mw-4.1.18.ebuild  | 83 --
 app-crypt/eid-mw/eid-mw-4.1.4.ebuild   | 79 
 app-crypt/eid-mw/eid-mw-4.1.9.ebuild   | 79 
 .../eid-mw/files/gtk_not_required_4.1.4.patch  | 60 
 app-crypt/eid-mw/files/not_zip_xpi_plugin.patch| 27 ---
 6 files changed, 331 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 0bea827..d6c0500 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,4 +1 @@
-DIST eid-mw-4.1.18-v4.1.18.tar.gz 3480541 SHA256 
abc9d3194008f05b2589ddd9a29c45d22d89716bdc8689fcec42b2aa8450ddbf SHA512 
18825a06007f7c07609cee034896ebf64b589200e04b72fece2bd65004a738c01cf64475d59f2c94b7242aa1adfc433bf4af6cf8b5d809746f3e9357ac27b98c
 WHIRLPOOL 
584817aff81a1e0b1af24e5b259fa7e40b5a43b27be701242430cdc480d8ba57205faeba6fb787f1321e02916e6f3efa722e01609151fa3798b8e37b13cb159e
-DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 
2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 
efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f
 WHIRLPOOL 
11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
-DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 
0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 
bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c
 WHIRLPOOL 
06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
 DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 
4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 
c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f
 WHIRLPOOL 
b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643

diff --git a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
deleted file mode 100644
index 815d376..
--- a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools mozextension multilib
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
-   https://github.com/Fedict/${PN}.git";
-   inherit git-2
-   SRC_URI=""
-else
-   MY_P="${P}-v${PV}"
-   SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz";
-   KEYWORDS="~x86 ~amd64 ~arm"
-   S="${WORKDIR}/${MY_P}"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
-
-HOMEPAGE="http://eid.belgium.be";
-
-IUSE="+gtk +xpi +dialogs"
-
-REQUIRED_USE="
-   dialogs? ( gtk )"
-
-RDEPEND="gtk? ( x11-libs/gtk+:= )
-   >=sys-apps/pcsc-lite-1.2.9
-   xpi? ( || ( >=www-client/firefox-bin-3.6.24
-   >=www-client/firefox-3.6.20 ) )
-   !app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
-
-   if [[ ${PV} == "" ]] ; then
-   # Only in current git. Hopefully, in next release.
-   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in 
|| die
-   fi
-
-   if [[ ${PV} == "" ]] || ! use gtk ; then
-   eautoreconf
-   fi
-}
-
-src_configure() {
-   econf \
-   $(use_enable dialogs) \
-   --with-gnu-ld \
-   --disable-static \
-   --disable-signed
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-
-   if [[ ${PV} != "" ]] ; then
-   # Automatically done in current git. Hopefully, in next release.
-   rm doc/sdk/include/rsaref220/win32.h || die
-   doheader -r doc/sdk/include/*
-   fi
-   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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2017-02-02 Thread Amy Liffey
commit: 209f44991bab243a5643b669da87ed9bbc752992
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Feb  2 15:23:44 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Feb  2 15:30:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209f4499

app-crypt/eid-mw: update live ebuild #607488. Vincent Hardy

Package-Manager: portage-2.3.0

 app-crypt/eid-mw/eid-mw-.ebuild| 67 --
 app-crypt/eid-mw/files/gtk_not_required_.patch | 19 +++---
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 57bb7b8..c5f5f8f 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-inherit autotools mozextension
+inherit eutils autotools mozextension multilib
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
@@ -12,10 +12,9 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
SRC_URI=""
 else
-   MY_P="${P}-v${PV}"
-   SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz";
+   SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
+   ${P}.tar.gz"
KEYWORDS="~x86 ~amd64 ~arm"
-   S="${WORKDIR}/${MY_P}"
 fi
 
 SLOT="0"
@@ -24,17 +23,22 @@ DESCRIPTION="Electronic Identity Card middleware supplied 
by the Belgian Federal
 
 HOMEPAGE="http://eid.belgium.be";
 
-IUSE="+gtk +xpi +dialogs"
+IUSE="+dialogs +gtk p11-kit +xpi"
 
 REQUIRED_USE="
dialogs? ( gtk )"
 
-RDEPEND="gtk? ( x11-libs/gtk+:= )
+RDEPEND="gtk? (
+   x11-libs/gtk+:*
+   dev-libs/libxml2
+   net-misc/curl[ssl]
+   net-libs/libproxy
+   !app-misc/eid-viewer-bin
+   )
>=sys-apps/pcsc-lite-1.2.9
-   net-libs/libproxy
+   p11-kit? ( app-crypt/p11-kit )
xpi? ( || ( >=www-client/firefox-bin-3.6.24
-   >=www-client/firefox-3.6.20 ) )
-   !app-misc/beid-runtime"
+   >=www-client/firefox-3.6.20 ) )"
 
 DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -42,28 +46,30 @@ DEPEND="${RDEPEND}
 src_prepare() {
eapply_user
 
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || 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
+
if [[ ${PV} == "" ]] ; then
use gtk || eapply "${FILESDIR}"/gtk_not_required_.patch
-
-   # Only in current git. Hopefully, in next release.
-   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in 
|| die
else
-   use gtk || eapply "${FILESDIR}"/gtk_not_required_4.1.4.patch
-   fi
-
-   if [[ ${PV} == "" ]] || ! use gtk ; then
-   eautoreconf
+   use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
fi
 
-   # Do that after autoreconf (if autoreconf is required)
-   # This patch is not mandatory, it's just to do things properly :-)
-   eapply "${FILESDIR}"/not_zip_xpi_plugin.patch
+   eautoreconf
 }
 
 src_configure() {
econf \
$(use_enable dialogs) \
+   $(use_enable p11-kit p11kit) \
+   --with-gnu-ld \
--disable-static \
--disable-signed
 }
@@ -71,21 +77,22 @@ src_configure() {
 src_install() {
emake DESTDIR="${D}" install
 
-   if [[ ${PV} != "" ]] ; then
-   # Automatically done in current git. Hopefully, in next release.
-   rm doc/sdk/include/rsaref220/win32.h || die
-   doheader -r doc/sdk/include/*
-   fi
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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
if has_version '>=www-client/firefox-bin-3.6.24'; then
MOZILLA_FIVE_HOME="/opt/firefox"
-   xpi_install 
"${D}/usr/share/mozilla/extensions

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2017-02-02 Thread Amy Liffey
commit: cad92e97469bebb918f4b2e3e47b7a8e7cad381d
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Feb  2 14:42:55 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Feb  2 14:55:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad92e97

app-crypt/eid-mw: ver bump 4.2.0 bug #607206. Vincent Hardy

Package-Manager: portage-2.3.0

 app-crypt/eid-mw/Manifest |  1 +
 app-crypt/eid-mw/eid-mw-4.2.0.ebuild  | 98 +++
 app-crypt/eid-mw/files/gtk_not_required_4_2.patch | 74 +
 app-crypt/eid-mw/metadata.xml |  3 +
 4 files changed, 176 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 0d8cca6..0bea827 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,4 @@
 DIST eid-mw-4.1.18-v4.1.18.tar.gz 3480541 SHA256 
abc9d3194008f05b2589ddd9a29c45d22d89716bdc8689fcec42b2aa8450ddbf SHA512 
18825a06007f7c07609cee034896ebf64b589200e04b72fece2bd65004a738c01cf64475d59f2c94b7242aa1adfc433bf4af6cf8b5d809746f3e9357ac27b98c
 WHIRLPOOL 
584817aff81a1e0b1af24e5b259fa7e40b5a43b27be701242430cdc480d8ba57205faeba6fb787f1321e02916e6f3efa722e01609151fa3798b8e37b13cb159e
 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 
2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 
efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f
 WHIRLPOOL 
11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
 DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 
0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 
bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c
 WHIRLPOOL 
06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
+DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 
4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 
c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f
 WHIRLPOOL 
b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643

diff --git a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild 
b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
new file mode 100644
index ..2ff1843
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+   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
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
+
+HOMEPAGE="http://eid.belgium.be";
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+   dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+   x11-libs/gtk+:*
+   dev-libs/libxml2
+   net-misc/curl[ssl]
+   net-libs/libproxy
+   !app-misc/eid-viewer-bin
+   )
+   >=sys-apps/pcsc-lite-1.2.9
+   p11-kit? ( app-crypt/p11-kit )
+   xpi? ( || ( >=www-client/firefox-bin-3.6.24
+   >=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+src_prepare() {
+   eapply_user
+
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || 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
+
+   if [[ ${PV} == "" ]] ; then
+   use gtk || eapply "${FILESDIR}"/gtk_not_required_.patch
+   else
+   use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
+   fi
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable dialogs) \
+   $(use_enable p11-kit p11kit) \
+   --with-gnu-ld \
+   --disable-static \
+   --disable-signed
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   if use xpi; then
+   declare MOZILLA_FIVE_HOME
+   if has_version '>=www-client/firefox-3.6.20'; then
+   MOZILLA_FIVE_HOME

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2016-09-11 Thread Amy Winston
commit: 4220207b1b8a08c8627ce47465f96c060217c714
Author: Amy Winston  gentoo  org>
AuthorDate: Sun Sep 11 10:16:26 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Sun Sep 11 10:16:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4220207b

app-crypt/eid-mw: version bump 4.1.18 bug #593302. Vincent Hardy

Package-Manager: portage-2.2.28

 app-crypt/eid-mw/Manifest |  1 +
 app-crypt/eid-mw/eid-mw-4.1.18.ebuild | 83 +++
 2 files changed, 84 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index d02c45b..0d8cca6 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
+DIST eid-mw-4.1.18-v4.1.18.tar.gz 3480541 SHA256 
abc9d3194008f05b2589ddd9a29c45d22d89716bdc8689fcec42b2aa8450ddbf SHA512 
18825a06007f7c07609cee034896ebf64b589200e04b72fece2bd65004a738c01cf64475d59f2c94b7242aa1adfc433bf4af6cf8b5d809746f3e9357ac27b98c
 WHIRLPOOL 
584817aff81a1e0b1af24e5b259fa7e40b5a43b27be701242430cdc480d8ba57205faeba6fb787f1321e02916e6f3efa722e01609151fa3798b8e37b13cb159e
 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 
2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 
efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f
 WHIRLPOOL 
11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
 DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 
0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 
bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c
 WHIRLPOOL 
06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9

diff --git a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
new file mode 100644
index ..815d376
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools mozextension multilib
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+   https://github.com/Fedict/${PN}.git";
+   inherit git-2
+   SRC_URI=""
+else
+   MY_P="${P}-v${PV}"
+   SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz";
+   KEYWORDS="~x86 ~amd64 ~arm"
+   S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
+
+HOMEPAGE="http://eid.belgium.be";
+
+IUSE="+gtk +xpi +dialogs"
+
+REQUIRED_USE="
+   dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:= )
+   >=sys-apps/pcsc-lite-1.2.9
+   xpi? ( || ( >=www-client/firefox-bin-3.6.24
+   >=www-client/firefox-3.6.20 ) )
+   !app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+src_prepare() {
+   use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
+
+   if [[ ${PV} == "" ]] ; then
+   # Only in current git. Hopefully, in next release.
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in 
|| die
+   fi
+
+   if [[ ${PV} == "" ]] || ! use gtk ; then
+   eautoreconf
+   fi
+}
+
+src_configure() {
+   econf \
+   $(use_enable dialogs) \
+   --with-gnu-ld \
+   --disable-static \
+   --disable-signed
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   if [[ ${PV} != "" ]] ; then
+   # Automatically done in current git. Hopefully, in next release.
+   rm doc/sdk/include/rsaref220/win32.h || die
+   doheader -r doc/sdk/include/*
+   fi
+   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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   fi
+   if has_version '>=www-client/firefox-bin-3.6.24'; then
+   MOZILLA_FIVE_HOME="/opt/firefox"
+   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   fi
+   fi
+   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
+}



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2016-07-01 Thread Amy Winston
commit: 7ddb1664d1b0617b80daefb967d3a7764798e677
Author: Amy Winston  gentoo  org>
AuthorDate: Fri Jul  1 17:12:19 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Fri Jul  1 17:12:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ddb1664

app-crypt/eid-mw: add missing dies

Package-Manager: portage-2.2.28

 app-crypt/eid-mw/eid-mw-4.1.4.ebuild | 12 ++--
 app-crypt/eid-mw/eid-mw-4.1.9.ebuild | 12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
index 0e40e87..2cf391e 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@ IUSE="+gtk +xpi +dialogs"
 REQUIRED_USE="
dialogs? ( gtk )"
 
-RDEPEND="gtk? ( x11-libs/gtk+:* )
+RDEPEND="gtk? ( x11-libs/gtk+:= )
>=sys-apps/pcsc-lite-1.2.9
xpi? ( || ( >=www-client/firefox-bin-3.6.24
>=www-client/firefox-3.6.20 ) )
@@ -43,8 +43,8 @@ src_prepare() {
 
if [[ ${PV} == "" ]] ; then
# Only in current git. Hopefully, in next release.
-   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
-   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in 
|| die
fi
 
if [[ ${PV} == "" ]] || ! use gtk ; then
@@ -61,7 +61,7 @@ src_install() {
 
if [[ ${PV} != "" ]] ; then
# Automatically done in current git. Hopefully, in next release.
-   rm doc/sdk/include/rsaref220/win32.h
+   rm doc/sdk/include/rsaref220/win32.h || die
doheader -r doc/sdk/include/*
fi
if use xpi; then
@@ -75,5 +75,5 @@ src_install() {
xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
fi
-   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
 }

diff --git a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
index f748be3..aa57f80 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,7 +29,7 @@ IUSE="+gtk +xpi +dialogs"
 REQUIRED_USE="
dialogs? ( gtk )"
 
-RDEPEND="gtk? ( x11-libs/gtk+:* )
+RDEPEND="gtk? ( x11-libs/gtk+:= )
>=sys-apps/pcsc-lite-1.2.9
xpi? ( || ( >=www-client/firefox-bin-3.6.24
>=www-client/firefox-3.6.20 ) )
@@ -43,8 +43,8 @@ src_prepare() {
 
if [[ ${PV} == "" ]] ; then
# Only in current git. Hopefully, in next release.
-   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
-   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in 
|| die
fi
 
if [[ ${PV} == "" ]] || ! use gtk ; then
@@ -61,7 +61,7 @@ src_install() {
 
if [[ ${PV} != "" ]] ; then
# Automatically done in current git. Hopefully, in next release.
-   rm doc/sdk/include/rsaref220/win32.h
+   rm doc/sdk/include/rsaref220/win32.h || die
doheader -r doc/sdk/include/*
fi
if use xpi; then
@@ -75,5 +75,5 @@ src_install() {
xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
fi
-   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
 }



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/

2016-07-01 Thread Amy Winston
commit: 99bc8b5524ba2542b22b81c8d5c1a4b431c23573
Author: Amy Winston  gentoo  org>
AuthorDate: Fri Jul  1 17:04:03 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Fri Jul  1 17:04:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bc8b55

app-crypt/eid-mw: eapi update bug #587250 by Vincent Hardy

- Move to EAPI 6
- add 1 new dependency
- patch update gtk_not_required_.patch
- add new patch not_zip_xpi_plugin.patch
- add missing die

Package-Manager: portage-2.2.28

 app-crypt/eid-mw/eid-mw-.ebuild| 38 ++
 app-crypt/eid-mw/files/gtk_not_required_.patch | 22 ++---
 app-crypt/eid-mw/files/not_zip_xpi_plugin.patch| 27 +++
 3 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 2424341..57bb7b8 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils autotools mozextension multilib
+inherit autotools mozextension
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
https://github.com/Fedict/${PN}.git";
-   inherit git-2
+   inherit git-r3
SRC_URI=""
 else
MY_P="${P}-v${PV}"
@@ -29,8 +29,9 @@ IUSE="+gtk +xpi +dialogs"
 REQUIRED_USE="
dialogs? ( gtk )"
 
-RDEPEND="gtk? ( x11-libs/gtk+:* )
+RDEPEND="gtk? ( x11-libs/gtk+:= )
>=sys-apps/pcsc-lite-1.2.9
+   net-libs/libproxy
xpi? ( || ( >=www-client/firefox-bin-3.6.24
>=www-client/firefox-3.6.20 ) )
!app-misc/beid-runtime"
@@ -39,21 +40,32 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 src_prepare() {
-   use gtk || epatch "${FILESDIR}"/gtk_not_required_.patch
+   eapply_user
 
if [[ ${PV} == "" ]] ; then
+   use gtk || eapply "${FILESDIR}"/gtk_not_required_.patch
+
# Only in current git. Hopefully, in next release.
-   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
-   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in 
|| die
+   else
+   use gtk || eapply "${FILESDIR}"/gtk_not_required_4.1.4.patch
fi
 
if [[ ${PV} == "" ]] || ! use gtk ; then
eautoreconf
fi
+
+   # Do that after autoreconf (if autoreconf is required)
+   # This patch is not mandatory, it's just to do things properly :-)
+   eapply "${FILESDIR}"/not_zip_xpi_plugin.patch
 }
 
 src_configure() {
-   econf $(use_enable dialogs) --disable-static
+   econf \
+   $(use_enable dialogs) \
+   --disable-static \
+   --disable-signed
 }
 
 src_install() {
@@ -61,19 +73,19 @@ src_install() {
 
if [[ ${PV} != "" ]] ; then
# Automatically done in current git. Hopefully, in next release.
-   rm doc/sdk/include/rsaref220/win32.h
+   rm doc/sdk/include/rsaref220/win32.h || die
doheader -r doc/sdk/include/*
fi
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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
if has_version '>=www-client/firefox-bin-3.6.24'; then
MOZILLA_FIVE_HOME="/opt/firefox"
-   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
fi
fi
-   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
 }

diff --git a/app-crypt/eid-mw/files/gtk_not_required_.patch 
b/app-crypt/eid-mw/files/gtk_not_required_.patch
index d5d6f1c..f66ec18 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_.patch
@@ -1,13 +1,13 @@
 diff --git a/Makefile.am b/Makefile.am
-index 1a605f7..6475886 100644
+index 65baf07..c264576 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,7 @@
  ACLOCAL_AMFLAG

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2016-04-18 Thread Patrice Clement
commit: 4edb1a02d0043ebff6db38f5541042ab46ecdb59
Author: Patrice Clement  gentoo  org>
AuthorDate: Mon Apr 18 06:28:11 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Apr 18 07:57:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4edb1a02

app-crypt/eid-mw: Fix metadata.xml file.

Package-Manager: portage-2.2.26

 app-crypt/eid-mw/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 8af6d04..fa22337 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -23,10 +23,10 @@ These three functions form the basis of the countless 
applications for your eID.
 
 
   
-All dialogs are available, by using x11-libs/gtk+:*
+All dialogs are available, by using x11-libs/gtk+
   
   
-Enable "askaccess" dialog box, by using x11-libs/gtk+:*
+Enable "askaccess" dialog box, by using x11-libs/gtk+
   

 Build and install an extension for Mozilla browsers.



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/

2016-03-20 Thread Ian Delaney
commit: e44f81f16070ab97ceb88211c4adc250d67dfdd3
Author: Ian Delaney  gentoo  org>
AuthorDate: Sun Mar 20 10:08:33 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Mar 20 14:44:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44f81f1

app-crypt/eid-mw: rm old and related patches

Removed files requested byt the proxy maintianer via the

Gentoo-bug: #577642

Package-Manager: portage-2.2.28

 app-crypt/eid-mw/Manifest  |  2 -
 app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild | 65 --
 app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild | 62 -
 .../eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch  | 38 -
 app-crypt/eid-mw/files/fix-nodialog-bug.patch  | 20 ---
 5 files changed, 187 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c44af1a..d02c45b 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,4 +1,2 @@
-DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 
1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 
4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b
 WHIRLPOOL 
cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
-DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 
1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 
511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104
 WHIRLPOOL 
b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 
2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 
efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f
 WHIRLPOOL 
11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
 DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 
0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 
bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c
 WHIRLPOOL 
06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9

diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild 
b/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild
deleted file mode 100644
index 300793e..000
--- a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator mozextension multilib
-
-if [[ ${PV} == "" ]] ; then
-   ESVN_REPO_URI="https://eid-mw.googlecode.com/svn/trunk/";
-   inherit subversion autotools
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_p/-}"
-   SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-250016.gz 
-> ${MY_P}.tar.gz"
-   KEYWORDS="~x86 ~amd64"
-   S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the 
Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be";
-
-IUSE="+gtk +xpi"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-   >=sys-apps/pcsc-lite-1.2.9
-   xpi? ( || ( >=www-client/firefox-bin-3.6.24
-   >=www-client/firefox-3.6.20 ) )
-   !app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-if [[ ${PV} == "" ]]; then
-   src_prepare() {
-   eautoreconf
-   }
-else
-   src_prepare() {
-   epatch "${FILESDIR}"/fix-nodialog-bug.patch
-   }
-fi
-
-src_configure() {
-   econf $(use_enable gtk dialogs) --disable-static
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
-   fi
-   if has_version '>=www-client/firefox-bin-3.6.24'; then
-   MOZILLA_FIVE_HOME="/opt/firefox"
-   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
-   fi
-   fi
-   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
-}

diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild 
b/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
deleted fil

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/

2016-03-19 Thread Ian Delaney
commit: 64f91d4811beb99d9bcdf37bc18d7221bf1add4d
Author: Ian Delaney  gentoo  org>
AuthorDate: Thu Mar 17 04:56:13 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Thu Mar 17 05:07:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f91d48

app-crypt/eid-mw: update to gtk_not_required_.patch in live ebuild

patch supplied by maintainer via email

Package-Manager: portage-2.2.26

 app-crypt/eid-mw/files/gtk_not_required_.patch | 43 --
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/app-crypt/eid-mw/files/gtk_not_required_.patch 
b/app-crypt/eid-mw/files/gtk_not_required_.patch
index 93ddc67..d5d6f1c 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_.patch
@@ -12,48 +12,38 @@ index 1a605f7..6475886 100644
  xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage
 diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index b70e7f2..066c348 100644
+index 6e33315..fce4494 100644
 --- a/cardcomm/pkcs11/src/Makefile.am
 +++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,30 +165,30 @@ libbeidpkcs11_la_SOURCES += \
+@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
dialogs/dialogsgtk/single_dialog.c
  endif
  
 -libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
-+#libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
+-
+ if P11KIT
+ dist_p11kitcf_DATA = beid.module
+ install-exec-hook:
+@@ -176,28 +174,4 @@ install-exec-hook:
+   $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
+ endif
  
 -beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
 -beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src 
-I$(srcdir)/src @GTK_CFLAGS@
 -beid_askpin_LDADD = @GTK_LIBS@
-+#beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
-+#beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src 
-I$(srcdir)/src @GTK_CFLAGS@
-+#beid_askpin_LDADD = @GTK_LIBS@
-+#
-+#beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-changepin.c
-+#beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-+#beid_changepin_LDADD = @GTK_LIBS@
- 
+-
 -beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-changepin.c
 -beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_changepin_LDADD = @GTK_LIBS@
-+#beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-badpin.c
-+#beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-+#beid_badpin_LDADD = @GTK_LIBS@
- 
+-
 -beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-badpin.c
 -beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_badpin_LDADD = @GTK_LIBS@
-+#beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askaccess.c
-+#beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-+#beid_askaccess_LDADD = @GTK_LIBS@
- 
+-
 -beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askaccess.c
 -beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_askaccess_LDADD = @GTK_LIBS@
-+#beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-askpin.c
-+#beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-+#beid_spr_askpin_LDADD = @GTK_LIBS@
- 
+-
 -beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-askpin.c
 -beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_spr_askpin_LDADD = @GTK_LIBS@
@@ -61,13 +51,10 @@ index b70e7f2..066c348 100644
 -beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-changepin.c
 -beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_spr_changepin_LDADD = @GTK_LIBS@
-+#beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-changepin.c
-+#beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-+#beid_spr_changepin_LDADD = @GTK_LIBS@
- 
+-
  pkgconfig_DATA=libbeidpkcs11.pc
 diff --git a/configure.ac b/configure.ac
-index 102c1c7..efdf0e2 100644
+index 6f4b833..ec7ae8f 100644
 --- a/configur

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2015-11-14 Thread Ian Delaney
commit: 7f9ea004e09fbf082532931934f87a6e8e0493bf
Author: Ian Delaney  gentoo  org>
AuthorDate: Sat Nov 14 14:58:33 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sat Nov 14 14:59:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9ea004

app-crypt/eid-mw: revise and correct patches

Patches apply to versions 4.1.4, 4.1.9 and the live ebuild,
supplied by proxy maintainer sourced from the gentoo bug

Gentoo bug: #564582

Package-Manager: portage-2.2.24

 app-crypt/eid-mw/eid-mw-4.1.4.ebuild   |  2 +-
 app-crypt/eid-mw/eid-mw-4.1.9.ebuild   |  2 +-
 app-crypt/eid-mw/eid-mw-.ebuild|  4 +-
 .../eid-mw/files/gtk_not_required_4.1.4.patch  | 48 ++
 app-crypt/eid-mw/files/gtk_not_required_.patch | 36 
 5 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
index 5b16967..0e40e87 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
@@ -20,7 +20,7 @@ fi
 
 SLOT="0"
 LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian 
Federal Government"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
 
 HOMEPAGE="http://eid.belgium.be";
 

diff --git a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
index 6055c30..f748be3 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
@@ -20,7 +20,7 @@ fi
 
 SLOT="0"
 LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian 
Federal Government"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
 
 HOMEPAGE="http://eid.belgium.be";
 

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index b6a8553..2424341 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -20,7 +20,7 @@ fi
 
 SLOT="0"
 LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the 
Belgian Federal Government"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian 
Federal Government"
 
 HOMEPAGE="http://eid.belgium.be";
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 src_prepare() {
-   use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
+   use gtk || epatch "${FILESDIR}"/gtk_not_required_.patch
 
if [[ ${PV} == "" ]] ; then
# Only in current git. Hopefully, in next release.

diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch 
b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
index ba4d4b1..137ef8e 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
@@ -1,24 +1,11 @@
-diff --git a/Makefile.am b/Makefile.am
-index 1a605f7..6475886 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit 
plugins_tools/xpi plugins_tools/aboutmw/gtk
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit 
plugins_tools/xpi
- 
- xpipackage:
-   $(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index b70e7f2..ac38944 100644
 a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
+diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am 
eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
+--- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am  2015-07-27 
10:30:34.638418958 +0200
 eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am  2015-08-13 
14:12:43.827586821 +0200
+@@ -164,29 +164,3 @@
+   dialogs/dialogsgtk/dlgs_gtk.cpp \
dialogs/dialogsgtk/single_dialog.c
  endif
- 
+-
 -libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
 -
 -beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
@@ -44,13 +31,10 @@ index b70e7f2..ac38944 100644
 -beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-changepin.c
 -beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
-diff --git a/configure.ac b/configure.ac
-index 102c1c7..efdf0e2 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -56,11 +56,6 @@ then
+diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
+--- eid-mw-4.1.4-v4.1.4-a/configure.ac 2015-07-27 10:30:34.64175

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

2015-11-11 Thread Ian Delaney
commit: 729b379693223cbb8a3c94b2932fdc209000ee04
Author: Ian Delaney  gentoo  org>
AuthorDate: Wed Nov 11 17:04:31 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Nov 11 17:10:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=729b3796

app-crypt/eid-mw: bump to 4.1.9 wrt the gentoo bug, missed in previous commit

Also Reduced DESCRIPTION to < 80 chars fixing the QA violation in only recent
two versions. ebuild by proxy maintainer via the gentoo bug

Gentoo bug: #564582

Package-Manager: portage-2.2.24

 app-crypt/eid-mw/Manifest | 1 +
 app-crypt/eid-mw/eid-mw-4.1.4.ebuild  | 2 +-
 app-crypt/eid-mw/{eid-mw-4.1.4.ebuild => eid-mw-4.1.9.ebuild} | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 9f67898..c44af1a 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,4 @@
 DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 
1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 
4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b
 WHIRLPOOL 
cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
 DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 
1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 
511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104
 WHIRLPOOL 
b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 
2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 
efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f
 WHIRLPOOL 
11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
+DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 
0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 
bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c
 WHIRLPOOL 
06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9

diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
index 06e154c..5b16967 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
@@ -20,7 +20,7 @@ fi
 
 SLOT="0"
 LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the 
Belgian Federal Government"
+DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian 
Federal Government"
 
 HOMEPAGE="http://eid.belgium.be";
 

diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
similarity index 87%
copy from app-crypt/eid-mw/eid-mw-4.1.4.ebuild
copy to app-crypt/eid-mw/eid-mw-4.1.9.ebuild
index 06e154c..6055c30 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
@@ -13,14 +13,14 @@ if [[ ${PV} == "" ]] ; then
SRC_URI=""
 else
MY_P="${P}-v${PV}"
-   SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz 
-> ${MY_P}.tar.gz"
+   SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz";
KEYWORDS="~x86 ~amd64 ~arm"
S="${WORKDIR}/${MY_P}"
 fi
 
 SLOT="0"
 LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the 
Belgian Federal Government"
+DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian 
Federal Government"
 
 HOMEPAGE="http://eid.belgium.be";
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 src_prepare() {
-   use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+   use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
 
if [[ ${PV} == "" ]] ; then
# Only in current git. Hopefully, in next release.



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2015-11-08 Thread Ian Delaney
commit: 5785246ea4ed856768181f6bbc5550be6950ef2d
Author: Ian Delaney  gentoo  org>
AuthorDate: Sun Nov  8 07:38:05 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Mon Nov  9 02:54:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5785246e

app-crypt/eid-mw: add gtk_not_required_4.1.4.patch addressing issue in gentoo 
bug

Submitted by proxy maintainer via the gentoo bug

Gentoo bug: #564582

Package-Manager: portage-2.2.23

 app-crypt/eid-mw/eid-mw-.ebuild|  4 +-
 .../eid-mw/files/gtk_not_required_4.1.4.patch  | 48 --
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 06e154c..b6a8553 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
SRC_URI=""
 else
MY_P="${P}-v${PV}"
-   SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz 
-> ${MY_P}.tar.gz"
+   SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz";
KEYWORDS="~x86 ~amd64 ~arm"
S="${WORKDIR}/${MY_P}"
 fi
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
 
 src_prepare() {
-   use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+   use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
 
if [[ ${PV} == "" ]] ; then
# Only in current git. Hopefully, in next release.

diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch 
b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
index 137ef8e..ba4d4b1 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
@@ -1,11 +1,24 @@
-diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am 
eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
 eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am  2015-07-27 
10:30:34.638418958 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am  2015-08-13 
14:12:43.827586821 +0200
-@@ -164,29 +164,3 @@
-   dialogs/dialogsgtk/dlgs_gtk.cpp \
+diff --git a/Makefile.am b/Makefile.am
+index 1a605f7..6475886 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
+ 
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit 
plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit 
plugins_tools/xpi
+ 
+ xpipackage:
+   $(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index b70e7f2..ac38944 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
 b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
dialogs/dialogsgtk/single_dialog.c
  endif
--
+ 
 -libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
 -
 -beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
@@ -31,10 +44,13 @@ diff -ur 
eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1
 -beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-spr-changepin.c
 -beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
 -beid_spr_changepin_LDADD = @GTK_LIBS@
-diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
 eid-mw-4.1.4-v4.1.4-a/configure.ac 2015-07-27 10:30:34.641752294 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/configure.ac 2015-08-13 14:13:51.456736608 +0200
-@@ -55,11 +55,6 @@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+diff --git a/configure.ac b/configure.ac
+index 102c1c7..efdf0e2 100644
+--- a/configure.ac
 b/configure.ac
+@@ -56,11 +56,6 @@ then
fi
  fi
  
@@ -46,15 +62,3 @@ diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac 
eid-mw-4.1.4-v4.1.4-b/configure.ac
  ###
  ### read user-specific requests from --enable directives ##
  ###
-diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
 eid-mw-4.1.4-v4.1.4-a/Makefile.am  2015-07-27 10:30:34.638418958 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/Makefile.am  2015-08-13 14:11:43.878340486 +0200
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi 
plugins_tools/aboutmw/gtk
-+SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
- 
- xpipackage:
-   $(MAKE) -C plugins_tools/xpi xpipackage



[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/

2015-08-16 Thread Sven Vermeulen
commit: 1bfbafda280c28e50b577c835d9fdb42376d1021
Author: Sven Vermeulen  gentoo  org>
AuthorDate: Sun Aug 16 18:10:57 2015 +
Commit: Sven Vermeulen  gentoo  org>
CommitDate: Sun Aug 16 18:16:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfbafda

app-crypt/eid-mw: Version bump to 4.1.4

As provided by Vincent Hardy, this brings eid-mw to version 4.1.4

Gentoo-Bug: 557604

Package-Manager: portage-2.2.20.1

 app-crypt/eid-mw/Manifest  |  1 +
 app-crypt/eid-mw/eid-mw-4.1.4.ebuild   | 79 ++
 .../eid-mw/files/gtk_not_required_4.1.4.patch  | 60 
 3 files changed, 140 insertions(+)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index b5b1c58..9f67898 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 
1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 
4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b
 WHIRLPOOL 
cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
 DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 
1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 
511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104
 WHIRLPOOL 
b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
+DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 
2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 
efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f
 WHIRLPOOL 
11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398

diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild 
b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
new file mode 100644
index 000..06e154c
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools mozextension multilib
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+   https://github.com/Fedict/${PN}.git";
+   inherit git-2
+   SRC_URI=""
+else
+   MY_P="${P}-v${PV}"
+   SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz 
-> ${MY_P}.tar.gz"
+   KEYWORDS="~x86 ~amd64 ~arm"
+   S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the 
Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be";
+
+IUSE="+gtk +xpi +dialogs"
+
+REQUIRED_USE="
+   dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:* )
+   >=sys-apps/pcsc-lite-1.2.9
+   xpi? ( || ( >=www-client/firefox-bin-3.6.24
+   >=www-client/firefox-3.6.20 ) )
+   !app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+src_prepare() {
+   use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+
+   if [[ ${PV} == "" ]] ; then
+   # Only in current git. Hopefully, in next release.
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+   fi
+
+   if [[ ${PV} == "" ]] || ! use gtk ; then
+   eautoreconf
+   fi
+}
+
+src_configure() {
+   econf $(use_enable dialogs) --disable-static
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   if [[ ${PV} != "" ]] ; then
+   # Automatically done in current git. Hopefully, in next release.
+   rm doc/sdk/include/rsaref220/win32.h
+   doheader -r doc/sdk/include/*
+   fi
+   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 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   fi
+   if has_version '>=www-client/firefox-bin-3.6.24'; then
+   MOZILLA_FIVE_HOME="/opt/firefox"
+   xpi_install 
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgium...@eid.belgium.be"
+   fi
+   fi
+   rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}

diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch 
b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
new fi

[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

2015-08-16 Thread Sven Vermeulen
commit: 4a2f76fd85afb8c3b4fbdf67153378894bc2b821
Author: Sven Vermeulen  gentoo  org>
AuthorDate: Sun Aug 16 18:08:07 2015 +
Commit: Sven Vermeulen  gentoo  org>
CommitDate: Sun Aug 16 18:16:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2f76fd

app-crypt/eid-mw: Update - to drop gtk requirement in newest builds

Provided by Vincent Hardy, this patches the live ebuild to drop the gtk
requirement from the code. It also includes the pkgconfig file.

Gentoo-Bug: 557604

Package-Manager: portage-2.2.20.1

 app-crypt/eid-mw/eid-mw-.ebuild| 43 ++-
 app-crypt/eid-mw/files/gtk_not_required_.patch | 64 ++
 app-crypt/eid-mw/metadata.xml  |  7 ++-
 3 files changed, 99 insertions(+), 15 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-.ebuild 
b/app-crypt/eid-mw/eid-mw-.ebuild
index 9ef575a..06e154c 100644
--- a/app-crypt/eid-mw/eid-mw-.ebuild
+++ b/app-crypt/eid-mw/eid-mw-.ebuild
@@ -4,18 +4,18 @@
 
 EAPI=5
 
-inherit eutils versionator mozextension multilib
+inherit eutils autotools mozextension multilib
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
https://github.com/Fedict/${PN}.git";
-   inherit git-2 autotools
+   inherit git-2
SRC_URI=""
 else
-   MY_P="${PN}-${PV/_p/-}"
-   SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz 
-> ${MY_P}.tar.gz"
-   KEYWORDS="~x86 ~amd64"
-   S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
+   MY_P="${P}-v${PV}"
+   SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz 
-> ${MY_P}.tar.gz"
+   KEYWORDS="~x86 ~amd64 ~arm"
+   S="${WORKDIR}/${MY_P}"
 fi
 
 SLOT="0"
@@ -24,9 +24,12 @@ DESCRIPTION="Belgian Electronic Identity Card middleware 
supplied by the Belgian
 
 HOMEPAGE="http://eid.belgium.be";
 
-IUSE="+gtk +xpi"
+IUSE="+gtk +xpi +dialogs"
 
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE="
+   dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:* )
>=sys-apps/pcsc-lite-1.2.9
xpi? ( || ( >=www-client/firefox-bin-3.6.24
>=www-client/firefox-3.6.20 ) )
@@ -35,18 +38,32 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 )
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
-if [[ ${PV} == "" ]]; then
-   src_prepare() {
+src_prepare() {
+   use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+
+   if [[ ${PV} == "" ]] ; then
+   # Only in current git. Hopefully, in next release.
+   sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
+   sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+   fi
+
+   if [[ ${PV} == "" ]] || ! use gtk ; then
eautoreconf
-   }
-fi
+   fi
+}
 
 src_configure() {
-   econf $(use_enable gtk dialogs) --disable-static
+   econf $(use_enable dialogs) --disable-static
 }
 
 src_install() {
emake DESTDIR="${D}" install
+
+   if [[ ${PV} != "" ]] ; then
+   # Automatically done in current git. Hopefully, in next release.
+   rm doc/sdk/include/rsaref220/win32.h
+   doheader -r doc/sdk/include/*
+   fi
if use xpi; then
declare MOZILLA_FIVE_HOME
if has_version '>=www-client/firefox-3.6.20'; then

diff --git a/app-crypt/eid-mw/files/gtk_not_required_.patch 
b/app-crypt/eid-mw/files/gtk_not_required_.patch
new file mode 100644
index 000..ba4d4b1
--- /dev/null
+++ b/app-crypt/eid-mw/files/gtk_not_required_.patch
@@ -0,0 +1,64 @@
+diff --git a/Makefile.am b/Makefile.am
+index 1a605f7..6475886 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
+ 
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit 
plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit 
plugins_tools/xpi
+ 
+ xpipackage:
+   $(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index b70e7f2..ac38944 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
 b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
+   dialogs/dialogsgtk/single_dialog.c
+ endif
+ 
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess 
beid-spr-askpin beid-spr-changepin
+-
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src 
-I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c 
dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk 
-I$(dialogsdir)/../com