7 files changed, 195 insertions, 230 deletions
diff --git a/www-client/weboob/Manifest b/www-client/weboob/Manifest
index f1c771c215e2..e31bf808df82 100644
--- a/www-client/weboob/Manifest
+++ b/www-client/weboob/Manifest
@@ -1,7 +1,5 @@
-DIST weboob-0.g.tar.gz 1465176 BLAKE2B 8b6efeb14e2233957844319de55c3f78665f89f95e88017bbbec983d1dc9525035a5d83fe5465d817d75267b1a8e5abcda5f0bc2c8c687100194f5c1d49ec03b SHA512 802b0f4cb10d1c2a13dc183d59aa642a9642b3b8f9417ce7bf66835a5f7028bc3fde9a8f3048b01cd5601585d37e6c95fa277b768723d05ab1b8eb4cb74a40bc
-DIST weboob-0.h.tar.gz 1700259 BLAKE2B e6971c8b498dd0478177334c42a39e871ee79c0171e33e7e7c8401cebfe7ea38dd7ca013b6eaa705ba5e422cf55292b8db8bc5deddce007827b3ef3af3ec7c0f SHA512 9ec34d184f965ec9124e7cb7e40e9337f781e2d79171fdc2f48b20d68bc21b8cabb349b56229b97f86257edb1d9f24886cbe3576a0fc80ed4440168119ea7e2b
-EBUILD weboob-0g.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
-EBUILD weboob-0h.ebuild 2008 BLAKE2B 46989e6bba0a571a6af057e2cf2fc1763003861351971bd7978c84f104a0a4fa274a685ed91182c7d1f4de4613928e43130aa430d06c798d4098711be6587b48 SHA512 957e543dbe2e32c9a5cc91428c07b1fc7f349bc898f9cdbd07d822b8d4440a6b21f5ee4d8768af1b60347f46d675a5217166ff440e1f431d242d16922f4e4b3d
-EBUILD weboob-9998.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
-EBUILD weboob-9999.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
-MISC metadata.xml 370 BLAKE2B 78add6f45e7d9326a94833c4c34e55c09ed2d5a5afe6be2ccfb6b1e5cd705066fd115f38c5bd22a4729582e7217ccd17884fe639960384e1c6bc4c14c6d5de07 SHA512 a5e4d8c198fdc5d5267f57d2c5817f499d7e27ed724057e4c6af8e48da319dcc346e32c56cd79c8729b6deab09ff619608a5b6620967c9c68f843fd189800a3a
+DIST weboob-1.3.tar.gz 2688899 BLAKE2B a75a854137b117fd228959a6c5d19e93c5a0520a8e88227e2d6e8bf13795b2d3ba51173307563b5704be68fe680dd3573fc3b7308e29d422bc9ee6e3d4adaaa7 SHA512 c56704b9fc0d21c5d2b4d297f677f01d25d523c3d45acf7ed0b241fccd4b2477ddb60e58d2dd68886858dc8a50faa43d533c808b106546180552babf9c07543c
+EBUILD weboob-1.3.ebuild 2427 BLAKE2B e78de6a2c0d0a9e204c173597cd87233d1ab1fafa7a5daf42cb69a56580f049cf5e75709ec405b8b0186515bfe18d965b32138c56e856faf95f98877b8f72ad5 SHA512 1d05935e5cf8585932554ba2ddae2aa4fd5c93ab6bdbee313cdbcc7d2dbbc2748fd7eb60e2813fd2d89b984a479cb55d457b614cfa39e329a22cc2ef5e4eee90
+EBUILD weboob-9998.ebuild 2427 BLAKE2B e78de6a2c0d0a9e204c173597cd87233d1ab1fafa7a5daf42cb69a56580f049cf5e75709ec405b8b0186515bfe18d965b32138c56e856faf95f98877b8f72ad5 SHA512 1d05935e5cf8585932554ba2ddae2aa4fd5c93ab6bdbee313cdbcc7d2dbbc2748fd7eb60e2813fd2d89b984a479cb55d457b614cfa39e329a22cc2ef5e4eee90
+EBUILD weboob-9999.ebuild 2427 BLAKE2B e78de6a2c0d0a9e204c173597cd87233d1ab1fafa7a5daf42cb69a56580f049cf5e75709ec405b8b0186515bfe18d965b32138c56e856faf95f98877b8f72ad5 SHA512 1d05935e5cf8585932554ba2ddae2aa4fd5c93ab6bdbee313cdbcc7d2dbbc2748fd7eb60e2813fd2d89b984a479cb55d457b614cfa39e329a22cc2ef5e4eee90
+MISC metadata.xml 505 BLAKE2B 0ead93ab79e15e2a34f6f46d6cfedbea661f04addbd2ae5ec4125cc4e9503c9d46fdec7f6880f1a329f2db0472ab67032fe2beaa28a10ff11d9a246b8f5cfbc8 SHA512 09332ad143bb8398627d42f3266dc99d73de9072f8c01747dafca12f1bba6e7b0d1cf5dc8860a1d988d9feb1a333e98f92ee1b65ace821b00d599d53eb63ca9a
diff --git a/www-client/weboob/metadata.xml b/www-client/weboob/metadata.xml
index 906331ef879f..3c664215f38c 100644
--- a/www-client/weboob/metadata.xml
+++ b/www-client/weboob/metadata.xml
@@ -6,7 +6,8 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
 	<use>
-		<flag name="secure-updates">Enable secure updates</flag>
+		<flag name="deprecated">Enable <pkg>dev-python/mechanize</pkg> support (deprecated in favor of <pkg>dev-python/requests</pkg></flag>
 		<flag name="fast-libs">Enable fast libs</flag>
+		<flag name="secure-updates">Enable secure updates</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/weboob/weboob-0g.ebuild b/www-client/weboob/weboob-0g.ebuild
deleted file mode 100644
index 8cc40ca6189f..000000000000
--- a/www-client/weboob/weboob-0g.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils versionator
-
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~x86 ~amd64"
-	MY_P="${PN}-$(version_format_string '$1.$2')"
-	SRC_URI="http://symlink.me/attachments/download/229/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
-HOMEPAGE="http://weboob.org/"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="X +secure-updates fast-libs"
-
-DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/html2text[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	secure-updates? ( app-crypt/gnupg )
-	fast-libs? (
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
-	)
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex X '--qt' '--no-qt')
-		$(usex X '--xdg' '--no-xdg')
-	)
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${PN}/
-	doins -r contrib/*
-}
-
-pkg_preinst() {
-	use X && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use X && gnome2_icon_cache_update
-	elog 'You should now run "weboob-config update" (as your login user).'
-}
-
-pkg_postrm() {
-	use X && gnome2_icon_cache_update
-}
diff --git a/www-client/weboob/weboob-0h.ebuild b/www-client/weboob/weboob-0h.ebuild
deleted file mode 100644
index d3f6230fa0ec..000000000000
--- a/www-client/weboob/weboob-0h.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils versionator
-
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~x86 ~amd64"
-	MY_P="${PN}-$(version_format_string '$1.$2')"
-	SRC_URI="http://symlink.me/attachments/download/235/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
-HOMEPAGE="http://weboob.org/"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="X +secure-updates fast-libs"
-
-DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/html2text[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	secure-updates? ( app-crypt/gnupg )
-	fast-libs? (
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
-	)
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex X '--qt' '--no-qt')
-		$(usex X '--xdg' '--no-xdg')
-	)
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${PN}/
-	doins -r contrib/*
-}
-
-pkg_preinst() {
-	use X && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use X && gnome2_icon_cache_update
-	elog 'You should now run "weboob-config update" (as your login user).'
-}
-
-pkg_postrm() {
-	use X && gnome2_icon_cache_update
-}
diff --git a/www-client/weboob/weboob-1.3.ebuild b/www-client/weboob/weboob-1.3.ebuild
new file mode 100644
index 000000000000..13f4e208d435
--- /dev/null
+++ b/www-client/weboob/weboob-1.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2010-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+EGIT_BASE="devel"
+if [[ ${PV} == *999* ]]; then
+	[[ ${PV} == 9998 ]] && EGIT_BASE="stable"
+	GIT_SCM=git-r3
+	SRC_URI=""
+else
+	REDMINE_ID="356"
+	SRC_URI="https://symlink.me/attachments/download/${REDMINE_ID}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+EGIT_REPO_URI="https://git.weboob.org/${PN}/${EGIT_BASE}.git"
+inherit distutils-r1 gnome2-utils ${GIT_SCM}
+unset EGIT_BASE GIT_SCM
+
+DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
+HOMEPAGE="http://weboob.org/"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="+deprecated fast-libs +secure-updates X"
+
+COMMON_DEPEND="
+	X? ( dev-python/PyQt5[multimedia,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/html2text[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP},ssl]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	deprecated? ( dev-python/mechanize[${PYTHON_USEDEP}] )
+	fast-libs? (
+		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+	secure-updates? ( app-crypt/gnupg )
+	X? ( dev-python/google-api-python-client[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+
+	if [[ -L contrib/webextension-session-importer/logo.png ]]; then
+		cp -L contrib/webextension-session-importer/logo.png logo.tmp.png || die
+		rm contrib/webextension-session-importer/logo.png || die
+		mv logo.tmp.png contrib/webextension-session-importer/logo.png || die
+	fi
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		$(usex X '--qt' '--no-qt')
+		$(usex X '--xdg' '--no-xdg')
+	)
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${PN}/
+	doins -r contrib
+}
+
+pkg_preinst() {
+	use X && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use X && gnome2_icon_cache_update
+	elog 'You should now run "weboob-config update" (as your login user).'
+}
+
+pkg_postrm() {
+	use X && gnome2_icon_cache_update
+}
diff --git a/www-client/weboob/weboob-9998.ebuild b/www-client/weboob/weboob-9998.ebuild
index 8cc40ca6189f..13f4e208d435 100644
--- a/www-client/weboob/weboob-9998.ebuild
+++ b/www-client/weboob/weboob-9998.ebuild
@@ -1,56 +1,71 @@
-# Copyright 2010-2015 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
 
-inherit distutils-r1 gnome2-utils versionator
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
 
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
-	inherit git-2
-	KEYWORDS=""
+EGIT_BASE="devel"
+if [[ ${PV} == *999* ]]; then
+	[[ ${PV} == 9998 ]] && EGIT_BASE="stable"
+	GIT_SCM=git-r3
 	SRC_URI=""
 else
-	KEYWORDS="~x86 ~amd64"
-	MY_P="${PN}-$(version_format_string '$1.$2')"
-	SRC_URI="http://symlink.me/attachments/download/229/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
+	REDMINE_ID="356"
+	SRC_URI="https://symlink.me/attachments/download/${REDMINE_ID}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
+EGIT_REPO_URI="https://git.weboob.org/${PN}/${EGIT_BASE}.git"
+inherit distutils-r1 gnome2-utils ${GIT_SCM}
+unset EGIT_BASE GIT_SCM
+
 DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
 HOMEPAGE="http://weboob.org/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-IUSE="X +secure-updates fast-libs"
+IUSE="+deprecated fast-libs +secure-updates X"
 
-DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/prettytable[${PYTHON_USEDEP}]
+COMMON_DEPEND="
+	X? ( dev-python/PyQt5[multimedia,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/html2text[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP},ssl]
+	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
-	secure-updates? ( app-crypt/gnupg )
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	deprecated? ( dev-python/mechanize[${PYTHON_USEDEP}] )
 	fast-libs? (
-		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
 	)
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
+	secure-updates? ( app-crypt/gnupg )
+	X? ( dev-python/google-api-python-client[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
 
-DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
+src_prepare() {
+	default
+
+	if [[ -L contrib/webextension-session-importer/logo.png ]]; then
+		cp -L contrib/webextension-session-importer/logo.png logo.tmp.png || die
+		rm contrib/webextension-session-importer/logo.png || die
+		mv logo.tmp.png contrib/webextension-session-importer/logo.png || die
+	fi
+}
 
 python_configure_all() {
 	mydistutilsargs=(
@@ -62,7 +77,7 @@ python_configure_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 	insinto /usr/share/${PN}/
-	doins -r contrib/*
+	doins -r contrib
 }
 
 pkg_preinst() {
diff --git a/www-client/weboob/weboob-9999.ebuild b/www-client/weboob/weboob-9999.ebuild
index 8cc40ca6189f..13f4e208d435 100644
--- a/www-client/weboob/weboob-9999.ebuild
+++ b/www-client/weboob/weboob-9999.ebuild
@@ -1,56 +1,71 @@
-# Copyright 2010-2015 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
 
-inherit distutils-r1 gnome2-utils versionator
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
 
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/stable.git"
-	inherit git-2
-	KEYWORDS=""
+EGIT_BASE="devel"
+if [[ ${PV} == *999* ]]; then
+	[[ ${PV} == 9998 ]] && EGIT_BASE="stable"
+	GIT_SCM=git-r3
 	SRC_URI=""
 else
-	KEYWORDS="~x86 ~amd64"
-	MY_P="${PN}-$(version_format_string '$1.$2')"
-	SRC_URI="http://symlink.me/attachments/download/229/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
+	REDMINE_ID="356"
+	SRC_URI="https://symlink.me/attachments/download/${REDMINE_ID}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
+EGIT_REPO_URI="https://git.weboob.org/${PN}/${EGIT_BASE}.git"
+inherit distutils-r1 gnome2-utils ${GIT_SCM}
+unset EGIT_BASE GIT_SCM
+
 DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
 HOMEPAGE="http://weboob.org/"
 
 LICENSE="AGPL-3"
 SLOT="0"
-IUSE="X +secure-updates fast-libs"
+IUSE="+deprecated fast-libs +secure-updates X"
 
-DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/prettytable[${PYTHON_USEDEP}]
+COMMON_DEPEND="
+	X? ( dev-python/PyQt5[multimedia,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/html2text[${PYTHON_USEDEP}]
-	dev-python/mechanize[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/gdata[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP},ssl]
+	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
-	secure-updates? ( app-crypt/gnupg )
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	deprecated? ( dev-python/mechanize[${PYTHON_USEDEP}] )
 	fast-libs? (
-		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
 	)
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]"
+	secure-updates? ( app-crypt/gnupg )
+	X? ( dev-python/google-api-python-client[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
 
-DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
+src_prepare() {
+	default
+
+	if [[ -L contrib/webextension-session-importer/logo.png ]]; then
+		cp -L contrib/webextension-session-importer/logo.png logo.tmp.png || die
+		rm contrib/webextension-session-importer/logo.png || die
+		mv logo.tmp.png contrib/webextension-session-importer/logo.png || die
+	fi
+}
 
 python_configure_all() {
 	mydistutilsargs=(
@@ -62,7 +77,7 @@ python_configure_all() {
 python_install_all() {
 	distutils-r1_python_install_all
 	insinto /usr/share/${PN}/
-	doins -r contrib/*
+	doins -r contrib
 }
 
 pkg_preinst() {