fix up all the plover stuff so its better now

13 files changed, 50 insertions, 21 deletions

diff --git a/app-text/plover/plover-5.3.0.ebuild b/app-text/plover/plover-5.3.0.ebuild
index a9d5739..a5bb77e 100644
--- a/app-text/plover/plover-5.3.0.ebuild
+++ b/app-text/plover/plover-5.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{13,14} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 
-inherit desktop distutils-r1
+inherit desktop distutils-r1 optfeature
 
 DESCRIPTION="Free and open source real-time stenography engine."
 HOMEPAGE="https://www.opensteno.org/plover/"
@@ -50,6 +50,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "Install plover-plugin/lapwing-aio for Lapwing system support."
-	elog "Plover's built-in Plugins Manager will not work in this package."
+	ewarn "Plover's built-in Plugins Manager doesn't work."
+	optfeature "Lapwing theory support" plover-plugin/lapwing-aio
+	optfeature "Plover2CAT transcription application" app-text/plover2cat
 }
diff --git a/app-text/plover2cat/plover2cat-4.1.0.ebuild b/app-text/plover2cat/plover2cat-4.1.0.ebuild
index eeb20dd..718571f 100644
--- a/app-text/plover2cat/plover2cat-4.1.0.ebuild
+++ b/app-text/plover2cat/plover2cat-4.1.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://pypi.org/project/plover2cat/
 "
 RDEPEND="$(python_gen_cond_dep '
-	app-text/plover[${PYTHON_USEDEP}]
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
 	dev-python/dulwich[${PYTHON_USEDEP}]
 	dev-python/obsws-python[${PYTHON_USEDEP}]
 	dev-python/odfpy[${PYTHON_USEDEP}]
diff --git a/plover-plugin/auto-reconnect-machine/auto-reconnect-machine-0.1.0.ebuild b/plover-plugin/auto-reconnect-machine/auto-reconnect-machine-0.1.0.ebuild
index 9ec5db6..1dfd3c5 100644
--- a/plover-plugin/auto-reconnect-machine/auto-reconnect-machine-0.1.0.ebuild
+++ b/plover-plugin/auto-reconnect-machine/auto-reconnect-machine-0.1.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 
@@ -13,7 +14,9 @@ DESCRIPTION="Automatically reconnect the steno machine if the connection got los
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/plover-plugin/clippy2/clippy2-0.0.8.ebuild b/plover-plugin/clippy2/clippy2-0.0.8.ebuild
index 58094c4..200e02e 100644
--- a/plover-plugin/clippy2/clippy2-0.0.8.ebuild
+++ b/plover-plugin/clippy2/clippy2-0.0.8.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{7..14} )
 PYPI_PN=plover-clippy-2
 
@@ -13,7 +14,9 @@ DESCRIPTION="Logs inefficient strokes to a file for later review. (fork)"
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/plover-plugin/dict-commands/dict-commands-0.2.5.ebuild b/plover-plugin/dict-commands/dict-commands-0.2.5.ebuild
index 17f3f0f..0dac1ac 100644
--- a/plover-plugin/dict-commands/dict-commands-0.2.5.ebuild
+++ b/plover-plugin/dict-commands/dict-commands-0.2.5.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 
@@ -13,7 +14,9 @@ DESCRIPTION="Dictionaries stack manipulation commands for Plover."
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/plover-plugin/fancytext/fancytext-1.9.0.ebuild b/plover-plugin/fancytext/fancytext-1.9.0.ebuild
index 3809071..91bfeaf 100644
--- a/plover-plugin/fancytext/fancytext-1.9.0.ebuild
+++ b/plover-plugin/fancytext/fancytext-1.9.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 
@@ -13,8 +14,8 @@ DESCRIPTION="Silly output formatting plugin for Plover"
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
 RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
 	dev-python/pyfiglet[${PYTHON_USEDEP}]
 ')"
 
diff --git a/plover-plugin/lapwing-aio/lapwing-aio-1.5.0.ebuild b/plover-plugin/lapwing-aio/lapwing-aio-1.5.0.ebuild
index 242454b..9bcc032 100644
--- a/plover-plugin/lapwing-aio/lapwing-aio-1.5.0.ebuild
+++ b/plover-plugin/lapwing-aio/lapwing-aio-1.5.0.ebuild
@@ -14,13 +14,13 @@ DESCRIPTION="All the necessary plugins and dictionaries for using Lapwing theory
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover[${PYTHON_SINGLE_USEDEP}]"
 RDEPEND="$(python_gen_cond_dep '
-	plover-plugin/dict-commands[${PYTHON_USEDEP}]
-	plover-plugin/last-translation[${PYTHON_USEDEP}]
-	plover-plugin/modal-dictionary[${PYTHON_USEDEP}]
-	plover-plugin/python-dictionary[${PYTHON_USEDEP}]
-	plover-plugin/stitching[${PYTHON_USEDEP}]
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+	plover-plugin/dict-commands[${PYTHON_SINGLE_USEDEP}]
+	plover-plugin/last-translation[${PYTHON_SINGLE_USEDEP}]
+	plover-plugin/modal-dictionary[${PYTHON_SINGLE_USEDEP}]
+	plover-plugin/python-dictionary[${PYTHON_SINGLE_USEDEP}]
+	plover-plugin/stitching[${PYTHON_SINGLE_USEDEP}]
 ')"
 
 LICENSE="GPL-2"
diff --git a/plover-plugin/last-translation/last-translation-0.0.2.ebuild b/plover-plugin/last-translation/last-translation-0.0.2.ebuild
index 7fcc472..e8dbbee 100644
--- a/plover-plugin/last-translation/last-translation-0.0.2.ebuild
+++ b/plover-plugin/last-translation/last-translation-0.0.2.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 
@@ -13,7 +14,9 @@ DESCRIPTION="Macro plugins for Plover to repeat output."
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/plover-plugin/modal-dictionary/modal-dictionary-0.0.3.ebuild b/plover-plugin/modal-dictionary/modal-dictionary-0.0.3.ebuild
index 0502b48..fb6c72d 100644
--- a/plover-plugin/modal-dictionary/modal-dictionary-0.0.3.ebuild
+++ b/plover-plugin/modal-dictionary/modal-dictionary-0.0.3.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 PYPI_NO_NORMALIZE=1
@@ -14,7 +15,9 @@ DESCRIPTION="Modal Dictionaries for Plover"
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/plover-plugin/python-dictionary/python-dictionary-1.2.1.ebuild b/plover-plugin/python-dictionary/python-dictionary-1.2.1.ebuild
index 9a4cdd9..e7e35c3 100644
--- a/plover-plugin/python-dictionary/python-dictionary-1.2.1.ebuild
+++ b/plover-plugin/python-dictionary/python-dictionary-1.2.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 
@@ -13,7 +14,9 @@ DESCRIPTION="Python dictionaries support for Plover"
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/plover-plugin/skel.ebuild b/plover-plugin/skel.ebuild
index 5e43124..9db96e5 100644
--- a/plover-plugin/skel.ebuild
+++ b/plover-plugin/skel.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 
@@ -13,8 +14,10 @@ DESCRIPTION=""
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
-LICENSE="GPL-2"
+LICENSE=""
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/plover-plugin/stitching/stitching-0.1.0.ebuild b/plover-plugin/stitching/stitching-0.1.0.ebuild
index 258b592..7226eba 100644
--- a/plover-plugin/stitching/stitching-0.1.0.ebuild
+++ b/plover-plugin/stitching/stitching-0.1.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 
@@ -13,7 +14,9 @@ DESCRIPTION="Stitch words like T-H-I-S using Plover strokes"
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/plover-plugin/tapey-tape/tapey-tape-0.0.6.ebuild b/plover-plugin/tapey-tape/tapey-tape-0.0.6.ebuild
index a5e90a3..cc5962e 100644
--- a/plover-plugin/tapey-tape/tapey-tape-0.0.6.ebuild
+++ b/plover-plugin/tapey-tape/tapey-tape-0.0.6.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{6..14} )
 PYPI_PN=plover-${PN}
 
@@ -13,7 +14,9 @@ DESCRIPTION="Paper tape with extra information"
 HOMEPAGE="
 	https://pypi.org/project/${PYPI_PN}/
 "
-DEPEND="app-text/plover"
+RDEPEND="$(python_gen_cond_dep '
+	app-text/plover[${PYTHON_SINGLE_USEDEP}]
+')"
 
 LICENSE="GPL-3"
 SLOT="0"