Use github as source repo and bump to 4.0.6_p1620

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

4 files changed, 101 insertions, 13 deletions

diff --git a/app-crypt/eid-mw/ChangeLog b/app-crypt/eid-mw/ChangeLog
index 896b8a3b335a..900c8fdba1e9 100644
--- a/app-crypt/eid-mw/ChangeLog
+++ b/app-crypt/eid-mw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/eid-mw
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/ChangeLog,v 1.10 2014/08/10 02:26:59 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/ChangeLog,v 1.11 2015/01/24 18:17:08 swift Exp $
+
+*eid-mw-4.0.6_p1620 (24 Jan 2015)
+
+  24 Jan 2015; Sven Vermeulen <swift@gentoo.org> +eid-mw-4.0.6_p1620.ebuild,
+  eid-mw-9999.ebuild:
+  Fix bug #536504 - Use github as source repo and bump to 4.0.6_p1620 thanks to
+  Vincent Hardy
 
   10 Aug 2014; Patrick Lauer <patrick@gentoo.org> eid-mw-4.0.2_p1188.ebuild,
   eid-mw-4.0.4_p1253.ebuild, eid-mw-4.0.6_p1480.ebuild, eid-mw-9999.ebuild:
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 4a0ff8bc1213..fbcda9cd6c24 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,11 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX eid-mw-4.0.2_p1188+gcc-4.7.patch 1027 SHA256 20e91da7a852448ce087ef84126140e6330c8b66a4730c3172a159086cc6acac SHA512 4beedc68e767060912cbf37b500bef18fac2c6af7c7577857901fdcd7f33740441a2a394c7f31fc3b217c53fd77f903f88b2cf79195c5dd69eb1c886c2c9ac6d WHIRLPOOL 7af848f2f25a2200f796ea8e42f2a48604461c913ce864a28e4d3557cdd28dbe7c4940233d2544fde3fc7cb9e56651c05ca2809d3fc8557539c7c3f2bf5f30ed
 AUX fix-nodialog-bug.patch 466 SHA256 8cec2674bf60decb0e6e34954993959cf1a098542664e738756d96c4d961ca4f SHA512 de752d889fd060507fcdf5fa8df43c769ca446603087192f2efd21db9c6eef3602620b76fb765340f29c76fe92b1ff746db68d31cf9a25a6121c0895f0597ed6 WHIRLPOOL bac33d9a333c3a9075d1d235f9540972e8d390503744edd0de680bf39a8bda7f72f6c70344b2777f208cba5696e2bdc1929fcac0e73a1e7557617051085233f3
 DIST eid-mw-4.0.2-1188.tar.gz 10701112 SHA256 8975ab424b9341f80fd40009c67b7c31da5aa1cb2eef823d97477f61a1f19c0a SHA512 ffbdad7ef036285faf9e0cdf5cc6851b1a70f09f8010a6a297d339e5bf59cc84d8d983c3959695c41110ce0bc03f9521f1e7b2a95783daa7ead91fdeb461d279 WHIRLPOOL 3acc9f33d123b68cc7fed616a2e73e3a0b9306157b172951bc32daed184d77b28698fc7e9d74a2d66380fd5dd4e4ce30c8c3989ac897d2de20e974c7f2f5ebd9
 DIST eid-mw-4.0.4-1253_tcm406-178475.tgz 10748384 SHA256 99280c14417dda5d51738a5cf2661e19f85d8742dd0cd7ff0cc57aec7dee4d5e SHA512 5fbda0b45f1a99b5c374fe23c225b5a3b57f7962224de99894d385083c3e246667c2c1e7efaf921a2c989482326507221240e2537970c40f2a84ba484b548154 WHIRLPOOL 1853c5a9cabf48ee79d3d2a0ab9fad44284f4eb36702153aab232afb41e86c586b8b87ad8a708b0fabde7bd7efd17524cd0c3dab77f26dce7f7ed73a7f140b31
 DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
+DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
 EBUILD eid-mw-4.0.2_p1188.ebuild 1790 SHA256 86bf2f047383c4fcdbdbfb3aef08d1164f52f399c98ec6c86930a2a1a487ca12 SHA512 5271f9744504ab016b275945d1d1849813c687a733fb849162f206fe4705976541559cb41174f501a1117dcd0cd705edfaccc87176b70f968785acb9da8183dd WHIRLPOOL ec242c7a2c434994c63944fc23c7891d995d8427ff271845bfb7359db422505bc597303f339fe735edea791b05a69796ac7ea2cf9ba80921d3405a49c39c1a44
 EBUILD eid-mw-4.0.4_p1253.ebuild 1710 SHA256 5ab529dd9cb9b4cd49fdb18fa099a1991f0ac94258939411d4c8bff745540831 SHA512 9e7f6935ae5a072a0ff1c6103c1f77300c2ce591d82fac96f8872d4e9f5a1545f76a0e939cc40c789c0b5700e725653141a89393f7b6453b404b88b2a8184aa0 WHIRLPOOL 18609c3f94d957096d0c8e44b02c9448c674fde860c846e7ddd7e3764eaa4f6bccee06c4bce327eeead4b926d9b2ff1057f909e6e6fc596c9f1c9b3d90aed69f
 EBUILD eid-mw-4.0.6_p1480.ebuild 1802 SHA256 25283fd9b1545c495c2317b345b564cd682564a0c88aab282cf0ea9e982a2a16 SHA512 60c597882bea8731ecdcedea14db6307cdec969e5c31b3567219e30110fc60fcfd9bc37de164999e7e5baf468322e4fde239c431b5319a964798e32ab60d6ba8 WHIRLPOOL b3b5846d99c6a04609f69bfb3df7e3a2623ba60ea4b88fcaacba761b7ee9ad8ba082f06a248a5e3d8e7c1a2f4bdc7dbeb7c5395f5cbcd1385821244799e78a96
-EBUILD eid-mw-9999.ebuild 1795 SHA256 0597bae52ecab14142ee5274165ba1ea2442deb6c722aedbfd20c7c241548d54 SHA512 21dc86b2fa76e1628e3ec20ef19a26d95a620d4de153e6919b06e7afe7e541f59e798e2bc9de11fa277417eeb3a2fac8e132e1b21b0af70ba10d80fcd6f36258 WHIRLPOOL 8d6b3e9b13603031f239513c571e549389e87274e79b9df13942df2e3cb19a4ca0aef38de603ba57b89595900feec72542168ea51d770c1aee840faf01b8037c
-MISC ChangeLog 1914 SHA256 688fccb6a21e7282331e75b03f4dffccd2696d68c206dc05b9bc5ce4b7506686 SHA512 0f3f0aa24b7cc7b516e90e42c1f1eff3823f16708d4698f74d09f4c7db3eba6b539afeae67eed293a0888386dba928a9dd1e3a2045acbc5cb85f46e79e9abcad WHIRLPOOL aa0e6b806a01ce2e3e021566e52eedd8aa98f605c30a3bf2d04cca5660ae268cc5a4f500f7bc007c912f3068b8a1adb769caa207086e0a2c7931f01b3e1863a1
+EBUILD eid-mw-4.0.6_p1620.ebuild 1756 SHA256 a8ab1322d3c658af85c494b85e8084fab0f30f8f54286a19f54503905b9211dc SHA512 4231b700ed8573ee477a8b48df5999e21c7c7d3acc7697af54b20a90feb1a4e7e1730296065b2fe1598ac04aea7c7b715168c7d48672b1a6fbe266c57c707810 WHIRLPOOL 1ac6f174ea7d3378b39f4c7b8e7d5600e0bd3fc144d45607beec4c9cfe31e81fb40da38d2bc58073f3fa19d76b33217bd1c217e3275fa6d3c02d9558d6a3e8d6
+EBUILD eid-mw-9999.ebuild 1749 SHA256 7504e5e38a9e2d2bddb595ffcc12e43d912597d298dd9d7fa080584ad868d922 SHA512 c00a805e482b9e9ed70afc14354175a4a91bf37bb747a74961e604ec9474ff791599b0f7af074e55254aae11f030a8399d4b6a37dd0d910cb5b72b8b6fd076bd WHIRLPOOL 09c0d2f53bfd975361c217e7be5532920e08bebe465c6d65256519a1fba58a0038f1993da59ba519877d8e77200baa8e6bb21bf347e427875186ec85faf83532
+MISC ChangeLog 2143 SHA256 1575fd972a8f5742ca9783ef3aa20da1e91dd431b43844974d9fce6a7b88758e SHA512 baf5fade6c50cd8d4409e2b202b5921ee8ec76c38698980fdc34c0b8ca3c2c90f5c7d3cc169a177b716c543e93d06dd5aaa315322c2f42d339573af6a3e0ddbc WHIRLPOOL d2b5ba799b4cb617b73d2b435817fed1124e2c0f60eafde9b819af4f20fbe5e8b70815c57f73600b568ddd4d2aa734ea0dccf5e2b62cf8a43fadadc95a76e777
 MISC metadata.xml 1269 SHA256 411942c695c12a879bf80b4599f657d3886fc4f621f491f7e0c99fba36cef681 SHA512 cc503ca06b716ade7e8f6ee3691035896e3a7af19366e121c0f18d13e4cb34b8d159c721430dea53d75f4c0f71f29f5a00ea00d2ea6eb35fa26e654156c87f14 WHIRLPOOL c2b59fddae9c954ffccd81beeff0c36dbc635194c37c77a393e52a618ffee46ff08aafdfaeb55ee802e5630ee0da3cc972b37581811a44b3b1511881bff5f6c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQIcBAEBCAAGBQJUw+FsAAoJEC7dUkA7aK9Hs08P/3f/Ii6YDrAk36DkX+b2+/TO
+BqkkIdhzdblubifgEpg/UAE+heepB6mqzHNeeAGuL9RGrlY9yYpufE2TCQ0uRqrK
+SCAYEvUv63MHPFxzShWucVj+o3vCKHhD6cN/aoYKLJj+HczU6PlFhr3hw1QYdbt2
+7x1fqlMe31qIMGdFw2dtgmJ8QBFiE/nlh15mbDOXWGXxG6ESHOBdBzlEqmeWzOT1
+IQUhMRpRT+O399DshyeuvEFNIBaGr4Hr355YJY7cWdeNCP12oIhYYfmNgujTRvxy
+xSwwnRplcN7FC5jh94w8egvoeXpGSKOJXb7ykxubsShAsJhHPpqWxGGyhT2K5LAE
+DW3HP4TNuvSiTKk4yck+xE49G1jGQSvaHrnEWssIjBLcdi90tY6ms7oe8/CL9QaC
+73x3jQaMlCps/KieCLrOfKlLhIl45aWhYZmWbJWHY/UZrjTgwHBdf/OMyJzenzBY
+EAUXUj4cU1NI/kiQyweMasNZIuZCMQMZskDKFADHY9ZVdvjXDIp9d5W7dL9WvnHp
+hSlsfrlVNbAzVwA+MKjuK6Exli1LGcjwVGKVMlRMPnqd9tI9S1pkwd/9QxCTUkxf
+AY8A6BsnatWPXQfhbcr9C4WC7wviu/veMirCIogOnsf/O1hBodH+vrhYIGhg/rr9
+LkD1e+ZjPjvOZ3KMFOwg
+=a8hU
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
new file mode 100644
index 000000000000..83044ed3a2d5
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild,v 1.1 2015/01/24 18:17:08 swift Exp $
+
+EAPI=5
+
+inherit eutils versionator mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-2 autotools
+	SRC_URI=""
+else
+	MY_P="${PN}-${PV/_p/-}"
+	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+	S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	>=sys-apps/pcsc-lite-1.2.9
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )
+	!app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]]; then
+	src_prepare() {
+		eautoreconf
+	}
+fi
+
+src_configure() {
+	econf $(use_enable gtk dialogs) --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index b3b8fd285a7e..ba4ce6e38eec 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-9999.ebuild,v 1.2 2014/08/10 02:26:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-9999.ebuild,v 1.3 2015/01/24 18:17:08 swift Exp $
 
 EAPI=5
 
 inherit eutils versionator mozextension multilib
 
 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="http://eid-mw.googlecode.com/svn/trunk/"
-	inherit subversion autotools
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-2 autotools
 	SRC_URI=""
 else
 	MY_P="${PN}-${PV/_p/-}"
-	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-250016.gz -> ${MY_P}.tar.gz"
+	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~x86 ~amd64"
 	S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
 fi
@@ -38,10 +39,6 @@ if [[ ${PV} == "9999" ]]; then
 	src_prepare() {
 		eautoreconf
 	}
-else
-	src_prepare() {
-		epatch "${FILESDIR}"/fix-nodialog-bug.patch
-	}
 fi
 
 src_configure() {