From: "Amy Liffey" <amynka@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/
Date: Fri, 23 Nov 2018 20:38:50 +0000 (UTC) [thread overview]
Message-ID: <1543005485.7235361ed93100b1319b5cb83d1ab9dfae3ddf0e.amynka@gentoo> (raw)
commit: 7235361ed93100b1319b5cb83d1ab9dfae3ddf0e
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 20:20:15 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 20:38:05 2018 +0000
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 <vincent.hardy.be <AT> gmail.com>
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
app-crypt/eid-mw/Manifest | 1 +
.../{eid-mw-9999.ebuild => eid-mw-4.4.11.ebuild} | 58 +++++++++-------------
app-crypt/eid-mw/eid-mw-9999.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-9999.ebuild b/app-crypt/eid-mw/eid-mw-4.4.11.ebuild
similarity index 50%
copy from app-crypt/eid-mw/eid-mw-9999.ebuild
copy to app-crypt/eid-mw/eid-mw-4.4.11.ebuild
index 9c2c887e618..e496d37797e 100644
--- a/app-crypt/eid-mw/eid-mw-9999.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} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
- inherit git-r3
- SRC_URI=""
-else
- SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
- KEYWORDS="~x86 ~amd64 ~arm"
-fi
+inherit autotools gnome2-utils
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}/belgiumeid@eid.belgium.be"
- fi
- if has_version '>=www-client/firefox-bin-3.6.24'; then
- MOZILLA_FIVE_HOME="/opt/firefox"
- xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
- fi
- else
- rm -r "${ED}"/usr/lib/mozilla || die
- fi
- rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
-
+ rm -r "${ED}"/usr/$(get_libdir)/*.la || die
if use gtk; then
- rm -r "${ED}/usr/include/eid-util" || die
+ domenu plugins_tools/eid-viewer/eid-viewer.desktop
+ doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
fi
}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 9c2c887e618..4f93816f0b9 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,25 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools mozextension gnome2-utils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
- inherit git-r3
- SRC_URI=""
-else
- SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
- KEYWORDS="~x86 ~amd64 ~arm"
-fi
+inherit autotools gnome2-utils git-r3
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="https://eid.belgium.be"
+EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
LICENSE="LGPL-3"
SLOT="0"
-IUSE="+dialogs +gtk p11-kit +xpi"
+IUSE="+dialogs +gtk +p11v220 p11-kit"
RDEPEND=">=sys-apps/pcsc-lite-1.2.9
gtk? (
@@ -30,9 +22,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9
net-libs/libproxy
!app-misc/eid-viewer-bin
)
- p11-kit? ( app-crypt/p11-kit )
- xpi? ( || ( >=www-client/firefox-bin-3.6.24
- >=www-client/firefox-3.6.20 ) )"
+ p11-kit? ( app-crypt/p11-kit )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -45,6 +35,10 @@ src_prepare() {
sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+ # legacy xpi module : we don't want it anymore
+ sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
+ sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
+
# hardcoded lsb_info
sed -i \
-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
@@ -58,33 +52,19 @@ src_prepare() {
src_configure() {
econf \
$(use_enable dialogs) \
+ $(use_enable p11v220) \
$(use_enable p11-kit p11kit) \
$(use_with gtk gtkvers 'detect') \
--with-gnu-ld \
- --disable-static \
- --disable-signed
+ --disable-static
}
src_install() {
default
-
- if use xpi; then
- declare MOZILLA_FIVE_HOME
- if has_version '>=www-client/firefox-3.6.20'; then
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
- xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
- fi
- if has_version '>=www-client/firefox-bin-3.6.24'; then
- MOZILLA_FIVE_HOME="/opt/firefox"
- xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
- fi
- else
- rm -r "${ED}"/usr/lib/mozilla || die
- fi
- rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
-
+ rm -r "${ED}"/usr/$(get_libdir)/*.la || die
if use gtk; then
- rm -r "${ED}/usr/include/eid-util" || die
+ domenu plugins_tools/eid-viewer/eid-viewer.desktop
+ doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
fi
}
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 5a0c5666c03..99549db6384 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -24,12 +24,12 @@ These three functions form the basis of the countless applications for your eID.
</flag>
<flag name="dialogs">
Enable "askaccess" dialog box, by using <pkg>x11-libs/gtk+</pkg>
- </flag>
- <flag name="xpi">
- Build and install an extension for Mozilla browsers.
</flag>
<flag name="p11-kit">
Support for app-crypt/p11-kit.
</flag>
+ <flag name="p11v220">
+ Enable PKCS#11 v2.20 features.
+ </flag>
</use>
</pkgmetadata>
next reply other threads:[~2018-11-23 20:38 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-23 20:38 Amy Liffey [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-24 17:56 [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/ Amy Liffey
2025-09-24 17:56 Amy Liffey
2025-01-19 15:28 Amy Liffey
2025-01-19 15:28 Amy Liffey
2024-08-10 13:58 Amy Liffey
2024-08-10 13:58 Amy Liffey
2024-05-18 16:46 Amy Liffey
2024-04-14 15:03 Amy Liffey
2024-02-12 11:48 Amy Liffey
2024-02-12 11:48 Amy Liffey
2024-01-02 19:56 Amy Liffey
2024-01-02 19:56 Amy Liffey
2023-09-21 17:01 Amy Liffey
2023-09-21 11:58 Amy Liffey
2023-06-30 15:52 Amy Liffey
2023-06-30 15:52 Amy Liffey
2023-03-15 12:18 Arthur Zamarin
2023-03-14 18:11 Amy Liffey
2023-03-14 18:11 Amy Liffey
2022-08-01 9:17 Amy Liffey
2022-08-01 9:17 Amy Liffey
2022-05-28 9:37 Amy Liffey
2021-09-09 20:30 Amy Liffey
2021-09-09 20:30 Amy Liffey
2021-06-25 21:05 Amy Liffey
2021-04-02 9:20 Amy Liffey
2021-04-01 19:16 Amy Liffey
2021-04-01 19:16 Amy Liffey
2021-04-01 19:16 Amy Liffey
2021-03-10 19:05 Amy Liffey
2021-01-03 20:56 Amy Liffey
2020-11-12 15:43 Amy Liffey
2020-11-12 15:43 Amy Liffey
2020-08-10 7:33 Amy Liffey
2020-08-04 18:39 Amy Liffey
2020-08-04 18:39 Amy Liffey
2020-08-04 18:39 Amy Liffey
2019-10-10 8:16 Amy Liffey
2019-08-15 19:20 Amy Liffey
2018-10-12 16:06 Thomas Deutschmann
2018-05-16 21:07 Amy Liffey
2018-05-16 21:07 Amy Liffey
2018-01-19 13:50 Amy Liffey
2018-01-12 16:53 Amy Liffey
2018-01-12 16:53 Amy Liffey
2018-01-12 16:53 Amy Liffey
2017-02-12 16:18 Amy Liffey
2016-09-11 10:17 Amy Winston
2016-07-01 17:15 Amy Winston
2016-04-18 8:13 Patrice Clement
2015-11-11 17:10 Ian Delaney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1543005485.7235361ed93100b1319b5cb83d1ab9dfae3ddf0e.amynka@gentoo \
--to=amynka@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox