4 files changed, 75 insertions, 141 deletions
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index b58c5921d803..b34c10c523d3 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,8 +1,6 @@
 AUX gaupol-1.12-fix-prefix.patch 1266 BLAKE2B 0d2c5ae5cb76099f9e91e78e3a7d3c1b1bec73c223a4c5dfcb407a6efd60f42b4d9174faba318005400f2df346929baee5224ebc2d0b6b8f23a868a6f5451b0c SHA512 1d56b2793821a19d3dddb95c7c3a52e2f1e6af54886f77862cde1b3e7585b60990b1a8a61b4056b4676bce4ce722dc77ce0bd1116668118c8f4168884260da6e
 DIST gaupol-1.13.tar.gz 592830 BLAKE2B dcde1dd6c5e3e9624f0e7692c4d6cc14452733d1e35bc25de5deaa842cdb069250dee0b2d9eb75d1bb9f3c618c43457718ce91f5a6992ec7797fbb37366fc524 SHA512 ebe2accd962344c07201e46ceff3801483a4c68f9772d1fc868a93d8044b65987f7233eab675a9f3148bce686261a6b5c40d66d3f9471f9515713fbfb46a3f92
-DIST gaupol-1.14.1.tar.gz 593435 BLAKE2B f7ee1f2e70707f54204400d99107a1ee62b721e7ee0be76ce980a261b1b95349aefcc5907dc5cf956fd703a4372065576371cdf0466a32ee206d797b1500d53d SHA512 efaa9910496dcd683be40ff33bf68de313b852d6212f3f43c67e6433eb3b95b64c89707d1a69a54c9f772c44cf04f95ca76d705d396b376ac1c86c4bbe48e4e0
 DIST gaupol-1.15.tar.gz 593412 BLAKE2B af21c3fac16a9e6a861ba93679f59134b68ab780812115048646b74a6524e230bb02a62454e8a42bdc436dfd08441f3e103a04b112c9d721e12d291e5e8cfbc7 SHA512 899dac0a8827e7b1b61ac9745f5fb39376eed1e4ccf928c3442350f6d8bb27f743923e1d321f1215f422b6e1d1d4e13cfe56adc2b4c358f22f6647a642726889
 EBUILD gaupol-1.13.ebuild 1704 BLAKE2B c093232a478ae38556b91f01f0f47d7fc194e656436ac300c2b9942c51ff03d70f3a69f01342b1d2785c30a3849052f46694642c6bddb9ff71282228a3eb9e8c SHA512 52f9cffea16ccdda7098cf1a2fa9562635b5bc7b0f95f80d500a9c47d37838df208adbbf8d01f694bd3491c1ae9692eabf21a96071b9d95f38f3c83092bdfc32
-EBUILD gaupol-1.14.1.ebuild 1707 BLAKE2B 3f264cf5876f186ea05b500df2df8c38ee51fb8d8cef0245b28036e21e820216d7d8862fc4436a9ab90ec5c9e086a1a161c53880d6702b8b9a84f2303750554b SHA512 da2bfee4e91e69e1b5a06f17fccca31a5a2093472c2e7666895a01c072cb45b5a6d6ec522b8ef65194d536eda589b2585a117427369742f848704539072f3593
-EBUILD gaupol-1.15.ebuild 1718 BLAKE2B 77c5f1e2050a7295a995e8b57e6a05e9439f12e705130b159fe40307d594feb41ade006357229a2d9aae142d597fb6b62febfe68e5d6988181b005a844721adb SHA512 a846b25e6507266d175fe6ad9f11deeaa9bb1061e1799eb90bf57704aae3af7d37c3fa70c06c582adf6d48d0d951877a542a51e7a7da2e6d3bf74466629ddf38
+EBUILD gaupol-1.15-r1.ebuild 2244 BLAKE2B c8bbfcf32ec2d456959ed8bc201c2c9a017e0fdaa8a2459d0721f7bf3f384b4826bafb65ac6829450cc768a8f8214cc10669247ecf3210bba621844165ca3292 SHA512 065f508babbd6cf2a85c9fd52cdc9f76666e4aae0142ac7a6f566b205a886b042ae2334dd3b5860ba4ce14dff196e49096652f522935b044ded56da5010ea7ce
 MISC metadata.xml 533 BLAKE2B eb6d56dbe104832c594f306fc020b591b04e4f21d7533740ab613ecf105cdfdc4bc9232fe18bbfc4276cc08063a7a570a1c98025e9c74561b4abda0119e3801e SHA512 49859f8f6b75f20c6cf94f60764c1e688ddf907a7657815574b666fcc7873de0a3105cda9acd9f4bbdb7f658bd0003c67ec1ced72e3d84e15b5d86b64ca91abe
diff --git a/media-video/gaupol/gaupol-1.14.1.ebuild b/media-video/gaupol/gaupol-1.14.1.ebuild
deleted file mode 100644
index 0caa08c6a2f9..000000000000
--- a/media-video/gaupol/gaupol-1.14.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/ https://github.com/otsaloma/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="spell"
-
-RDEPEND="
-	app-text/iso-codes
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	spell? ( app-text/gspell[introspection] )
-"
-BDEPEND="
-	sys-devel/gettext
-	test? (
-		app-dicts/myspell-en
-		app-text/enchant[hunspell]
-		app-text/gspell[introspection]
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.md NEWS.md README.md README.aeidon.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12-fix-prefix.patch"
-)
-
-python_test() {
-	virtx epytest
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The integrated video player requires media-plugins/gst-plugins-gtk."
-		elog ""
-		elog "External video previewing support requires MPV, MPlayer or VLC."
-		if use spell; then
-			elog ""
-			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
-			elog "or app-text/aspell with the appropriate L10N variable."
-			elog ""
-			elog "Additionally, make sure that app-text/enchant has the correct flags enabled:"
-			elog "USE=hunspell for myspell dictionaries and USE=aspell for aspell dictionaries."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-video/gaupol/gaupol-1.15-r1.ebuild b/media-video/gaupol/gaupol-1.15-r1.ebuild
new file mode 100644
index 000000000000..5f273d5825c3
--- /dev/null
+++ b/media-video/gaupol/gaupol-1.15-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 optfeature virtualx xdg-utils
+
+DESCRIPTION="A subtitle editor for text-based subtitles"
+HOMEPAGE="https://otsaloma.io/gaupol/"
+SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+
+RDEPEND="
+	app-text/iso-codes
+	dev-python/charset-normalizer[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+"
+BDEPEND="
+	sys-devel/gettext
+	test? (
+		app-dicts/myspell-en
+		|| (
+			app-text/enchant[hunspell]
+			>=app-text/enchant-2.2.8[nuspell]
+		)
+		app-text/gspell[introspection]
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.md NEWS.md README.md README.aeidon.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12-fix-prefix.patch"
+)
+
+python_test() {
+	virtx epytest
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	# To check which GStreamer plugins are required (vaapisink is mentioned in the code but it is not used):
+	# plugins=$(qlist -e gaupol | xargs grep -ho 'Gst.ElementFactory.*' | cut -d'"' -f2 | sort -u | grep -vFx vaapisink)
+	# xargs -n1 gst-inspect-1.0 <<< "$plugins" | awk '/Filename/ {print $2}' | sort -u | xargs qfile
+	optfeature "integrated video player support" \
+		"media-libs/gstreamer[introspection] media-libs/gst-plugins-base[pango] media-plugins/gst-plugins-gtk"
+	optfeature "external video previewing support" "media-video/mpv" "media-video/mplayer" "media-video/vlc"
+
+	optfeature "spellchecking support" "app-text/gspell[introspection]"
+	# To list dictionaries supported by gaupol:
+	# python3 -c 'import aeidon; print(*aeidon.SpellChecker.list_languages(), sep="\n")'
+	optfeature "spellchecking with app-dicts/myspell-* dictionaries using the nuspell backend" \
+		"app-text/enchant[nuspell]"
+	optfeature "spellchecking with app-dicts/myspell-* dictionaries using the hunspell backend" \
+		"app-text/enchant[hunspell]"
+	optfeature "spellchecking with app-dicts/aspell-* dictionaries" \
+		"app-text/enchant[aspell]"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-video/gaupol/gaupol-1.15.ebuild b/media-video/gaupol/gaupol-1.15.ebuild
deleted file mode 100644
index de6253f7c5e9..000000000000
--- a/media-video/gaupol/gaupol-1.15.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/ https://github.com/otsaloma/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="spell"
-
-RDEPEND="
-	app-text/iso-codes
-	dev-python/charset-normalizer[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	spell? ( app-text/gspell[introspection] )
-"
-BDEPEND="
-	sys-devel/gettext
-	test? (
-		app-dicts/myspell-en
-		app-text/enchant[hunspell]
-		app-text/gspell[introspection]
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.md NEWS.md README.md README.aeidon.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12-fix-prefix.patch"
-)
-
-python_test() {
-	virtx epytest
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The integrated video player requires media-plugins/gst-plugins-gtk."
-		elog ""
-		elog "External video previewing support requires MPV, MPlayer or VLC."
-		if use spell; then
-			elog ""
-			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
-			elog "or app-text/aspell with the appropriate L10N variable."
-			elog ""
-			elog "Additionally, make sure that app-text/enchant has the correct flags enabled:"
-			elog "USE=hunspell for myspell dictionaries and USE=aspell for aspell dictionaries."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}