From aa4fa184aa76c267b5106a4cdd52324915b3bb84 Mon Sep 17 00:00:00 2001
From: Wynn Wolf Arbor
Date: Sat, 16 Jan 2021 13:35:58 +0100
Subject: app-office/beancount: Clean up dependencies, use python_gen_cond_dep

Package-Manager: Portage-3.0.12, Repoman-3.0.2
---
 app-office/beancount/Manifest               |  4 ++--
 app-office/beancount/beancount-2.3.3.ebuild | 29 +++++++++++++++--------------
 app-office/beancount/beancount-9999.ebuild  | 29 +++++++++++++++--------------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/app-office/beancount/Manifest b/app-office/beancount/Manifest
index f91307b..d563882 100644
--- a/app-office/beancount/Manifest
+++ b/app-office/beancount/Manifest
@@ -1,4 +1,4 @@
 DIST beancount-2.3.3.tar.gz 632580 BLAKE2B 40059cfc887a66ae182d8a5bc1e437e351befa00323a5a618bd5060f732df3fd6c10e73179f68ccbf2ae10e15f4a6130f9f1261c211c8192750102000615e815 SHA512 1fd8b470d98073f9dab0a375f0b8a0a3b57b1328925a069c199bad3b10fb99a09cb745374cc22d487e05b826c4c421d84623469da9f335a328c591e247fc945a
-EBUILD beancount-2.3.3.ebuild 1547 BLAKE2B 63148fd9df65e77e74aa1033ed738c30f023aeb6d28c31766639f550d128a2d01315de82c9f41e7ca8b581805bebe8218d7e06cebadf961f0da9065451a361f8 SHA512 fbc7b35a396ae9bc91ed0521093cddb5bdadb6ef6c1f24efe8ffcb03d53ce2902ffdea1e2375d7beb225a4440416b888ce4d1e03095f827847e7aa6f24fb2b03
-EBUILD beancount-9999.ebuild 1547 BLAKE2B 63148fd9df65e77e74aa1033ed738c30f023aeb6d28c31766639f550d128a2d01315de82c9f41e7ca8b581805bebe8218d7e06cebadf961f0da9065451a361f8 SHA512 fbc7b35a396ae9bc91ed0521093cddb5bdadb6ef6c1f24efe8ffcb03d53ce2902ffdea1e2375d7beb225a4440416b888ce4d1e03095f827847e7aa6f24fb2b03
+EBUILD beancount-2.3.3.ebuild 1539 BLAKE2B 4d3fa33396f26603aa73f2822094e7608629a7cb611bf4885feba309fb5dcc6a520474ccda49cd2177183bac733240aed0433afbd5932e1b7dd4faa31b0dde05 SHA512 9ab7c61748ff6eb965d3516397ac900c2cb776504b17329877c97309f831fdf5a40dd7a5202045758268b4699a440973eb5ec67a780a8b309b3ee8f489a186a2
+EBUILD beancount-9999.ebuild 1539 BLAKE2B 4d3fa33396f26603aa73f2822094e7608629a7cb611bf4885feba309fb5dcc6a520474ccda49cd2177183bac733240aed0433afbd5932e1b7dd4faa31b0dde05 SHA512 9ab7c61748ff6eb965d3516397ac900c2cb776504b17329877c97309f831fdf5a40dd7a5202045758268b4699a440973eb5ec67a780a8b309b3ee8f489a186a2
 MISC metadata.xml 219 BLAKE2B 4017e2b1f6b36f72c186cfeb0955be57076a02d087acfd6caf9b9ec56509b5299be8d40dddaffd04433bb290f6dd35c94c59ac02a4f1ad7e63b13648e465e594 SHA512 555d3bce3f8cd9b4d78f59f494c326d7893f12c1907c1eb92107595886fc4a5e89b8b9fda7f434e021a9eede5dfd6d0c1dfee721c268ccad3d6a1865a92204e0
diff --git a/app-office/beancount/beancount-2.3.3.ebuild b/app-office/beancount/beancount-2.3.3.ebuild
index 0a31ff2..18a460d 100644
--- a/app-office/beancount/beancount-2.3.3.ebuild
+++ b/app-office/beancount/beancount-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,19 +27,20 @@ IUSE="emacs"
 SITEFILE="50{PN}-mode-gentoo.el"
 
 RDEPEND="
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/bottle-0.12[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/python-magic-0.4.12[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+		>=dev-python/bottle-0.12[${PYTHON_USEDEP}]
+		>=dev-python/google-api-python-client-1.8.2[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.10[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+		>=dev-python/oauth2client-4.0[${PYTHON_USEDEP}]
+		>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/python-magic-0.4.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	')
+"
 
 python_compile_all() {
 	use emacs && elisp-compile editors/emacs/beancount.el
diff --git a/app-office/beancount/beancount-9999.ebuild b/app-office/beancount/beancount-9999.ebuild
index 0a31ff2..18a460d 100644
--- a/app-office/beancount/beancount-9999.ebuild
+++ b/app-office/beancount/beancount-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,19 +27,20 @@ IUSE="emacs"
 SITEFILE="50{PN}-mode-gentoo.el"
 
 RDEPEND="
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/bottle-0.12[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/python-magic-0.4.12[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
+		>=dev-python/bottle-0.12[${PYTHON_USEDEP}]
+		>=dev-python/google-api-python-client-1.8.2[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.10[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+		>=dev-python/oauth2client-4.0[${PYTHON_USEDEP}]
+		>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/python-magic-0.4.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	')
+"
 
 python_compile_all() {
 	use emacs && elisp-compile editors/emacs/beancount.el
-- 
cgit v1.2.3-2-gb3c3