Version bump based on ebuild by Laurent Bachelier, bug 463396. Convert to distutils-r1.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

7 files changed, 191 insertions, 215 deletions

diff --git a/www-client/weboob/ChangeLog b/www-client/weboob/ChangeLog
index 8dc315f67d04..ea0543155709 100644
--- a/www-client/weboob/ChangeLog
+++ b/www-client/weboob/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/weboob
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/ChangeLog,v 1.4 2013/03/25 03:42:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/ChangeLog,v 1.5 2013/08/03 15:08:29 floppym Exp $
+
+*weboob-0g (03 Aug 2013)
+
+  03 Aug 2013; Mike Gilbert <floppym@gentoo.org> +weboob-0g.ebuild,
+  -weboob-0d.ebuild, -weboob-0e-r2.ebuild, weboob-9998.ebuild,
+  weboob-9999.ebuild:
+  Version bump based on ebuild by Laurent Bachelier, bug 463396. Convert to
+  distutils-r1.
 
 *weboob-0e-r2 (25 Mar 2013)
 
diff --git a/www-client/weboob/Manifest b/www-client/weboob/Manifest
index 25279bdd4f89..6e4fbf261304 100644
--- a/www-client/weboob/Manifest
+++ b/www-client/weboob/Manifest
@@ -1,8 +1,16 @@
-DIST weboob-0.d.tar.gz 1026273 SHA256 faefbd90611bd64386b43073d2eea2bf2506f38448c971430448fdcbbd0a304e SHA512 f1141f0ecf56982686a9b2f622048f6b1210c499dabe75eef7f19e89901a2fc6b0664f62d5d786c492984c2c1f13ef6c4b9b7b935bc15169fc47dcb89e932377 WHIRLPOOL 2c5f759fee5e9b49c812a135f4d4033bfaf26a063592ce145da4ef897eba51952ddd2e6de19767e171a671164539201f7ed538fcfb4e9d55cddf43afbe5d7d86
-DIST weboob-0.e.tar.gz 1087165 SHA256 03331e3afbcaface36f079cbc70d38f34876309c7cb25f53741fd938046319aa SHA512 c07ee148e4b75e6074d0cc1962fdac12cd7b01d4bd6dfedc89667fc3415adb9757dee568750f1b765384483bb01bb082dceba16fac2979a217cf43362b2f40d0 WHIRLPOOL 0d7ec57d807f3f4a1457196d604b92a7b68b3bc031eb0afa4f0b29707a85d73645d3d9485496afb24e9b36ded19ee70fc8064a95189f45c76e77bcc4904a90aa
-EBUILD weboob-0d.ebuild 1889 SHA256 3f71fb7c3aed8d458a5f3ffff4ec9c6433e8c984c9b7fcc51bb4c11a87f02235 SHA512 4845a764b42796e20a9bbb8c855fc2d253f0af0298280e8ea3a3c40ce96cb1b473b9339e7ef4a21f5096bbd31c6036806d865540ca81ef054c2b8dc6478e1f2f WHIRLPOOL f3cecca6a0c9c8e07c77f7081feaac1f989db98ec4456ac4e1a5cf1fa04b819068858a6ab292c7d72ff90bccc5588f3150504e76712a1f8e948c79a752f6faa8
-EBUILD weboob-0e-r2.ebuild 1913 SHA256 a1fc93fdcddd88276bb95eeca49a9c0c4aa2aa4f2d2013bb30afbb84bf976446 SHA512 c5e43580eb28b71c0fbfcf4cdc905b518caa1412badea896adced35cbc5ddab7563ffc29f2a98a909d6634d7f576564e392425d571d3b6e6966cfa4cf8dc525f WHIRLPOOL 5d1e7601ba7a5fe5ff0b30e44cda9b231933c84f5640d41ce22e4d6df9e84e9e4056d1e4978ead9363fd0cff83b1e5fef6a3607ada7f6681fab7245f3163a79c
-EBUILD weboob-9998.ebuild 1912 SHA256 c9625a7f8ee64c556d20fe183ab9a7b4973666d8a4f4c761468f79d7851465e0 SHA512 131a897af31d0c6bfa17078302019a04afcfb24f1303b36d7ba0dc0e5fd42a5c62a4f3474401186f0b13ad881fd87724b6dc8cf643b8c29921d2c35c1de1127d WHIRLPOOL 77d58664103b3d16ac17a87d17a7ec6d4267f6965f376f04a77fdfdb0fcc740f4e03981e60597a4a92278b9788de3b5a618f2410df2e1e1efe99d3780f38219b
-EBUILD weboob-9999.ebuild 1912 SHA256 61a5d1ae51a4c827e37801231d99a4b30dd3ea9154d7883bf7fd0434981c6fdb SHA512 0c87f964d8174de4619a5afcb0c0e5f72d5b50c9d78fc98d85a134479f377b0190df99ffac03b1ff94f82ca0053ed26e78e0b2004a4d5e70963e16ebe19cd570 WHIRLPOOL 5d16970b0cedc2e5defa29221ae25a0523325dc0cafde2024746841243f3ead919898e6263e085348f303c23ddecaa1477b5450aa37902145107a90782c7e8fe
-MISC ChangeLog 944 SHA256 b90c4522b8ef20fc6dccdb03f482925632819570c2e9258e1b851bcfd9d13721 SHA512 17dea76ee0ca6bcb816e21e5423780d07dcc942be3ec24d7635bf37f2f80db65c66cb00fa626f01d2fda6870da96d5df0ec800f5c1e580e6d89caf92a9dd693c WHIRLPOOL 7024f059c214643828dfd6daf81376610ef729d1c96e3c2561102ec16952c06c64c6b61481282f0e5a7ce33978f7a2ab6a3e79938818085556b67bc6a086e33e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST weboob-0.g.tar.gz 1465176 SHA256 ccf4643fa0573a905061b29603fc89ef9e953fa7d88c0d239807689c2eab5b2d SHA512 802b0f4cb10d1c2a13dc183d59aa642a9642b3b8f9417ce7bf66835a5f7028bc3fde9a8f3048b01cd5601585d37e6c95fa277b768723d05ab1b8eb4cb74a40bc WHIRLPOOL 4a42b4b48808f9590be1a4b0ab63cf79779905b9c4d789b24919241e85185bc07ace4a2cb8d6c34057ec86936828eeefc99e130ec4d9f7e507551340d3c86738
+EBUILD weboob-0g.ebuild 2198 SHA256 d9b6775dbae4a53be928f98dd533e828a869ca22c65db1de7a82dbfe0ce9c85a SHA512 4fd6e41d4b61c57d3e0fefffba92e0d2a79445f06b0cb787684686bdf7efcb16ad09aa00a2268d9a1dfee1ffc8532869bb68a2d178e7e8fec8cd74e3497a3eb0 WHIRLPOOL 0575841db908cb0dbbfafbe343fe891833e2d78a13af7b232f587c82bfc205014e9deb30648682e1307821726e16c41f0f53f7aaae7e38e4ffbd9f64406ee95e
+EBUILD weboob-9998.ebuild 2200 SHA256 2fd7d4eb595b5f3b7c8aa6d5a2a29ba315797688fa907add5d1181cb32f7be86 SHA512 28ed34e8f451d61c26a09b35b8419df8e9d943959ec91207a1590f537bf479a27d83260e8127003a2e779002177fc3ca9b7810c7386feaa498e363c1d39ee247 WHIRLPOOL 90b671858bedeb8ba3139bbd82d13ea3a2743bec5ef4ec4f0c075ca7e2c8459d70607517a1077d45039d997a19707962526dfbb5272357f8ce75de64e0dc63e2
+EBUILD weboob-9999.ebuild 2200 SHA256 b1b1a89322eb37fd4990e3bb2ddd2f8aa3d58fce7ce77ed4f1ed35be4d11d022 SHA512 81f5b75b8faab4b989e95b8be17a66d04677643a61e31049bcca9f48b38ffc87b131c2d7a2f7b6f4fcbe672d296d97b55285ecaee5a59507b121937bb3540f9f WHIRLPOOL 124bf3af22f86ef4dafec717248e5e65c91828462b0b39b24c5569e5407df23fa51375c595fcc38f45203caf30f571cb140ed157a32cb11bac9a4ebe5334a12f
+MISC ChangeLog 1216 SHA256 ddbf044d67f0c009067d46bda415fb9ddcf7f3ada30f95fde285e7e5a961faf6 SHA512 353bb8e714571d0462984b1e98d928a976f901a83c750140e3e56671aca2ac267a6855062e8ea2951befd40a8b58ff33ad510b725cdb9f8972576f4e8499be32 WHIRLPOOL 90aa3ee75d778418f15ad302d9a992478f0e81e6ffe75b10eef22a65b9d84b203ac357e39217a2d0cf50c521d96454706f3bead6dc9328babf8f71a6fd6a1ac0
 MISC metadata.xml 356 SHA256 c227d5a74ebdbb1b95696940be97d3f09e6ee91d3d43d3bfbbee623d497d682f SHA512 0f3fd3f8ee70e664c8bacce5cab76ad36adab526f77accb5564722ea20d9fb354bcecab97cebe1758d011aa0f9dec8045bbe60cb6257778a0a017bb5dcf871b3 WHIRLPOOL fbcf7fcc6a635aa9a2cde4056f8d780418a11ee93ec04f81306f2c1fe73713662351dbb0ada6a807ddce36ebe1ab53e2058b56a87a2635ddabcf7174b4109025
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iF4EAREIAAYFAlH9HO8ACgkQC77qH+pIQ6QHmgD/RRDlUiF2W0ZG/2DwCKNTBj9O
+MZtNcHIYOZOJuoMfHo4A/RzjOe31Jskgt26l8uHtOKN/r1SbNPPB5t/rSDKgPovK
+=emVd
+-----END PGP SIGNATURE-----
diff --git a/www-client/weboob/weboob-0d.ebuild b/www-client/weboob/weboob-0d.ebuild
deleted file mode 100644
index 68dce6b3a2ae..000000000000
--- a/www-client/weboob/weboob-0d.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2010-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-0d.ebuild,v 1.1 2013/01/25 08:31:16 patrick Exp $
-
-EAPI=5
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit base distutils
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/romain/${PN}.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-elif [ "$PV" == "9998" ]; then
-	EGIT_REPO_URI="git://git.symlink.me/pub/romain/${PN}-stable.git"
-	inherit git-2
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~x86 ~amd64"
-	SRC_URI="http://symlink.me/attachments/download/199/${PN}-0.d.tar.gz"
-	S="${WORKDIR}/${PN}-0.d"
-fi
-
-DESCRIPTION="Weboob (Web Out of Browsers) provides several applications to interact with a lot of websites."
-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] dev-python/pyxdg )"
-RDEPEND="${DEPEND}
-	dev-python/prettytable
-	dev-python/html2text
-	dev-python/mechanize
-	dev-python/python-dateutil
-	dev-python/pyyaml
-	dev-python/imaging
-	dev-python/gdata
-	dev-python/feedparser
-	secure-updates? ( app-crypt/gnupg )
-	fast-libs? ( dev-python/simplejson dev-python/pyyaml[libyaml] )
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	|| ( ( <dev-python/lxml-3.0 ) ( >=dev-python/lxml-3.0 dev-python/cssselect ) )"
-
-DOCS="AUTHORS COPYING ChangeLog README INSTALL"
-
-set_global_options() {
-	DISTUTILS_GLOBAL_OPTIONS=("* --$(usex X '' 'no-')qt" "* --$(usex X '' 'no-')xdg")
-}
-
-distutils_src_install_pre_hook() {
-	set_global_options
-}
-
-distutils_src_install_post_hook() {
-	exeinto "/usr/share/${PN}"
-	doexe contrib/*-munin
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
-
-pkg_postinst() {
-	elog "You should now run \"weboob-config update\" (as your login user)."
-}
diff --git a/www-client/weboob/weboob-0e-r2.ebuild b/www-client/weboob/weboob-0e-r2.ebuild
deleted file mode 100644
index bfcde2182b5a..000000000000
--- a/www-client/weboob/weboob-0e-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2010-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-0e-r2.ebuild,v 1.1 2013/03/25 03:42:27 patrick Exp $
-
-EAPI=5
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit base distutils
-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"
-	SRC_URI="http://symlink.me/attachments/download/206/${PN}-0.e.tar.gz"
-	S="${WORKDIR}/${PN}-0.e"
-fi
-
-DESCRIPTION="Weboob (Web Out of Browsers) provides several applications to interact with a lot of websites."
-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] dev-python/pyxdg )"
-RDEPEND="${DEPEND}
-	dev-python/prettytable
-	dev-python/html2text
-	dev-python/mechanize
-	dev-python/python-dateutil
-	dev-python/pyyaml
-	dev-python/imaging
-	dev-python/gdata
-	dev-python/feedparser
-	media-video/rtmpdump
-	secure-updates? ( app-crypt/gnupg )
-	fast-libs? ( dev-python/simplejson dev-python/pyyaml[libyaml] )
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	|| ( ( <dev-python/lxml-3.0 ) ( >=dev-python/lxml-3.0 dev-python/cssselect ) )"
-
-DOCS="AUTHORS COPYING ChangeLog README INSTALL"
-
-set_global_options() {
-	DISTUTILS_GLOBAL_OPTIONS=("* --$(usex X '' 'no-')qt" "* --$(usex X '' 'no-')xdg")
-}
-
-distutils_src_install_pre_hook() {
-	set_global_options
-}
-
-distutils_src_install_post_hook() {
-	exeinto "/usr/share/${PN}"
-	doexe contrib/*-munin
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
-
-pkg_postinst() {
-	elog "You should now run \"weboob-config update\" (as your login user)."
-}
diff --git a/www-client/weboob/weboob-0g.ebuild b/www-client/weboob/weboob-0g.ebuild
new file mode 100644
index 000000000000..90fa6bb14b1c
--- /dev/null
+++ b/www-client/weboob/weboob-0g.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2010-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-0g.ebuild,v 1.1 2013/08/03 15:08:29 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_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="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites."
+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}]
+	virtual/python-imaging[${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}]
+	)
+	virtual/python-json[${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-9998.ebuild b/www-client/weboob/weboob-9998.ebuild
index c868dedb6ee1..e7f97960ce40 100644
--- a/www-client/weboob/weboob-9998.ebuild
+++ b/www-client/weboob/weboob-9998.ebuild
@@ -1,13 +1,12 @@
 # Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-9998.ebuild,v 1.3 2013/03/25 03:42:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-9998.ebuild,v 1.4 2013/08/03 15:08:29 floppym Exp $
 
 EAPI=5
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 gnome2-utils versionator
 
-inherit base distutils
 if [ "$PV" == "9999" ]; then
 	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
 	inherit git-2
@@ -20,52 +19,63 @@ elif [ "$PV" == "9998" ]; then
 	SRC_URI=""
 else
 	KEYWORDS="~x86 ~amd64"
-	SRC_URI="http://symlink.me/attachments/download/206/${PN}-0.e.tar.gz"
-	S="${WORKDIR}/${PN}-0.e"
+	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="Weboob (Web Out of Browsers) provides several applications to interact with a lot of websites."
+DESCRIPTION="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites."
 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] dev-python/pyxdg )"
+DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	dev-python/prettytable
-	dev-python/html2text
-	dev-python/mechanize
-	dev-python/python-dateutil
-	dev-python/pyyaml
-	dev-python/imaging
-	dev-python/gdata
-	dev-python/feedparser
-	media-video/rtmpdump
+	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}]
+	virtual/python-imaging[${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 dev-python/pyyaml[libyaml] )
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	|| ( ( <dev-python/lxml-3.0 ) ( >=dev-python/lxml-3.0 dev-python/cssselect ) )"
+	fast-libs? (
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
+	)
+	virtual/python-json[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]"
 
-DOCS="AUTHORS COPYING ChangeLog README INSTALL"
+DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
 
-set_global_options() {
-	DISTUTILS_GLOBAL_OPTIONS=("* --$(usex X '' 'no-')qt" "* --$(usex X '' 'no-')xdg")
+python_configure_all() {
+	mydistutilsargs=(
+		$(usex X '--qt' '--no-qt')
+		$(usex X '--xdg' '--no-xdg')
+	)
 }
 
-distutils_src_install_pre_hook() {
-	set_global_options
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${PN}/
+	doins -r contrib/*
 }
 
-distutils_src_install_post_hook() {
-	exeinto "/usr/share/${PN}"
-	doexe contrib/*-munin
+pkg_preinst() {
+	use X && gnome2_icon_savelist
 }
 
-distutils_src_compile_pre_hook() {
-	set_global_options
+pkg_postinst() {
+	use X && gnome2_icon_cache_update
+	elog 'You should now run "weboob-config update" (as your login user).'
 }
 
-pkg_postinst() {
-	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-9999.ebuild b/www-client/weboob/weboob-9999.ebuild
index 45d774a31235..dfd5e36f90e5 100644
--- a/www-client/weboob/weboob-9999.ebuild
+++ b/www-client/weboob/weboob-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-9999.ebuild,v 1.3 2013/03/25 03:42:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/weboob/weboob-9999.ebuild,v 1.4 2013/08/03 15:08:29 floppym Exp $
 
 EAPI=5
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 gnome2-utils versionator
 
-inherit base distutils
 if [ "$PV" == "9999" ]; then
 	EGIT_REPO_URI="git://git.symlink.me/pub/${PN}/devel.git"
 	inherit git-2
@@ -20,52 +19,63 @@ elif [ "$PV" == "9998" ]; then
 	SRC_URI=""
 else
 	KEYWORDS="~x86 ~amd64"
-	SRC_URI="http://symlink.me/attachments/download/206/${PN}-0.e.tar.gz"
-	S="${WORKDIR}/${PN}-0.e"
+	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="Weboob (Web Out of Browsers) provides several applications to interact with a lot of websites."
+DESCRIPTION="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites."
 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] dev-python/pyxdg )"
+DEPEND="X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	dev-python/prettytable
-	dev-python/html2text
-	dev-python/mechanize
-	dev-python/python-dateutil
-	dev-python/pyyaml
-	dev-python/imaging
-	dev-python/gdata
-	dev-python/feedparser
-	media-video/rtmpdump
+	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}]
+	virtual/python-imaging[${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 dev-python/pyyaml[libyaml] )
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	|| ( ( <dev-python/lxml-3.0 ) ( >=dev-python/lxml-3.0 dev-python/cssselect ) )"
+	fast-libs? (
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/pyyaml[libyaml,${PYTHON_USEDEP}]
+	)
+	virtual/python-json[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]"
 
-DOCS="AUTHORS COPYING ChangeLog README INSTALL"
+DOCS=( AUTHORS COPYING ChangeLog README INSTALL )
 
-set_global_options() {
-	DISTUTILS_GLOBAL_OPTIONS=("* --$(usex X '' 'no-')qt" "* --$(usex X '' 'no-')xdg")
+python_configure_all() {
+	mydistutilsargs=(
+		$(usex X '--qt' '--no-qt')
+		$(usex X '--xdg' '--no-xdg')
+	)
 }
 
-distutils_src_install_pre_hook() {
-	set_global_options
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${PN}/
+	doins -r contrib/*
 }
 
-distutils_src_install_post_hook() {
-	exeinto "/usr/share/${PN}"
-	doexe contrib/*-munin
+pkg_preinst() {
+	use X && gnome2_icon_savelist
 }
 
-distutils_src_compile_pre_hook() {
-	set_global_options
+pkg_postinst() {
+	use X && gnome2_icon_cache_update
+	elog 'You should now run "weboob-config update" (as your login user).'
 }
 
-pkg_postinst() {
-	elog "You should now run \"weboob-config update\" (as your login user)."
+pkg_postrm() {
+	use X && gnome2_icon_cache_update
 }