Modify autenticacao-gov-pt to only have the authentication plugin.

Create new ebuild cartao-cidadao-svn to have the citizen card
application.

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

19 files changed, 145 insertions, 122 deletions

diff --git a/app-misc/autenticacao-gov-pt/Manifest b/app-misc/autenticacao-gov-pt/Manifest
index ca367d8..e3f9917 100644
--- a/app-misc/autenticacao-gov-pt/Manifest
+++ b/app-misc/autenticacao-gov-pt/Manifest
@@ -1,12 +1,3 @@
-AUX Makefile.gnu.patch 592 BLAKE2B 417e9fd33f4ba6897f4ddbcd8ec6e53e2bc50e2f854188e1698ada8c9e2e0ea6bbdf5fbf40ddd11e653ec024abdd9fd37f091b38afcbabef7ed445c98ee3ce75 SHA512 8da9359d93fbd4a2ed6df8a58f15228ba13ee7117634e024c2ea759ee046b5ba255d374143b087b506a32d21f44c2cad63b2af95a6834ad051d52e0b5b8aa9cb
-AUX autenticacao.gov.pt-2.4.0.deb 1055012 BLAKE2B 59def973150f870ce4d505a1c7123280c6bf1953e9bd395dca9cde50e3e835b38212e030bbfa75465e96c1815995b095b806b0254eadca856f77d165319993ee SHA512 09742f4d59efa56c5ebb69ac3cdb408c5d9e4f5c4f7526069c59077afb9a4b7e4efab878e43281b59cd8807a7d4adab3da758d30008b509dc79aa7b6c521a0db
-AUX autenticacao.gov.pt-2.4.6.deb 1073740 BLAKE2B fd59429e02906129aba4b01aae7a365b793bb5b3f99520c410189625f8a0c1a025b10c4e3682717bb508497ecb792fdab9068373b5f203b76c6c5552bb172333 SHA512 92c6ec346d2496b95ed88d686e3b4d656b96053f515b3c12c56a4933b103011365242de184fbfda17c52c540efddf083cff5b544c9351abef9d21256ad305897
-AUX autenticacao.gov.pt-3.0.13.deb 1086846 BLAKE2B 9a28faba62056b7822b06b9d91d96de5fa2ac0a65ab7f5805130118146ffd1168cc4146d05afa9f39696d5ec642018c97f7d1e6087bd8c7e1f80129b51adbd5e SHA512 142ff72b8782f54aad8eb1a0dfc674df69d634a60345f5a0d4139d2064627a9b134b48edf5871793d1678fbb3bd96a47e9d30e9eba2a4c5d9906a2c29f7db038
-AUX dlgQndPinpadInfo.cpp.patch 813 BLAKE2B 47f0f20e56102ee6eeb65209ad9a11544101e7f03bec7d37cfbab35788066daf8afaa915193ce9b61fc566f30b5826fee3ebfb20d647d620b30ec4751221a4fa SHA512 b8ddccf85b652fc28f9fea77016da45b1c2c6122a03e3ee3de6a558c552e60cca29a3009f8197f687a1aed65dedf77573c497267cffd297d3481afd05ededd72
-AUX extras-2.4.0.tar.gz 12500575 BLAKE2B 022cc27bc4cd505ea1d671151637d12a1ae253d4e5fce1c4157da3ea11c5d6dd453f335e55d2008117f4777c9192ee331e8c4d7e4f972018b16b61c6b1dc5afa SHA512 75a032022843b01e548807f9b84289b8dba58b48b4bcbd46784a1bd79a127f0f72dc093e757d182056aa7f80ef8d798dbf377665bd5a76060ce8960a275eb5b2
-AUX extras-2.4.6.tar.gz 12500575 BLAKE2B 022cc27bc4cd505ea1d671151637d12a1ae253d4e5fce1c4157da3ea11c5d6dd453f335e55d2008117f4777c9192ee331e8c4d7e4f972018b16b61c6b1dc5afa SHA512 75a032022843b01e548807f9b84289b8dba58b48b4bcbd46784a1bd79a127f0f72dc093e757d182056aa7f80ef8d798dbf377665bd5a76060ce8960a275eb5b2
-AUX extras-3.0.13.tar.gz 12500410 BLAKE2B efabdd04a358d2b9889178fec61ffbb224cd874e142bfae8e280e2fb98110f0c581393d764edb55fc9dabfebce0ffdf5461f17bd4b107744c0f959883548a557 SHA512 ee3f24a0b464e8638da8cf9daa2512acf4ce8eb13c79fbeaa842c9d8421eee5d7619133fcbd362ff777c2b3ad8fe341149977841de092853c31e8539f9363260
-AUX qmake.patch 468 BLAKE2B 2f91848f33b7d94de801e65d4a97dc3c030701888043df444e10a464f0d796dd7f5f9fc55feef2b8fa175fa984fe4b5f460b6268cce5e7d63d0de78b106deaaf SHA512 ff8ed18d0748e04b1041c7b189a93dfe6674273e677ec86676187b2323ca794d61424204ec8c395c1f5b603c5dd6c346ae2db1cf9886fb42550a827f50c55d34
-EBUILD autenticacao-gov-pt-2.4.0.ebuild 2432 BLAKE2B d362d4aeb0f5663ea8884df54e97ac64e0c8f4da28eea79fa51d71695ce7bb24fb26738230def584f3182196f61811c06386397d9b2d5caa35e2c5ca3633cde9 SHA512 73d325601fd51239369a79c5cb0d898bf0c15fbe51b36a30cd00a56fb090431ffef4a76e774353c294f4a92d497e25f233e9bd4eb8fcee41a29451a86d243d7e
-EBUILD autenticacao-gov-pt-2.4.6.ebuild 2397 BLAKE2B 86cecc57d2430f6ca0a653fa8df50eae00aa7e03c37d53007e286cfd647bf30cc0ce72440e3bd5f914536babba34c4ebf56d0daeff79eee36a38e17eaab77898 SHA512 26c516cf52a6784306ba26818a0e902ada6bbe87ff37dcffc264536116e209d067fecc28e72b1495b3dd3392204c0f1d634e1c1882706a13fd4b27c04765aaf6
-EBUILD autenticacao-gov-pt-3.0.13.ebuild 2460 BLAKE2B 34e422c3fad1f401308b3d919d52ffcceffe2332a88cd25ec328937f26bd607704b474770024984025f98c7cf4064503abde1385ec63d6daa6d41ac1968dc3af SHA512 2dbb481bd780319b06ce3625e35075fd5533bc55a96a7e9347467f97b6c6440011195f85f6be504c874ab8f3d5cd693aa3504f74c60169ffaaaac5bcd9b1a683
+DIST plugin-autenticacao-gov.deb 1055970 BLAKE2B 97eccce3ad40911a1a2bd351dfce74025ce0e6f0bdb56abf2b85fb61f49d5549e4c9a94429b5950e146ede65a308d74414bb7a01b190c433034a7861a4f23740 SHA512 f12c9922a9f8e0a85f4a94c2cc482ef69810fe259aee1cde0832028e34f9015db69e1e0de47670d7a0a763ae32b2d289e2255a03ba1d668e2502aaec4f7002cc
+EBUILD autenticacao-gov-pt-2.0.36.ebuild 1003 BLAKE2B 5d5efebbe44718d03b15db8460181e479d6087e33fc617743ed197f5cf0d60d3d906ea36335d08786fafbaf615cf2bbfe8985b5edbdaeb7ae7cb9f4767dd223d SHA512 9584dcad970bf882074e453b91c0bb4ca10e0d0d11ab3e99b4ada81e1b570e38ec2e38afafa19a3b53ea73c97c5ad530231b8671d95e2caaa678cd334cad7130
+MISC metadata.xml 353 BLAKE2B fff84c38e313fa8690702a96a9405c835c0f10b42909afbb946b5c4cb3bfa5c0c47df047b05a06ca93603a3de1494c3b63693a073db98cfbb26c359d7a795ee5 SHA512 c2ec4647114ae8f7dd6f77e6753f691760a618d2c598b3ffbcc63bdc22fac0eac9b748a9af36646e0c8ffb479b422292b5997b54d4a9c863d5136bb190866738
diff --git a/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-2.0.36.ebuild b/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-2.0.36.ebuild
new file mode 100644
index 0000000..2129c98
--- /dev/null
+++ b/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-2.0.36.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="O Autenticação.gov.pt é o mecanismo que permite utilizar o Cartão de Cidadão eficientemente e em segurança nos navegadores que suportem ou não plugins Java"
+HOMEPAGE="https://www.autenticacao.gov.pt/"
+
+inherit unpacker eutils
+
+SRC_URI="https://autenticacao.gov.pt/fa/ajuda/software/plugin-autenticacao-gov.deb"
+
+LICENSE="EUPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/pcsc-lite
+	sys-apps/pcsc-tools
+	app-crypt/ccid
+	( >=virtual/jdk-1.8:1.8 || ( >=dev-java/oracle-jdk-bin-1.8:1.8 dev-java/icedtea dev-java/icedtea-bin ) )"
+RDEPEND="${DEPEND}
+	!app-misc/autenticacao-gov-pt:2
+	!app-misc/autenticacao-gov-pt:3"
+
+src_unpack() {
+	default
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	true
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	# deb install
+	cp -R "${WORKDIR}/usr" "${D}" || die "Error: copy files in install phase failed!"
+}
+
diff --git a/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-2.4.0.ebuild b/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-2.4.0.ebuild
deleted file mode 100644
index 4df5e2d..0000000
--- a/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-2.4.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tools for authenticating with https://www.autenticacao.gov.pt/"
-HOMEPAGE="https://www.autenticacao.gov.pt/"
-
-inherit subversion unpacker eutils
-
-#SRC_URI="https://autenticacao.gov.pt/fa/ajuda/software/autenticacao.gov.pt.deb"
-ESVN_REPO_URI="https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version${PV}/source/trunk/_src/eidmw"
-ESVN_PATCHES="${FILESDIR}/*.patch"
-
-LICENSE="EUPL"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+java"
-
-DEPEND="sys-apps/pcsc-lite
-	sys-apps/pcsc-tools
-	app-crypt/ccid
-	>=dev-qt/qtcore-5
-	dev-qt/qtchooser
-	dev-libs/xml-security-c
-	dev-libs/xerces-c
-	app-text/poppler
-	java? ( >=virtual/jdk-1.8:1.8 || ( >=dev-java/oracle-jdk-bin-1.8:1.8 dev-java/icedtea dev-java/icedtea-bin ) )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/qmake.patch"
-	"${FILESDIR}/Makefile.gnu.patch"
-	)
-
-src_unpack() {
-	default
-	subversion_src_unpack
-	#if use java; then unpack_deb ${A}; fi
-	if use java; then
-		unpack_deb ${FILESDIR}/autenticacao.gov.pt-${PV}.deb
-		unpack ${FILESDIR}/extras-${PV}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if declare -p PATCHES | grep -q "^declare -a "; then
-		[[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" || die "Error: failed to apply ebuild patches ${PATCHES}!"
-	else
-		[[ -n ${PATCHES} ]] && eapply ${PATCHES} || die "Error: failed to apply ebuild patches ${PATCHES}!"
-	fi
-	eapply_user
-}
-
-src_configure() {
-	# configure
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		${ECONF_SOURCE:-.}/configure || die "Error: econf failed"
-	elif [[ -f ${ECONF_SOURCE:-.}/configure ]] ; then
-		fperms 755 ${ECONF_SOURCE:-.}/configure
-		${ECONF_SOURCE:-.}/configure || die "Error: econf failed"
-	else
-		die "Error: ${ECONF_SOURCE:-.}/configure doesn't exists"
-	fi
-}
-
-src_compile() {
-	# make
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake || die "Error: emake failed"
-	else
-		die "Error: compile phase failed because is missing Makefile!"
-	fi
-}
-
-src_install() {
-	# make install
-	if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-		emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "Error: emake install failed"
-	else
-		die "Error: install phase failed because is missing Makefile!"
-	fi
-
-	# deb install
-	if use java; then
-		cp -R "${WORKDIR}/usr" "${D}" || die "Error: copy files in install phase failed!"
-	fi
-}
-
diff --git a/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-2.4.0.deb b/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-2.4.0.deb
deleted file mode 100644
index 7c7829b..0000000
--- a/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-2.4.0.deb
+++ /dev/null
diff --git a/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-3.0.13.deb b/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-3.0.13.deb
deleted file mode 100644
index 15473a0..0000000
--- a/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-3.0.13.deb
+++ /dev/null
diff --git a/app-misc/autenticacao-gov-pt/files/extras-2.4.0.tar.gz b/app-misc/autenticacao-gov-pt/files/extras-2.4.0.tar.gz
deleted file mode 100644
index 9a58da6..0000000
--- a/app-misc/autenticacao-gov-pt/files/extras-2.4.0.tar.gz
+++ /dev/null
diff --git a/app-misc/autenticacao-gov-pt/metadata.xml b/app-misc/autenticacao-gov-pt/metadata.xml
new file mode 100644
index 0000000..5f8acdb
--- /dev/null
+++ b/app-misc/autenticacao-gov-pt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>samuelbernardo.mail@gmail.com</email>
+		<name>Samuel Bernardo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">app-misc/autenticacao-gov-pt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/cartao-cidadao-svn/Manifest b/app-misc/cartao-cidadao-svn/Manifest
new file mode 100644
index 0000000..c74d327
--- /dev/null
+++ b/app-misc/cartao-cidadao-svn/Manifest
@@ -0,0 +1,11 @@
+AUX Makefile.gnu.patch 592 BLAKE2B 417e9fd33f4ba6897f4ddbcd8ec6e53e2bc50e2f854188e1698ada8c9e2e0ea6bbdf5fbf40ddd11e653ec024abdd9fd37f091b38afcbabef7ed445c98ee3ce75 SHA512 8da9359d93fbd4a2ed6df8a58f15228ba13ee7117634e024c2ea759ee046b5ba255d374143b087b506a32d21f44c2cad63b2af95a6834ad051d52e0b5b8aa9cb
+AUX XSECDOMUtils.hpp.patch 536 BLAKE2B 5ea81c2ef978ab408ece58fc068ab972251bd74b0d163c184169ec96064446d5a3781ca11b918ded7f1af9e04b9ab872a817dfdf45a54cd69326c346fa7fe153 SHA512 7ae206233ef95c5e0cd3c6e00dd8d47db81b85c1ee99bbf01c0dff143b8dcf2394a4c211eccb7a8f8fb1c3a2c78d624883865017d7f9a9118fcff9bd03564c66
+AUX XadesSignature.cpp.patch 1260 BLAKE2B db162abcf4011fc99f6cbf09d70fb5109370b1a75057ad6a7f54dac357f748e144ea5a3585bfd4bbfc3f4d8cfa617137673a3e742208257661eeb12c18ca2d81 SHA512 0d216324c9bba7497aa1af1498bfc2f4bd048d5ba73b8c5479925a4df7f4950a07130b1285abf6928a36fac723b30943b777e1a9ce9213ab3651b94e0f56dca8
+AUX autenticacao.gov.pt-2.4.6.deb 1073740 BLAKE2B fd59429e02906129aba4b01aae7a365b793bb5b3f99520c410189625f8a0c1a025b10c4e3682717bb508497ecb792fdab9068373b5f203b76c6c5552bb172333 SHA512 92c6ec346d2496b95ed88d686e3b4d656b96053f515b3c12c56a4933b103011365242de184fbfda17c52c540efddf083cff5b544c9351abef9d21256ad305897
+AUX dlgQndPinpadInfo.cpp.patch 813 BLAKE2B 47f0f20e56102ee6eeb65209ad9a11544101e7f03bec7d37cfbab35788066daf8afaa915193ce9b61fc566f30b5826fee3ebfb20d647d620b30ec4751221a4fa SHA512 b8ddccf85b652fc28f9fea77016da45b1c2c6122a03e3ee3de6a558c552e60cca29a3009f8197f687a1aed65dedf77573c497267cffd297d3481afd05ededd72
+AUX extras-2.4.6.tar.gz 12500575 BLAKE2B 022cc27bc4cd505ea1d671151637d12a1ae253d4e5fce1c4157da3ea11c5d6dd453f335e55d2008117f4777c9192ee331e8c4d7e4f972018b16b61c6b1dc5afa SHA512 75a032022843b01e548807f9b84289b8dba58b48b4bcbd46784a1bd79a127f0f72dc093e757d182056aa7f80ef8d798dbf377665bd5a76060ce8960a275eb5b2
+AUX extras-3.0.13.tar.gz 12500410 BLAKE2B efabdd04a358d2b9889178fec61ffbb224cd874e142bfae8e280e2fb98110f0c581393d764edb55fc9dabfebce0ffdf5461f17bd4b107744c0f959883548a557 SHA512 ee3f24a0b464e8638da8cf9daa2512acf4ce8eb13c79fbeaa842c9d8421eee5d7619133fcbd362ff777c2b3ad8fe341149977841de092853c31e8539f9363260
+AUX qmake.patch 468 BLAKE2B 2f91848f33b7d94de801e65d4a97dc3c030701888043df444e10a464f0d796dd7f5f9fc55feef2b8fa175fa984fe4b5f460b6268cce5e7d63d0de78b106deaaf SHA512 ff8ed18d0748e04b1041c7b189a93dfe6674273e677ec86676187b2323ca794d61424204ec8c395c1f5b603c5dd6c346ae2db1cf9886fb42550a827f50c55d34
+EBUILD cartao-cidadao-svn-2.4.6.ebuild 2397 BLAKE2B 86cecc57d2430f6ca0a653fa8df50eae00aa7e03c37d53007e286cfd647bf30cc0ce72440e3bd5f914536babba34c4ebf56d0daeff79eee36a38e17eaab77898 SHA512 26c516cf52a6784306ba26818a0e902ada6bbe87ff37dcffc264536116e209d067fecc28e72b1495b3dd3392204c0f1d634e1c1882706a13fd4b27c04765aaf6
+EBUILD cartao-cidadao-svn-3.0.13-r1.ebuild 1951 BLAKE2B 3cf1cb49a3ef3f7067efb56e67cda7eb0fd3ad7776fe00999be486fd59a15237ab1d14ac3e658c1ad660760f356e2af9d9f2e9ae8ddf54d93efb5fb2c7762044 SHA512 78ef02e783b47edbd3e000faeba224748f0f0efa9132f3e536dae99afc45ef7ebd3a5b28f7df74ef083704b0f1644df816f2007ccfc3a06ff8ac176ed93d1bf8
+MISC metadata.xml 352 BLAKE2B 124138017b65921283f351939fba1a66bdb445870eb20658269391d32083a9fa08c09c1db5f528dc6bac6242ff6d1b7f94dfdf2320888051761ba882e1ab6e01 SHA512 abcf0e1382a83db5d48e15b6ac9af1c754dd5e3c9a147f4d9a1b8f146482423e039ef111474aad0796e3e2d41cdcfe1bffdc2cfde17d872ab4c2e20143d7e1ad
diff --git a/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-2.4.6.ebuild b/app-misc/cartao-cidadao-svn/cartao-cidadao-svn-2.4.6.ebuild
index b6a38ae..b6a38ae 100644
--- a/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-2.4.6.ebuild
+++ b/app-misc/cartao-cidadao-svn/cartao-cidadao-svn-2.4.6.ebuild
diff --git a/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-3.0.13.ebuild b/app-misc/cartao-cidadao-svn/cartao-cidadao-svn-3.0.13-r1.ebuild
index 732f79a..0535804 100644
--- a/app-misc/autenticacao-gov-pt/autenticacao-gov-pt-3.0.13.ebuild
+++ b/app-misc/cartao-cidadao-svn/cartao-cidadao-svn-3.0.13-r1.ebuild
@@ -4,53 +4,46 @@
 EAPI=6
 
 DESCRIPTION="Tools for authenticating with https://www.autenticacao.gov.pt/"
-HOMEPAGE="https://www.autenticacao.gov.pt/"
+HOMEPAGE="https://svn.gov.pt/projects/ccidadao"
 
 inherit subversion unpacker eutils
 
-#SRC_URI="https://autenticacao.gov.pt/fa/ajuda/software/autenticacao.gov.pt.deb"
 ESVN_REPO_URI="https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version${PV}/_src/eidmw"
 ESVN_PATCHES="${FILESDIR}/*.patch"
 
 LICENSE="EUPL"
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
-IUSE="+java"
+IUSE=""
 
-DEPEND="sys-apps/pcsc-lite
+DEPEND=">=sys-apps/pcsc-lite-1.5.0
 	sys-apps/pcsc-tools
 	app-crypt/ccid
 	>=dev-qt/qtcore-5
 	dev-qt/qtchooser
 	dev-libs/xml-security-c
 	dev-libs/xerces-c
-	app-text/poppler
-	java? ( >=virtual/jdk-1.8:1.8 || ( >=dev-java/oracle-jdk-bin-1.8:1.8 dev-java/icedtea dev-java/icedtea-bin ) )"
+	dev-vcs/subversion
+	dev-libs/openssl
+	media-libs/jasper
+	app-text/poppler"
 RDEPEND="${DEPEND}
 	!app-misc/autenticacao-gov-pt:2"
 
 PATCHES=(
 	"${FILESDIR}/qmake.patch"
 	"${FILESDIR}/dlgQndPinpadInfo.cpp.patch"
+	"${FILESDIR}/XadesSignature.cpp.patch"
 	)
 
 src_unpack() {
 	default
 	subversion_src_unpack
-	#if use java; then unpack_deb ${A}; fi
-	if use java; then
-		unpack_deb ${FILESDIR}/autenticacao.gov.pt-${PV}.deb
-		unpack ${FILESDIR}/extras-${PV}.tar.gz
-	fi
+	unpack ${FILESDIR}/extras-${PV}.tar.gz
 }
 
 src_prepare() {
-	if declare -p PATCHES | grep -q "^declare -a "; then
-		[[ -n ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" || die "Error: failed to apply ebuild patches ${PATCHES}!"
-	else
-		[[ -n ${PATCHES} ]] && eapply ${PATCHES} || die "Error: failed to apply ebuild patches ${PATCHES}!"
-	fi
-	eapply_user
+	default
 }
 
 src_configure() {
@@ -82,9 +75,7 @@ src_install() {
 		die "Error: install phase failed because is missing Makefile!"
 	fi
 
-	# deb install
-	if use java; then
-		cp -R "${WORKDIR}/usr" "${D}" || die "Error: copy files in install phase failed!"
-	fi
+	# extras install
+	cp -R "${WORKDIR}/usr" "${D}" || die "Error: copy files in install phase failed!"
 }
 
diff --git a/app-misc/autenticacao-gov-pt/files/Makefile.gnu.patch b/app-misc/cartao-cidadao-svn/files/Makefile.gnu.patch
index b935940..b935940 100644
--- a/app-misc/autenticacao-gov-pt/files/Makefile.gnu.patch
+++ b/app-misc/cartao-cidadao-svn/files/Makefile.gnu.patch
diff --git a/app-misc/cartao-cidadao-svn/files/XSECDOMUtils.hpp.patch b/app-misc/cartao-cidadao-svn/files/XSECDOMUtils.hpp.patch
new file mode 100644
index 0000000..6cc59ec
--- /dev/null
+++ b/app-misc/cartao-cidadao-svn/files/XSECDOMUtils.hpp.patch
@@ -0,0 +1,12 @@
+diff -Naur a/applayer/XadesSignature.cpp b/applayer/XadesSignature.cpp
+--- a/applayer/XadesSignature.cpp	2019-01-13 20:06:05.519457738 +0000
++++ b/applayer/XadesSignature.cpp	2019-01-13 20:40:45.482262806 +0000
+@@ -63,7 +63,7 @@
+ #include <xsec/enc/XSECCryptoUtils.hpp>
+ #include <xsec/enc/XSECCryptoException.hpp>
+ #include <xsec/utils/XSECBinTXFMInputStream.hpp>
+-#include <xsec/utils/XSECDOMUtils.hpp>
++//#include <xsec/utils/XSECDOMUtils.hpp>
+ #include <xsec/transformers/TXFMBase.hpp>
+ #include <xsec/transformers/TXFMChain.hpp>
+ 
diff --git a/app-misc/cartao-cidadao-svn/files/XadesSignature.cpp.patch b/app-misc/cartao-cidadao-svn/files/XadesSignature.cpp.patch
new file mode 100644
index 0000000..5014b8f
--- /dev/null
+++ b/app-misc/cartao-cidadao-svn/files/XadesSignature.cpp.patch
@@ -0,0 +1,38 @@
+diff -Naur a/applayer/XadesSignature.cpp b/applayer/XadesSignature.cpp
+--- a/applayer/XadesSignature.cpp	2019-02-18 23:48:47.483833073 +0000
++++ b/applayer/XadesSignature.cpp	2019-02-19 00:43:51.207845230 +0000
+@@ -62,6 +62,7 @@
+ 
+ #include <xsec/enc/XSECCryptoUtils.hpp>
+ #include <xsec/enc/XSECCryptoException.hpp>
++#include <xsec/enc/XSECCryptoHash.hpp>
+ #include <xsec/utils/XSECBinTXFMInputStream.hpp>
+ #include <xsec/utils/XSECDOMUtils.hpp>
+ #include <xsec/transformers/TXFMBase.hpp>
+@@ -567,7 +568,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append( (char*)&buffer[0], size_t(bytes));
+@@ -622,7 +623,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append( (char*)&buffer[0], size_t(bytes));
+@@ -881,7 +882,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append((char*)&buffer[0], size_t(bytes));
diff --git a/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-2.4.6.deb b/app-misc/cartao-cidadao-svn/files/autenticacao.gov.pt-2.4.6.deb
index 5bd44f2..5bd44f2 100644
--- a/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-2.4.6.deb
+++ b/app-misc/cartao-cidadao-svn/files/autenticacao.gov.pt-2.4.6.deb
diff --git a/app-misc/autenticacao-gov-pt/files/dlgQndPinpadInfo.cpp.patch b/app-misc/cartao-cidadao-svn/files/dlgQndPinpadInfo.cpp.patch
index 126b308..126b308 100644
--- a/app-misc/autenticacao-gov-pt/files/dlgQndPinpadInfo.cpp.patch
+++ b/app-misc/cartao-cidadao-svn/files/dlgQndPinpadInfo.cpp.patch
diff --git a/app-misc/autenticacao-gov-pt/files/extras-2.4.6.tar.gz b/app-misc/cartao-cidadao-svn/files/extras-2.4.6.tar.gz
index 9a58da6..9a58da6 100644
--- a/app-misc/autenticacao-gov-pt/files/extras-2.4.6.tar.gz
+++ b/app-misc/cartao-cidadao-svn/files/extras-2.4.6.tar.gz
diff --git a/app-misc/autenticacao-gov-pt/files/extras-3.0.13.tar.gz b/app-misc/cartao-cidadao-svn/files/extras-3.0.13.tar.gz
index 7328bc1..7328bc1 100644
--- a/app-misc/autenticacao-gov-pt/files/extras-3.0.13.tar.gz
+++ b/app-misc/cartao-cidadao-svn/files/extras-3.0.13.tar.gz
diff --git a/app-misc/autenticacao-gov-pt/files/qmake.patch b/app-misc/cartao-cidadao-svn/files/qmake.patch
index 3b7c465..3b7c465 100644
--- a/app-misc/autenticacao-gov-pt/files/qmake.patch
+++ b/app-misc/cartao-cidadao-svn/files/qmake.patch
diff --git a/app-misc/cartao-cidadao-svn/metadata.xml b/app-misc/cartao-cidadao-svn/metadata.xml
new file mode 100644
index 0000000..23a526f
--- /dev/null
+++ b/app-misc/cartao-cidadao-svn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>samuelbernardo.mail@gmail.com</email>
+		<name>Samuel Bernardo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">app-misc/cartao-cidadao-svn</remote-id>
+	</upstream>
+</pkgmetadata>