| 1 |
commit: 99bc8b5524ba2542b22b81c8d5c1a4b431c23573 |
| 2 |
Author: Amy Winston <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 1 17:04:03 2016 +0000 |
| 4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 1 17:04:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bc8b55 |
| 7 |
|
| 8 |
app-crypt/eid-mw: eapi update bug #587250 by Vincent Hardy |
| 9 |
|
| 10 |
- Move to EAPI 6 |
| 11 |
- add 1 new dependency |
| 12 |
- patch update gtk_not_required_9999.patch |
| 13 |
- add new patch not_zip_xpi_plugin.patch |
| 14 |
- add missing die |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.28 |
| 17 |
|
| 18 |
app-crypt/eid-mw/eid-mw-9999.ebuild | 38 ++++++++++++++-------- |
| 19 |
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 22 ++++++------- |
| 20 |
app-crypt/eid-mw/files/not_zip_xpi_plugin.patch | 27 +++++++++++++++ |
| 21 |
3 files changed, 63 insertions(+), 24 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 24 |
index 2424341..57bb7b8 100644 |
| 25 |
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 26 |
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 27 |
@@ -1,15 +1,15 @@ |
| 28 |
-# Copyright 1999-2015 Gentoo Foundation |
| 29 |
+# Copyright 1999-2016 Gentoo Foundation |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
# $Id$ |
| 32 |
|
| 33 |
-EAPI=5 |
| 34 |
+EAPI=6 |
| 35 |
|
| 36 |
-inherit eutils autotools mozextension multilib |
| 37 |
+inherit autotools mozextension |
| 38 |
|
| 39 |
if [[ ${PV} == "9999" ]] ; then |
| 40 |
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git |
| 41 |
https://github.com/Fedict/${PN}.git" |
| 42 |
- inherit git-2 |
| 43 |
+ inherit git-r3 |
| 44 |
SRC_URI="" |
| 45 |
else |
| 46 |
MY_P="${P}-v${PV}" |
| 47 |
@@ -29,8 +29,9 @@ IUSE="+gtk +xpi +dialogs" |
| 48 |
REQUIRED_USE=" |
| 49 |
dialogs? ( gtk )" |
| 50 |
|
| 51 |
-RDEPEND="gtk? ( x11-libs/gtk+:* ) |
| 52 |
+RDEPEND="gtk? ( x11-libs/gtk+:= ) |
| 53 |
>=sys-apps/pcsc-lite-1.2.9 |
| 54 |
+ net-libs/libproxy |
| 55 |
xpi? ( || ( >=www-client/firefox-bin-3.6.24 |
| 56 |
>=www-client/firefox-3.6.20 ) ) |
| 57 |
!app-misc/beid-runtime" |
| 58 |
@@ -39,21 +40,32 @@ DEPEND="${RDEPEND} |
| 59 |
virtual/pkgconfig" |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
- use gtk || epatch "${FILESDIR}"/gtk_not_required_9999.patch |
| 63 |
+ eapply_user |
| 64 |
|
| 65 |
if [[ ${PV} == "9999" ]] ; then |
| 66 |
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch |
| 67 |
+ |
| 68 |
# Only in current git. Hopefully, in next release. |
| 69 |
- sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac |
| 70 |
- sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in |
| 71 |
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die |
| 72 |
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die |
| 73 |
+ else |
| 74 |
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_4.1.4.patch |
| 75 |
fi |
| 76 |
|
| 77 |
if [[ ${PV} == "9999" ]] || ! use gtk ; then |
| 78 |
eautoreconf |
| 79 |
fi |
| 80 |
+ |
| 81 |
+ # Do that after autoreconf (if autoreconf is required) |
| 82 |
+ # This patch is not mandatory, it's just to do things properly :-) |
| 83 |
+ eapply "${FILESDIR}"/not_zip_xpi_plugin.patch |
| 84 |
} |
| 85 |
|
| 86 |
src_configure() { |
| 87 |
- econf $(use_enable dialogs) --disable-static |
| 88 |
+ econf \ |
| 89 |
+ $(use_enable dialogs) \ |
| 90 |
+ --disable-static \ |
| 91 |
+ --disable-signed |
| 92 |
} |
| 93 |
|
| 94 |
src_install() { |
| 95 |
@@ -61,19 +73,19 @@ src_install() { |
| 96 |
|
| 97 |
if [[ ${PV} != "9999" ]] ; then |
| 98 |
# Automatically done in current git. Hopefully, in next release. |
| 99 |
- rm doc/sdk/include/rsaref220/win32.h |
| 100 |
+ rm doc/sdk/include/rsaref220/win32.h || die |
| 101 |
doheader -r doc/sdk/include/* |
| 102 |
fi |
| 103 |
if use xpi; then |
| 104 |
declare MOZILLA_FIVE_HOME |
| 105 |
if has_version '>=www-client/firefox-3.6.20'; then |
| 106 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" |
| 107 |
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
| 108 |
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
| 109 |
fi |
| 110 |
if has_version '>=www-client/firefox-bin-3.6.24'; then |
| 111 |
MOZILLA_FIVE_HOME="/opt/firefox" |
| 112 |
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
| 113 |
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
| 114 |
fi |
| 115 |
fi |
| 116 |
- rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la |
| 117 |
+ rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die |
| 118 |
} |
| 119 |
|
| 120 |
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
| 121 |
index d5d6f1c..f66ec18 100644 |
| 122 |
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
| 123 |
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
| 124 |
@@ -1,13 +1,13 @@ |
| 125 |
diff --git a/Makefile.am b/Makefile.am |
| 126 |
-index 1a605f7..6475886 100644 |
| 127 |
+index 65baf07..c264576 100644 |
| 128 |
--- a/Makefile.am |
| 129 |
+++ b/Makefile.am |
| 130 |
@@ -1,7 +1,7 @@ |
| 131 |
ACLOCAL_AMFLAGS = -I scripts/m4 |
| 132 |
EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc |
| 133 |
|
| 134 |
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk |
| 135 |
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi |
| 136 |
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer |
| 137 |
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi |
| 138 |
|
| 139 |
xpipackage: |
| 140 |
$(MAKE) -C plugins_tools/xpi xpipackage |
| 141 |
@@ -54,18 +54,18 @@ index 6e33315..fce4494 100644 |
| 142 |
- |
| 143 |
pkgconfig_DATA=libbeidpkcs11.pc |
| 144 |
diff --git a/configure.ac b/configure.ac |
| 145 |
-index 6f4b833..ec7ae8f 100644 |
| 146 |
+index 6485b23..a1f9c93 100644 |
| 147 |
--- a/configure.ac |
| 148 |
+++ b/configure.ac |
| 149 |
-@@ -56,11 +56,6 @@ then |
| 150 |
- fi |
| 151 |
- fi |
| 152 |
+@@ -59,11 +59,6 @@ fi |
| 153 |
|
| 154 |
--if test x"$have_gtk" = "xno" |
| 155 |
+ AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk]) |
| 156 |
+ |
| 157 |
+-if test "$have_gtk" = "no" |
| 158 |
-then |
| 159 |
- AC_MSG_ERROR([At least one version of GTK is required.]) |
| 160 |
-fi |
| 161 |
- |
| 162 |
- ########################################################################### |
| 163 |
- ####### read user-specific requests from --enable directives ###### |
| 164 |
- ########################################################################### |
| 165 |
+ PKG_CHECK_MODULES([XML2], [libxml-2.0]) |
| 166 |
+ PKG_CHECK_MODULES([libproxy], [libproxy-1.0]) |
| 167 |
+ |
| 168 |
|
| 169 |
diff --git a/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch b/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch |
| 170 |
new file mode 100644 |
| 171 |
index 0000000..4295543 |
| 172 |
--- /dev/null |
| 173 |
+++ b/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch |
| 174 |
@@ -0,0 +1,27 @@ |
| 175 |
+--- eid-mw-4.1.18-v4.1.18-a/plugins_tools/xpi/src/Makefile.in 2016-05-20 12:58:46.184002742 +0200 |
| 176 |
++++ eid-mw-4.1.18-v4.1.18-b/plugins_tools/xpi/src/Makefile.in 2016-06-18 16:18:57.467199895 +0200 |
| 177 |
+@@ -724,24 +724,6 @@ |
| 178 |
+ @SIGNED_TRUE@ cp $(srcdir)/belgiumeid-1.0.18.1-signed.1-signed.xpi $(XPI_ID).xpi |
| 179 |
+ |
| 180 |
+ @SIGNED_FALSE@xpipackage: $(xpi_files) |
| 181 |
+-# Create a temporary directory $tmp in $TMPDIR (default /tmp). |
| 182 |
+-# Use mktemp if possible; otherwise fall back on mkdir, |
| 183 |
+-# with $RANDOM to make collisions less likely. |
| 184 |
+-@SIGNED_FALSE@ { \ |
| 185 |
+-@SIGNED_FALSE@ tmp=` \ |
| 186 |
+-@SIGNED_FALSE@ (umask 077 && mktemp -t -d "xpiXXXXXX") 2>/dev/null \ |
| 187 |
+-@SIGNED_FALSE@ ` && \ |
| 188 |
+-@SIGNED_FALSE@ test -n "$$tmp" && test -d "$$tmp"; \ |
| 189 |
+-@SIGNED_FALSE@ } || { \ |
| 190 |
+-@SIGNED_FALSE@ tmp=$$TMPDIR/xpi$$RANDOM; \ |
| 191 |
+-@SIGNED_FALSE@ umask 077 && $(mkinstalldirs) "$$tmp"; \ |
| 192 |
+-@SIGNED_FALSE@ } || exit $$?; \ |
| 193 |
+-@SIGNED_FALSE@ $(MAKE) DESTDIR=$$tmp extensionrootdir=/ install; \ |
| 194 |
+-@SIGNED_FALSE@ cd $$tmp; \ |
| 195 |
+-@SIGNED_FALSE@ rm -f $(abs_builddir)/$(XPI_NAME); \ |
| 196 |
+-@SIGNED_FALSE@ @ZIP@ -rq $(abs_builddir)/$(XPI_NAME) .; \ |
| 197 |
+-@SIGNED_FALSE@ cd -; \ |
| 198 |
+-@SIGNED_FALSE@ rm -rf $$tmp; |
| 199 |
+ |
| 200 |
+ # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 201 |
+ # Otherwise a system limit (for SysV at least) may be exceeded. |
Archives