app-office/pyspread: drop 1.99.6, add 2.1.1

Closes: https://bugs.gentoo.org/848102
Closes: https://bugs.gentoo.org/309667
Signed-off-by: Julien Roy <julien@jroy.ca>

4 files changed, 52 insertions, 61 deletions

diff --git a/app-office/pyspread/Manifest b/app-office/pyspread/Manifest
index de6471a30..e1aee92e8 100644
--- a/app-office/pyspread/Manifest
+++ b/app-office/pyspread/Manifest
@@ -1 +1 @@
-DIST pyspread-v1.99.6.tar.gz 2336389 BLAKE2B 0c5e41bacd79c5357f29c53581f551ea8b09cb1d518a5217e55448109bf87422c485b437cba54ee3482bc5107aea6a23a2e55b953f40f64dc29fab253a973eed SHA512 e569ff2de5fcc3ecf0cb20c20c815093f5eaab05e0db2b7509aeb3d8a7ea982237c6ca7d0004a372d829e444a50e1fcee250cd5fdeb6d03995a2b7ca6fb75a8f
+DIST pyspread-v2.1.1.tar.bz2 2071618 BLAKE2B da8ca4f9c162faa3e8fe615aeb2b082266be1e38e33623475f37ad36eda94a1d054a6469df8803944c3edc334f293690007d68e206b56bbe5ad2f17ad8a927ee SHA512 5b157999f307be082110df2c96a608702d3924bf0b4d8f01fabdb681475b43665c158ba5c1c73c653f161d55acdfdfa763291f6740bd5f69fd4c33dec766a4ec
diff --git a/app-office/pyspread/metadata.xml b/app-office/pyspread/metadata.xml
index ba1723dd9..391371362 100644
--- a/app-office/pyspread/metadata.xml
+++ b/app-office/pyspread/metadata.xml
@@ -4,5 +4,7 @@
     <!-- maintainer-needed -->
     <upstream>
         <remote-id type="gitlab">pyspread/pyspread</remote-id>
+        <doc>https://pyspread.gitlab.io/docs.html</doc>
+        <bugs-to>https://gitlab.com/pyspread/pyspread/issues</bugs-to>
     </upstream>
 </pkgmetadata>
diff --git a/app-office/pyspread/pyspread-1.99.6.ebuild b/app-office/pyspread/pyspread-1.99.6.ebuild
deleted file mode 100644
index 3295d6c09..000000000
--- a/app-office/pyspread/pyspread-1.99.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit xdg desktop distutils-r1
-
-DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python"
-HOMEPAGE="https://pyspread.gitlab.io"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/pyspread/${PN}.git"
-else
-	SRC_URI="https://gitlab.com/pyspread/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/PyQt5-5.10.0[gui,printsupport,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/markdown2-2.3[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyenchant-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-# TODO: package sphinxbootstrap4theme
-#distutils_enable_sphinx apidocs \
-#	"dev-python/sphinx-autodoc-typehints" \
-#	"dev-python/recommonmark" \
-#	"dev-python/sphinxbootstrap4theme"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Fix the provided desktop file
-	sed -i -e '/Path/d' "${PN}.desktop" || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	doicon "${PN}"/share/icons/"${PN}.ico"
-	doicon "${PN}"/share/icons/"${PN}.svg"
-	domenu "${PN}.desktop"
-}
-
-python_test() {
-	export QT_QPA_PLATFORM=offscreen
-	epytest
-}
diff --git a/app-office/pyspread/pyspread-2.1.1.ebuild b/app-office/pyspread/pyspread-2.1.1.ebuild
new file mode 100644
index 000000000..e3f09b165
--- /dev/null
+++ b/app-office/pyspread/pyspread-2.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit xdg desktop distutils-r1
+
+DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python"
+HOMEPAGE="https://pyspread.gitlab.io"
+
+SRC_URI="https://gitlab.com/pyspread/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+KEYWORDS="~amd64"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/PyQt5-5.10.0[gui,printsupport,svg,widgets,${PYTHON_USEDEP}]
+	>=dev-python/markdown2-2.3[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyenchant-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_compile() {
+	distutils-r1_src_compile
+	echo rm -rf "${WORKDIR}/${P}-${EPYTHON/./_}/install/usr/pyspread"
+	rm -rf "${WORKDIR}/${P}-${EPYTHON/./_}/install/usr/pyspread"
+}
+
+src_install() {
+	distutils-r1_src_install
+	rm -rf "${ED}/usr/pyspread"
+	doicon "${PN}/share/icons/hicolor/64x64/${PN}.ico"
+	doicon "${PN}/share/icons/hicolor/svg/${PN}.svg"
+	domenu "${PN}.desktop"
+}
+
+src_test() {
+	export QT_QPA_PLATFORM=offscreen
+	distutils-r1_src_test
+}