www-client/weboob: EAPI 6, switch to PyQt5, git-r3, add USE=deprecated

Thanks-to: Laurent Bachelier <laurent@bachelier.name>
Bug: https://bugs.gentoo.org/510810
Package-Manager: Portage-2.3.24, Repoman-2.3.6

3 files changed, 96 insertions, 65 deletions

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-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() {