diff options
Diffstat (limited to 'app-crypt/eid-mw')
| -rw-r--r-- | app-crypt/eid-mw/Manifest | 2 | ||||
| -rw-r--r-- | app-crypt/eid-mw/eid-mw-5.1.18.ebuild (renamed from app-crypt/eid-mw/eid-mw-5.0.28.ebuild) | 34 | ||||
| -rw-r--r-- | app-crypt/eid-mw/eid-mw-9999.ebuild | 32 | ||||
| -rw-r--r-- | app-crypt/eid-mw/files/use-printf-in-Makefile.patch | 21 | ||||
| -rw-r--r-- | app-crypt/eid-mw/metadata.xml | 2 |
5 files changed, 27 insertions, 64 deletions
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index 115ca9888bda..623c7a009f28 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1 +1 @@ -DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc SHA512 05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898 +DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76 SHA512 1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7 diff --git a/app-crypt/eid-mw/eid-mw-5.0.28.ebuild b/app-crypt/eid-mw/eid-mw-5.1.18.ebuild index 97045c329e89..bd390d5174b7 100644 --- a/app-crypt/eid-mw/eid-mw-5.0.28.ebuild +++ b/app-crypt/eid-mw/eid-mw-5.1.18.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools desktop gnome2-utils xdg-utils +inherit autotools desktop gnome2-utils DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" HOMEPAGE="https://eid.belgium.be" @@ -11,22 +11,22 @@ 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 +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 )" @@ -49,19 +49,12 @@ 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 - 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::' \ @@ -77,14 +70,13 @@ 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() { 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-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild index cce8d5f2d95f..3c461d2daa95 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 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" @@ -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,19 +43,12 @@ 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 - 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::' \ @@ -71,14 +64,13 @@ 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() { 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/files/use-printf-in-Makefile.patch b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch deleted file mode 100644 index 5b4ef2adc07e..000000000000 --- a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am ---- a/plugins_tools/eid-viewer/Makefile.am 2020-08-19 15:32:50.000000000 +0200 -+++ b/plugins_tools/eid-viewer/Makefile.am 2020-12-21 23:07:49.980421703 +0200 -@@ -125,13 +125,13 @@ - SUBDIRS = . gtk/po test uml - - resources/%.c: resources/%.png -- echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@ -+ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@ - gdk-pixbuf-csource --struct --extern --name `basename $^ .png` $^ >> $@ -- echo -e "#pragma GCC diagnostic pop\n" >> $@ -+ printf '%s\n' '#pragma GCC diagnostic pop' >> $@ - resources/%.c: resources/%.jpg -- echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@ -+ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@ - gdk-pixbuf-csource --struct --extern --name `basename $^ .jpg` $^ >> $@ -- echo -e "#pragma GCC diagnostic pop\n" >> $@ -+ printf '%s\n' '#pragma GCC diagnostic pop' >> $@ - - BUILT_SOURCES = gtk/viewer_glade.h \ - resources/coat_of_arms_nl.c \ diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml index e32c4a46584a..d75d0072bbc0 100644 --- a/app-crypt/eid-mw/metadata.xml +++ b/app-crypt/eid-mw/metadata.xml @@ -27,7 +27,7 @@ These three functions form the basis of the countless applications for your eID. Enable "askaccess" dialog box, by using <pkg>x11-libs/gtk+</pkg> </flag> <flag name="p11-kit"> - Support for app-crypt/p11-kit. + Support for <pkg>app-crypt/p11-kit</pkg>. </flag> </use> </pkgmetadata> |