updated autenticacao-gov-pt and corrected many bugs in previous version

5 files changed, 42 insertions, 8 deletions

diff --git a/app-misc/autenticacao-gov-pt/Manifest b/app-misc/autenticacao-gov-pt/Manifest
index cf4fc2d..09c47d9 100644
--- a/app-misc/autenticacao-gov-pt/Manifest
+++ b/app-misc/autenticacao-gov-pt/Manifest
@@ -1,2 +1,5 @@
+AUX Makefile.gnu.patch 592 SHA256 cb445c04be9a0a642439a688cbff82315fd9079d5e085a94c871dae6a22f9424 SHA512 8da9359d93fbd4a2ed6df8a58f15228ba13ee7117634e024c2ea759ee046b5ba255d374143b087b506a32d21f44c2cad63b2af95a6834ad051d52e0b5b8aa9cb WHIRLPOOL ae0d9da19b08f20842a8b5f8ce50784190c881efb3e3d57bf0e0f57be3ccf1d0619f1eacb79a60cabe6b42a9791074c0113508eb55b24477ba420e3971324175
+AUX autenticacao.gov.pt-2.4.0.deb 1055012 SHA256 9f2eb9b0d6a4c2c6544a5364c03f4bf1f197904c7861aa471c250a2de6e1192f SHA512 09742f4d59efa56c5ebb69ac3cdb408c5d9e4f5c4f7526069c59077afb9a4b7e4efab878e43281b59cd8807a7d4adab3da758d30008b509dc79aa7b6c521a0db WHIRLPOOL 810a34fe6320fdc91dcfd66abdd618a56ee1d4f0fd2f1dbcef5a121e95c462d91fd3102ab61f6966c25d5b8bdf7aecd7cccb99aafcfa63e0d26b1be8378e4bf3
+AUX extras-2.4.0.tar.gz 12500575 SHA256 1aad4500fff3e1c40045bcf91561bf9611ddc22ee4a087ec8a24f091e9dbbb6c SHA512 75a032022843b01e548807f9b84289b8dba58b48b4bcbd46784a1bd79a127f0f72dc093e757d182056aa7f80ef8d798dbf377665bd5a76060ce8960a275eb5b2 WHIRLPOOL c4abcb7ad6afc4ed9c7587a98cb30cbc20ddc025055699de44a7b287132205131aa725db96fd863ccdc037e0a253bc296ce243b3a676ba95004344139bc91d1f
 AUX qmake.patch 468 SHA256 8c11d848776282d3de9b5db209bddbc47041e1089fcc1b1cbcd6fd0fd62394b0 SHA512 ff8ed18d0748e04b1041c7b189a93dfe6674273e677ec86676187b2323ca794d61424204ec8c395c1f5b603c5dd6c346ae2db1cf9886fb42550a827f50c55d34 WHIRLPOOL 9bfe67de73319c70aecefa180c29028320a11669276c7894a5108131c9161f9f1b63c985ea4ba4aba141389cd09a85f4141db9490124ef6c2b3e59e1b48dfc0d
-EBUILD autenticacao-gov-pt-2.4.0.ebuild 1909 SHA256 2917be59f3a99d3cd6b048b014e168cceaf2d24e5b3915d76a7276c7117b60ee SHA512 e4153be336e22a45a6530ef4bd7bdd3429b5355834bf036ecbfc72b4b0f693805449b3726bc80bbfe4cc87af1f28a0576eed475631b198b3a91db69f6494fddd WHIRLPOOL 571a33853ebbfd517ff97af0b65f8b100134674d29b9a7a63b36e2de9bab9f2c4727f5228f8bd2ff5cb1739fde7f11e0d12c117c9a3891ad07277165053f860b
+EBUILD autenticacao-gov-pt-2.4.0.ebuild 2405 SHA256 61004faa26cfbfe696cc543f52bda052d54a54b27e411ed8949d827e29738848 SHA512 5d2dd732f89baa32842be09eebe140318a2f1fb8567b505b4d5f8d3548f3a906d35fa23d832c2e534ff123cc327127477db1a7af504388b7348d01723052e1c0 WHIRLPOOL 042a50ac9aba37e4e34a0498d3d152df44efc5482ed351c1d41519b2639cedccbc31ff42b1cc9afc7bf12cf8ecbac9af0de3c3d688868cd4397f87f3600ac027
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
index 51a6828..6c0eb4f 100644
--- 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
@@ -3,19 +3,19 @@
 
 EAPI=6
 
-DESCRIPTION="Tool for authenticating with https://www.autenticacao.gov.pt/"
+DESCRIPTION="Tools for authenticating with https://www.autenticacao.gov.pt/"
 HOMEPAGE="https://www.autenticacao.gov.pt/"
 
-inherit subversion
+inherit subversion unpacker eutils
 
-#SRC_URI=""
+#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=""
+IUSE="+java"
 
 DEPEND="sys-apps/pcsc-lite
 	dev-java/icedtea
@@ -25,14 +25,23 @@ DEPEND="sys-apps/pcsc-lite
 	dev-qt/qtchooser
 	dev-libs/xml-security-c
 	dev-libs/xerces-c
-	app-text/poppler"
+	app-text/poppler
+	java? ( >=virtual/jdk-1.8:1.8 >=dev-java/oracle-jdk-bin-1.8:1.8 )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/qmake.patch" )
+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() {
@@ -68,9 +77,14 @@ src_compile() {
 src_install() {
 	# make install
 	if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-		emake DESTDIR="${D}" install || die "Error: emake install failed"
+		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/Makefile.gnu.patch b/app-misc/autenticacao-gov-pt/files/Makefile.gnu.patch
new file mode 100644
index 0000000..b935940
--- /dev/null
+++ b/app-misc/autenticacao-gov-pt/files/Makefile.gnu.patch
@@ -0,0 +1,17 @@
+--- a/FreeImagePTEiD/Makefile.gnu	2017-09-21 20:54:23.981722201 +0100
++++ b/FreeImagePTEiD/Makefile.gnu	2017-10-21 17:47:58.342409997 +0100
+@@ -23,9 +23,11 @@
+ override CXXFLAGS += -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

+ override CXXFLAGS += $(INCLUDE)

+ 

+-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)

+-	CFLAGS += -fPIC

+-	CXXFLAGS += -fPIC

++ARCH_TEST := $(shell sh -c 'uname -m 2>/dev/null || echo not')

++ARCH_TEST ?= error

++ifeq ($(ARCH_TEST),x86_64)

++	override CFLAGS += -fPIC

++	override CXXFLAGS += -fPIC

+ endif

+ 

+ TARGET  = freeimagePTEiD

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
new file mode 100644
index 0000000..7c7829b
--- /dev/null
+++ b/app-misc/autenticacao-gov-pt/files/autenticacao.gov.pt-2.4.0.deb
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
new file mode 100644
index 0000000..9a58da6
--- /dev/null
+++ b/app-misc/autenticacao-gov-pt/files/extras-2.4.0.tar.gz