From 8affa6c6caeb284e3215f8f56b01da040c3405a2 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Wed, 19 Oct 2022 06:17:23 +0500
Subject: [PATCH] app-misc/termdown: add 1.18.0, drop 1.17.0

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 app-misc/termdown/Manifest               |  2 +-
 app-misc/termdown/metadata.xml           |  3 ---
 app-misc/termdown/termdown-1.17.0.ebuild | 27 ------------------------
 app-misc/termdown/termdown-1.18.0.ebuild | 27 ++++++++++++++++++++++++
 dev-python/pyfiglet/pyfiglet-9999.ebuild | 27 ------------------------
 5 files changed, 28 insertions(+), 58 deletions(-)
 delete mode 100644 app-misc/termdown/termdown-1.17.0.ebuild
 create mode 100644 app-misc/termdown/termdown-1.18.0.ebuild
 delete mode 100644 dev-python/pyfiglet/pyfiglet-9999.ebuild

diff --git a/app-misc/termdown/Manifest b/app-misc/termdown/Manifest
index 69363384ec..475aa437f7 100644
--- a/app-misc/termdown/Manifest
+++ b/app-misc/termdown/Manifest
@@ -1 +1 @@
-DIST termdown-1.17.0.tar.gz 66675 BLAKE2B fef398b205578182330c38fb184ee74ec2282c074d5cbe93443cf8870ec0a67d02be3f47cde9c4bb953f09e9abfced1a62848b9e9cb1e2a77eca89e1d1cfb903 SHA512 166b5a617f91ec149fe8dadf14b26dfc75b5719a4ad5ef8fa495028588949255a08ea896145a211221aa6d825be858bc8bc3ffc4300808ffbba0d31b41f3157b
+DIST termdown-1.18.0.gh.tar.gz 67431 BLAKE2B edfc8727d565a85f2e0dac960b6aa087e48a452d081356b66f868558059477a89b2218e4c2f9b246e4095ca6b5debbbbe6efdd21a5a81f98b17672d5ba9c6fd6 SHA512 b20a2629993b3b7a8cc20420c015f47a94eb5c5e91f7cf1fd69751fb40ee2be73206096f22345cf139d5cd5879d9e0f5f27209e5ad6f04551444daed49adb3c7
diff --git a/app-misc/termdown/metadata.xml b/app-misc/termdown/metadata.xml
index f0d38ccd0f..ad8cead24f 100644
--- a/app-misc/termdown/metadata.xml
+++ b/app-misc/termdown/metadata.xml
@@ -5,7 +5,4 @@
         <email>svdm-gentoo@protonmail.com</email>
         <name>Simon van der Maas</name>
     </maintainer>
-    <use>
-        <flag name="speak">Support for spoken countdown</flag>
-    </use>
 </pkgmetadata>
diff --git a/app-misc/termdown/termdown-1.17.0.ebuild b/app-misc/termdown/termdown-1.17.0.ebuild
deleted file mode 100644
index c7d19326f2..0000000000
--- a/app-misc/termdown/termdown-1.17.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_8,3_9} )
-inherit distutils-r1
-
-DESCRIPTION="Countdown timer and stopwatch in your terminal"
-HOMEPAGE="https://github.com/trehn/termdown"
-SRC_URI="https://github.com/trehn/termdown/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE="speak"
-
-DEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyfiglet[${PYTHON_USEDEP}]
-	speak? ( app-accessibility/espeak )"
-
-RDEPEND="${DEPEND}"
diff --git a/app-misc/termdown/termdown-1.18.0.ebuild b/app-misc/termdown/termdown-1.18.0.ebuild
new file mode 100644
index 0000000000..b907934914
--- /dev/null
+++ b/app-misc/termdown/termdown-1.18.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="ncurses(+)"
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Countdown timer and stopwatch in your terminal"
+HOMEPAGE="https://github.com/trehn/termdown"
+SRC_URI="https://github.com/trehn/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyfiglet[${PYTHON_USEDEP}]
+"
+
+pkg_postinst() {
+	optfeature "spoken countdown" app-accessibility/espeak-ng
+}
diff --git a/dev-python/pyfiglet/pyfiglet-9999.ebuild b/dev-python/pyfiglet/pyfiglet-9999.ebuild
deleted file mode 100644
index f7387fa2a2..0000000000
--- a/dev-python/pyfiglet/pyfiglet-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-python FIGlet implementation"
-HOMEPAGE="https://pypi.org/project/pyfiglet/ https://github.com/pwaller/pyfiglet"
-
-if [[ "${PV}" == 9999 ]]
-then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pwaller/pyfiglet.git"
-else
-	MY_PV="$(ver_cut 1-2).post$(ver_cut 4)"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://files.pythonhosted.org/packages/source/p/pyfiglet/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RESTRICT="mirror test"