app-office/beancount: add 2.3.5, drop 2.3.3

Closes: https://bugs.gentoo.org/848114
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>

3 files changed, 64 insertions, 57 deletions

diff --git a/app-office/beancount/Manifest b/app-office/beancount/Manifest
index 69ea66a13..afb4ee689 100644
--- a/app-office/beancount/Manifest
+++ b/app-office/beancount/Manifest
@@ -1 +1 @@
-DIST beancount-2.3.3.tar.gz 1784037 BLAKE2B ff62ef30d3bcadd3f1dc195adf71cb58703e50c93e12cf71ef699c651ce67daf89ea8285b53b43811687fb132c02d8d6364651d87bc3e092f9485e6934883110 SHA512 420369105939bcdcf2b7caaba27ab1d486b3dfc18e0a3286d917a6380345eaf5fa64ff5e0779fd2275129b7088de24f4a2dbd0232a482aceb124064e5c56ccc4
+DIST beancount-2.3.5.gh.tar.gz 1718715 BLAKE2B 2bcbf250e6947c6ea93f7c4308fac2ea03c0b5b722dc4a6eb396133880ca201235ceb8cbb2e3a6e63afe573e1b3ab8bb945444a1edc73791b73200fb4d45bd18 SHA512 a3f1343ddf54cf13ef60802de210dc89e9ae202bca802b1b4eb532588f71d51fa4b71672b4e6a1e9676135d406fd55c421b80c439fa2f5f4279e61211f558a2a
diff --git a/app-office/beancount/beancount-2.3.3.ebuild b/app-office/beancount/beancount-2.3.3.ebuild
deleted file mode 100644
index 4d81e6dfe..000000000
--- a/app-office/beancount/beancount-2.3.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A double-entry accounting system that uses text files as input"
-HOMEPAGE="https://github.com/beancount/beancount"
-SRC_URI="https://github.com/beancount/beancount/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.3-disable-network-tests.patch"
-	"${FILESDIR}/${PN}-2.3.3-disable-tmp-access-tests.patch"
-	"${FILESDIR}/${PN}-2.3.3-disable-install-test.patch"
-)
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${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}]
-	')
-"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-5.4.2[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_test(){
-	esetup.py build_ext -i
-	make ctest
-	make test
-}
diff --git a/app-office/beancount/beancount-2.3.5.ebuild b/app-office/beancount/beancount-2.3.5.ebuild
new file mode 100644
index 000000000..f92273fb2
--- /dev/null
+++ b/app-office/beancount/beancount-2.3.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DITUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="A double-entry accounting system that uses text files as input"
+HOMEPAGE="https://beancount.github.io https://github.com/beancount/beancount"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.3-disable-network-tests.patch"
+	"${FILESDIR}/${PN}-2.3.3-disable-tmp-access-tests.patch"
+	"${FILESDIR}/${PN}-2.3.3-disable-install-test.patch"
+)
+
+RDEPEND="$(python_gen_cond_dep '
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	>=dev-python/bottle-0.12[${PYTHON_USEDEP}]
+	dev-python/google-auth-oauthlib[${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}]
+')"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed "/def find_repository_root/a\    return '${S}'" \
+		-i ${PN}/utils/test_utils.py || die
+	sed "s/\[PROGRAM\]/['${EPYTHON}', PROGRAM]/" \
+		-i ${PN}/tools/treeify_test.py || die
+	sed "/DATA_DIR =/c\    DATA_DIR = '${S}/${PN}/utils/file_type_testdata'" \
+		-i ${PN}/utils/file_type_test.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# keep in sync with hashsrc.py, otherwise expect test failures
+	cp beancount/parser/{lexer.l,grammar.y,decimal.h,decimal.c,macros.h,parser.h,parser.c,tokens.h} "${BUILD_DIR}"/lib/${PN}/parser || die
+}
+
+python_test(){
+	emake ctest
+
+	cd "${T}" || die
+	epytest --pyargs ${PN}
+}