Update cartao-cidadao-git to 3.5.0

Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>

3 files changed, 65 insertions, 3 deletions

diff --git a/app-misc/cartao-cidadao-git/Manifest b/app-misc/cartao-cidadao-git/Manifest
index fd5cd0e..d13ac4e 100644
--- a/app-misc/cartao-cidadao-git/Manifest
+++ b/app-misc/cartao-cidadao-git/Manifest
@@ -1,4 +1,15 @@
+AUX Makefile.gnu.patch 592 BLAKE2B 417e9fd33f4ba6897f4ddbcd8ec6e53e2bc50e2f854188e1698ada8c9e2e0ea6bbdf5fbf40ddd11e653ec024abdd9fd37f091b38afcbabef7ed445c98ee3ce75 SHA512 8da9359d93fbd4a2ed6df8a58f15228ba13ee7117634e024c2ea759ee046b5ba255d374143b087b506a32d21f44c2cad63b2af95a6834ad051d52e0b5b8aa9cb
+AUX XSECDOMUtils.hpp.patch 536 BLAKE2B 5ea81c2ef978ab408ece58fc068ab972251bd74b0d163c184169ec96064446d5a3781ca11b918ded7f1af9e04b9ab872a817dfdf45a54cd69326c346fa7fe153 SHA512 7ae206233ef95c5e0cd3c6e00dd8d47db81b85c1ee99bbf01c0dff143b8dcf2394a4c211eccb7a8f8fb1c3a2c78d624883865017d7f9a9118fcff9bd03564c66
+AUX XadesSignature.cpp.3.0.16.patch 1005 BLAKE2B 756f629c778a3c5330631ea786395b4f5c41e5b41ff49d6f22f874a98d6c3bab9be8c46990896e67107f8d00bdbec79f4dd0dd543aa1043664c824f73d883163 SHA512 09070ccb55b7b4cc311cb84924dbf791e3b7584aeb7c66cdde8cf5e940169930e8b3f8a4be30fd224b2293ca91ba7e5a13351b3a5fb6ce81d1741ba2120d61e8
+AUX XadesSignature.cpp.patch 1260 BLAKE2B db162abcf4011fc99f6cbf09d70fb5109370b1a75057ad6a7f54dac357f748e144ea5a3585bfd4bbfc3f4d8cfa617137673a3e742208257661eeb12c18ca2d81 SHA512 0d216324c9bba7497aa1af1498bfc2f4bd048d5ba73b8c5479925a4df7f4950a07130b1285abf6928a36fac723b30943b777e1a9ce9213ab3651b94e0f56dca8
+AUX dlgQndPinpadInfo.cpp.patch 813 BLAKE2B 47f0f20e56102ee6eeb65209ad9a11544101e7f03bec7d37cfbab35788066daf8afaa915193ce9b61fc566f30b5826fee3ebfb20d647d620b30ec4751221a4fa SHA512 b8ddccf85b652fc28f9fea77016da45b1c2c6122a03e3ee3de6a558c552e60cca29a3009f8197f687a1aed65dedf77573c497267cffd297d3481afd05ededd72
+AUX extras-3.0.20.tar.gz 92892 BLAKE2B ebaff394933ffa84a6e46989cc93bb7c9395cea37393ed6a9c6dee1d137e5ddd651ca6b36567a9dd25dd302889f009a01aeca53d3fcf6132f6d0aa3819ad940c SHA512 bd32872f0e7ea1ce43d856f0a1e471b2fa04473ea9e0998261bf9cc024ca17d477a01889cacb230a8aa0ae135db1a7880bdcb93a124953322f8dbc59e4a910bf
+AUX openjpeg.h.3.5.0.patch 1917 BLAKE2B 81600f5ffc8a3e1a8387dfd7d8415b1ab1e30b2df5bf04e6d54081d0c1d45df088ee44857bd759e4d7e3f44d6bc5bcdd417e9e81aaa6eedf91db67a2a18993bd SHA512 d6e66dcdde8cbf884574be0c02d97a82735ecd38f7c004998c5ea8c45cff543910075b04fb00efed84aa8240bb14fd2ed09e2235e2d4ea98d6c10732f96529d1
 AUX pteid-mw.pro.patch 440 BLAKE2B 3e46d395af741f23adb860dffa5a4c36e6ea40e6ac2bb8d43025d427c401df3ae4a8493296050f24a776aad82e2670d2d277c0cc10946fe5d3b8e3ccb446849a SHA512 cf89b8c9f5494dbe48a6738077df1a9f9fabb269af837772527c607a2050500679b2230cf7638073f463acc52455c0e7210a2fa58a0eb39f88ebaec08b872cc8
+AUX pteidapplayer.2008.vcxproj.3.4.0.patch 5121 BLAKE2B 40e843f146d0e1fedd2b9b192e76aa9ed15e59cbc508d2b84072964c66cd95e71021d2da7cce8e6235a3cd45f97d38af2d37d7e0fea3ee3f43d2bd6e2583a95e SHA512 b07387206db8727dabf39f736faa4b68e006303cc797d2f077766f0202d94c63113cab5a08a8e8808fe70a8c4fe7c7f2f7a0a3e0165735b1f015fc1f58ff480b
+AUX qmake.patch 468 BLAKE2B 2f91848f33b7d94de801e65d4a97dc3c030701888043df444e10a464f0d796dd7f5f9fc55feef2b8fa175fa984fe4b5f460b6268cce5e7d63d0de78b106deaaf SHA512 ff8ed18d0748e04b1041c7b189a93dfe6674273e677ec86676187b2323ca794d61424204ec8c395c1f5b603c5dd6c346ae2db1cf9886fb42550a827f50c55d34
 DIST Autenticacao.gov_Ubuntu_20_x64.deb 2395212 BLAKE2B 4895d47a446df2dacefd2376e2fea0fb1b1dbbd6e402f14ccffd35b98ce7c5554d59ff5bcaafb02b2939af0afe7ac95ae8e39f77e640ef9d2ce0745d21b359ed SHA512 dd412985b97b2461d648a9b186fbee022ce34f5b4589d5756165309e56de6c09e564d151e412ab26785ffe17f4dd67ab5d60021e598c6e48ecfd34a05f4da6f1
+EBUILD cartao-cidadao-git-3.0.20.ebuild 2075 BLAKE2B 31d6e41f432f00381f5a42e51012a7e6dfb7a5e713dbb80768d57b0cbd9625e1c228cff70ec0cf2e6851b1db53975436d7980ea68c6539b870dce2efff936186 SHA512 cd8a240dfdaa8fdd7e142e60512dd27c9f32ff60db61a3236081ea2ff160588f64dabe7cda6cfffefdcb2a976bd61e384104f09400345b31d3ba32b86fd5699b
 EBUILD cartao-cidadao-git-3.1.0.ebuild 3481 BLAKE2B 8f522f28b53ee6415cf445b1d5891a0a6eb830aa32f4ce98d1e014cfae1d947645cfa72fa44a8120c1f0348389869711caff02f783d1477d2679038a73813a14 SHA512 f11b7f052575e74329f410023c524a95a645b77ad96f0b92338cbbd94f69c2c67e7e6aa0b61f67917a754dea9a9700ad38a718b098659071263f932f772571b2
+EBUILD cartao-cidadao-git-3.5.0.ebuild 3569 BLAKE2B f0604a8ff0a2c9a0e956dd01f257882b3eb755c894087c817cad6f2422eeb74ba7dbc78e066dc37604fd19b627debec0cc09af0d74e6031a2cdca6d07a95f57d SHA512 812990501613e5f553508cc0b03598cdb45711b5f4bccca625f88db0dac7e4a84c7aa02423382a5e2ac9dac2f45d834beeb693520b1dc464a35fdbeda69c54f1
 MISC metadata.xml 352 BLAKE2B cd72105d43a6ffe93ea0b14ca747161283860b37f2c70aac1d29227bc1b774fbfc1d8020effb2fd24c3165d1ffab853ce8791dd263cbaf6ceaf44b36036af25b SHA512 19f6c0e85c78157c5c542b951b3907f59b2891567d452163b46fd3369545095e772167eddc87c31a00e7b5283070f233d92edd86cac5159c123615ffd2c298b9
diff --git a/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.1.0.ebuild b/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.5.0.ebuild
index ba004ac..b744a16 100644
--- a/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.1.0.ebuild
+++ b/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.5.0.ebuild
@@ -10,8 +10,8 @@ inherit git-r3 unpacker eutils
 
 EGIT_CLONE_TYPE="single"
 EGIT_REPO_URI="https://github.com/amagovpt/autenticacao.gov.git"
-#EGIT_COMMIT="v$PV"
-EGIT_BRANCH="openssl-migration"
+EGIT_COMMIT="v$PV"
+#EGIT_BRANCH="openssl-migration"
 
 SRC_URI="https://www.autenticacao.gov.pt/documents/10179/11962/Autenticacao.gov_Ubuntu_20_x64.deb"
 
@@ -21,8 +21,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="java"
 
 DEPEND="dev-lang/swig
+        sys-devel/qconf
         dev-libs/xml-security-c
 	>=dev-libs/openssl-1.1.0
+	>=media-libs/openjpeg-2.4.0
+	<=media-libs/openjpeg-2.5.0
 	java? ( dev-java/openjdk:11 )"
 RDEPEND="${DEPEND}
         >=sys-apps/pcsc-lite-1.5.0
@@ -44,7 +47,7 @@ RDEPEND="${DEPEND}
 	!app-misc/cartao-cidadao-svn"
 
 PATCHES=(
-	#"${FILESDIR}/*.${PV}.patch"
+	${FILESDIR}/openjpeg.h.${PV}.patch
 	)
 
 src_unpack() {
diff --git a/app-misc/cartao-cidadao-git/files/openjpeg.h.3.5.0.patch b/app-misc/cartao-cidadao-git/files/openjpeg.h.3.5.0.patch
new file mode 100644
index 0000000..7f83ccf
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/files/openjpeg.h.3.5.0.patch
@@ -0,0 +1,48 @@
+diff -Naur a/pteid-mw-pt/_src/eidmw/applayer/J2KHelper.h b/pteid-mw-pt/_src/eidmw/applayer/J2KHelper.h
+--- a/pteid-mw-pt/_src/eidmw/applayer/J2KHelper.h	2021-05-16 16:59:11.683395980 +0100
++++ b/pteid-mw-pt/_src/eidmw/applayer/J2KHelper.h	2021-05-16 17:01:52.437847679 +0100
+@@ -3,7 +3,7 @@
+ 
+ #include <zlib.h>
+ #include <png.h>
+-#include <openjpeg.h>
++#include <openjpeg-2.4/openjpeg.h>
+ 
+ #include "PNGConverter.h"
+ 
+diff -Naur a/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.cpp b/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.cpp
+--- a/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.cpp	2021-05-16 16:59:11.684395952 +0100
++++ b/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.cpp	2021-05-16 17:01:52.442847538 +0100
+@@ -43,7 +43,7 @@
+ #include <ctype.h>
+ #include <limits.h>
+ 
+-#include <openjpeg.h>
++#include <openjpeg-2.4/openjpeg.h>
+ 
+ #include "PNGConverter.h"
+ 
+diff -Naur a/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.h b/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.h
+--- a/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.h	2021-05-16 16:59:11.684395952 +0100
++++ b/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.h	2021-05-16 17:01:52.446847426 +0100
+@@ -1,7 +1,7 @@
+ #ifndef __J2K_CONVERT_H
+ #define __J2K_CONVERT_H
+ 
+-#include <openjpeg.h>
++#include <openjpeg-2.4/openjpeg.h>
+ 
+ /* Component precision clipping */
+ void clip_component(opj_image_comp_t* component, OPJ_UINT32 precision);
+diff -Naur a/pteid-mw-pt/_src/eidmw/pteid-poppler/poppler/JPEG2000Stream.h b/pteid-mw-pt/_src/eidmw/pteid-poppler/poppler/JPEG2000Stream.h
+--- a/pteid-mw-pt/_src/eidmw/pteid-poppler/poppler/JPEG2000Stream.h	2021-05-16 16:59:11.812392305 +0100
++++ b/pteid-mw-pt/_src/eidmw/pteid-poppler/poppler/JPEG2000Stream.h	2021-05-16 17:01:52.456847146 +0100
+@@ -16,7 +16,7 @@
+ #ifndef JPEG2000STREAM_H
+ #define JPEG2000STREAM_H
+ 
+-#include <openjpeg.h>
++#include <openjpeg-2.4/openjpeg.h>
+ 
+ #include "goo/gtypes.h"
+ #include "Object.h"