gentoo auto-resync : 18:09:2023 - 23:07:14

4 files changed, 18 insertions, 95 deletions

diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 884143fd20c7..6e258459936e 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,7 +1,6 @@
 DIST Sigil_User_Guide_2022.05.17.epub 8894634 BLAKE2B 8a7c5b5add54d87dfe791a0dbbc0c6cd37ae2eb2ff77f46ae36643785fb714d9fbc0fe470d024f7112be2933ca4fb57a4bfdfd340083be15fffca69296640ea9 SHA512 bac3f55d28d02f53c8fdac51333194e0f27c6669876360a6d0244b1e2683dae0e7046977fab6e75dba7170c8aca3a7539f3d6cddab3ddc3e45985930c455968a
 DIST sigil-1.9.30.tar.gz 26602897 BLAKE2B 554af2aa4c26994c065023839ea29b190eea501cac1183d58dcf2439ebca89e0a56848aaec1d668cfb84555c6830eaf6d32efdc82b08e0c94d7b6ba95dd7ff8b SHA512 80dcaa9dcee51c36a42bcd57fc87acda94002af74602d934c7e9bfd275339d9ac200cd1f141fb9e2709ac054569bc22f1869623498ce16c636a3fab8dae4e70f
 DIST sigil-2.0.1.tar.gz 26778961 BLAKE2B d2bdd3c24410285eea3e3655638f2aa2ec8b84b60b8dadda9ad2e40a404e61eebf93ecc188b0aa08967aef42e34c83c884853cdd782a7bc8c5a0d6d235058cfe SHA512 9ba8fd2e844288eae01be9e65e3fc210eeeb096e54c83ebcea5c95be9c1ce44054f19589c294e812f8bc6bb489aebdf237670121b254e9b1c55cc10622f03f81
-EBUILD sigil-1.9.30.ebuild 1847 BLAKE2B 12165185ecf9888f9d3087ce8782aa707dddcc709f06211bebe3cabbaa61fa076acd05479ee7d026f7f8504a73faa2e0b8f808307dade7a2cced5c97a49cb9c0 SHA512 fdcb6426bd7aea052c3e36aa0fb92f900f39e8bca28caa4022b8b6f4979b999c8e54f175a0967d3b797c69b0f5097719b8dae80cddb37cbfbbf57980d01d084f
-EBUILD sigil-2.0.1-r1.ebuild 2392 BLAKE2B 54b0abf6461c9556c0db47ed6b52226b66ecc8ffde68554f9ce6433a135d8fdce0f2942de08ce80d243d346d17aacb47662fbb8cad25d1e188e7dfcb71d0e923 SHA512 8b8ce5972ad3d14a1db1c303336c05ca064d921b4d448ee1014d105fb6213355ab52db5c8d3f49682ee524f72d2f6ec0d68ef91a857cb7d571fd7fdb73f71b6e
-EBUILD sigil-2.0.1.ebuild 2123 BLAKE2B 9ff699ed320b7a883048056dc239f506bb4f36792f343f55b3bddeff24f8626925c01bc9e5342407478ae247a67d8588b2feb7a827c1d42d1d9ba9406d592cba SHA512 74692aa47d2b9d83e2d5fddd572796714b0a3baee7d97158c2abf2f1133a6005d72eacf90094228d9c1b6b296756e7d9416febab8948f1c6f38bafdee15fea59
+EBUILD sigil-1.9.30-r1.ebuild 1939 BLAKE2B a04c014fc9382636eeb70bd26315506010c7b5747f9f5b580ea3293f738279453c3e0537394eadde09c73cf99e7c479411e9e41cb265be4a174aeeefdc54bee8 SHA512 84e0231a1c97493a31b09ba1ff7fe34bf109a86c79e815dc3f26571024019a970f2603fd289a866df343c234a66eedcac53ac33c0e589837c00d7b8b39c206fc
+EBUILD sigil-2.0.1-r2.ebuild 2659 BLAKE2B 71655c62ea58fb2c4fe457c0826fe7df5a77ce4dcf97b493f7cbbab3016a5b0894d081621c31a410c902e9913dec5886804850e9e52e0212a90531867630bd6b SHA512 6729ded321d8a0d93144bcf4e2317ac0a97b371e7892a2c6d4cbf222d79f9af426f265e6ffc72a02d72668c7b945fdd8c79934f277547d6a2105af34e20bc169
 MISC metadata.xml 706 BLAKE2B 394811d292869d61297ed01ce36223cd0eb33b6ea21db9cfe6e87911d7f30801977f8b66663085a289bf9f6870fd64d72c1d706c7b9516d2e09585783772a4dc SHA512 a98d16ad1760d359f9ab915d472747fe3f1dc229f41b10980f1ccd3436091f8dec0ee800fed7e531413eb77826a7873ce3e2e3bf8c2d478b4d1ec1ccc16e5b68
diff --git a/app-text/sigil/sigil-1.9.30.ebuild b/app-text/sigil/sigil-1.9.30-r1.ebuild
index 681e2613d8dd..be17aa85028a 100644
--- a/app-text/sigil/sigil-1.9.30.ebuild
+++ b/app-text/sigil/sigil-1.9.30-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="tk"
 
 inherit xdg cmake python-single-r1
 
@@ -25,6 +24,7 @@ RDEPEND="
 	dev-libs/libpcre2:=[pcre16]
 	$(python_gen_cond_dep '
 		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]')
 	dev-qt/qtconcurrent:5
@@ -37,10 +37,12 @@ RDEPEND="
 	plugins? ( $(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/dulwich[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]') )
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]')
+		$(python_gen_impl_dep 'tk') )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/app-text/sigil/sigil-2.0.1-r1.ebuild b/app-text/sigil/sigil-2.0.1-r2.ebuild
index d278bafefa92..811273ac57e9 100644
--- a/app-text/sigil/sigil-2.0.1-r1.ebuild
+++ b/app-text/sigil/sigil-2.0.1-r2.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="tk"
 
 inherit xdg cmake python-single-r1
 
@@ -30,16 +29,17 @@ RDEPEND="
 	sys-libs/zlib[minizip]
 	$(python_gen_cond_dep '
 		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]')
 	plugins? ( $(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/dulwich[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/regex[${PYTHON_USEDEP}]
-	') )
+	')
+	$(python_gen_impl_dep 'tk') )
 	!qt6? (
 		dev-qt/qtconcurrent:5
 		dev-qt/qtcore:5
@@ -49,11 +49,19 @@ RDEPEND="
 		dev-qt/qtwebengine:5[widgets]
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
+		plugins? ( $(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		') )
 	)
 	qt6? (
 		dev-qt/qtbase:6[concurrent,cups,network,widgets,xml]
 		dev-qt/qt5compat:6
 		dev-qt/qtwebengine:6[widgets]
+		plugins? ( $(python_gen_cond_dep '
+			dev-python/PyQt6[${PYTHON_USEDEP}]
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP}]
+		') )
 	)
 "
 DEPEND="${RDEPEND}"
diff --git a/app-text/sigil/sigil-2.0.1.ebuild b/app-text/sigil/sigil-2.0.1.ebuild
deleted file mode 100644
index 0f6e2298657c..000000000000
--- a/app-text/sigil/sigil-2.0.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="tk"
-
-inherit xdg cmake python-single-r1
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+plugins +qt5 qt6"
-REQUIRED_USE="${PYTHON_REQUIRED_USE} ^^ ( qt5 qt6 )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/libpcre2:=[pcre16]
-	sys-libs/zlib[minizip]
-	$(python_gen_cond_dep '
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]')
-	plugins? ( $(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/dulwich[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]'
-	) )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[concurrent,cups,network,widgets,xml]
-		dev-qt/qt5compat:6
-		dev-qt/qtwebengine:6[widgets]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	qt5? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DTRY_NEWER_FINDPYTHON3=1
-		-DPython3_INCLUDE_DIR="$(python_get_includedir)"
-		-DPython3_LIBRARY="$(python_get_library_path)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		-DUSE_QT6=$(usex qt6)
-		-DINSTALL_BUNDLED_DICTS=0
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DUSE_SYSTEM_LIBS=1
-	)
-	# use system-mathjax && mycmakeargs+=( -DMATHJAX3_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-}