gentoo resync : 25.08.2020

4 files changed, 102 insertions, 18 deletions

diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 130abd5fb53d..6cdfec21e4a2 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,5 +1,7 @@
 DIST bibletime-2.11.0.tar.xz 2403136 BLAKE2B fecf854a40ad0e188fde8ad3d047acf6274bfdf20f6a6211a6ff9d41e3de38f4d311db92e2b2fdf735e293163637cf4b553e722a05174d8c84201e94cf6e7b7c SHA512 41f0751db30b9001d04e1c4040dca022c83eb440987104e2c3465f4233f8c0ecb1c940eac0433409f97f78c89c00d0f880f822a51219eadcbf3fc6513cfa81e6
 DIST bibletime-2.11.2.tar.xz 2533472 BLAKE2B b116bbefaac8106d1f283d1c1a0c4d4c17e67d1cb41066c219ecca243914b0fa355748ebebb23ec88c1749548c853166d391764a454dd77b43c6617072a648a6 SHA512 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31
+DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
 EBUILD bibletime-2.11.0.ebuild 960 BLAKE2B 65bdcfeb1a85ac2ae4232f58c00b48b5453f310530da42b62a3380affdd9f6fa274aa87e1e764ef501467893f4b7dd899e55f615df6b11d961f28cd97a0281d8 SHA512 35dfdbdc5220a77856ad9d00ba93eb5b834a3f3bb00dea85d1f418af8a4212a959e09682f471b083e0cfff1e53a7dd3678dd55783e786f0adf39be16df786ec2
-EBUILD bibletime-2.11.2.ebuild 962 BLAKE2B e82a986d78a9f287b1c72dae5e525f4e61c4377af4f921455d588940f808edf766bcd69cddfb06e8c0f808e67cd6a0a8b1f78214863c2be7ff694849b9cea461 SHA512 fdbff40e6d53b358f1ed9ea15aa7171b743b24366d0000c2664406c9130bf8850fa1aa36f5dc257262eb3e46954156aec009d35b739c188905295803eed7509e
-MISC metadata.xml 658 BLAKE2B 0f4e1d9ffb30d6d0a9ca097739a4a58c9fdfd4d4b777f552c3bf3584a36e902d215f6757c83d449b17355b105076b231e775c9537337bc830f60d2a0799d475a SHA512 4d3e9dd30225ea7a354750d38bc4e4b9cac37a2cfe9e40d79835536b5ed9ae7c6704f1b12a32e0bf2926574378d6ec014ccdcc4a7af0b15f6e336d980060eeae
+EBUILD bibletime-2.11.2.ebuild 1304 BLAKE2B 583de78e4e8868c26e509939d2273284db179d41b5207b3ef0bfa31f6abf859031ba239051b4122b42c39fc3a12eb0920786001ee188761fd2422e738e684e3b SHA512 f7b7ffe12fd292e35d910da8323d273c1c69a868ca7a0424f6f97f17f3d0fcb61bb122f3c6c647fd167f20a5f0875166270a3dccd3c0e6985a6eb66936ac2797
+EBUILD bibletime-3.0.ebuild 1468 BLAKE2B b067588a1e999a797ce9d2853eec25ec89319a60c7170dd33cf2a827e40bf3efb2ce6e97f1640cb3c3c517743b9c9060de992aa9d104538e311cf2932f1bf57c SHA512 7c224b59fb239b1ef8fe6ec1683e726691e2004eac2b72e93cbed52eb0a0dc82609c770bc6dae8dfc53783c65214baa28477338aa13c72937185434d8667d74a
+MISC metadata.xml 656 BLAKE2B 66daf991e55a977a67ff159c7d2bd780308bd580572b8eef8fd5a456cc0932e837c10b175cae7288b0c5097434820b9eb9bdd2b93124f81fe6441e913823674c SHA512 7214abfb4ded4f531e84a2895ece417bb3fe36249fb59ec1d53d231d49d40119c66438931c0cdae79fb4859a70874c3bb03670d554c86f221223530eb12f0bc0
diff --git a/app-text/bibletime/bibletime-2.11.2.ebuild b/app-text/bibletime/bibletime-2.11.2.ebuild
index ebbcd684ed65..f148b08c8277 100644
--- a/app-text/bibletime/bibletime-2.11.2.ebuild
+++ b/app-text/bibletime/bibletime-2.11.2.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+VIRTUALX_REQUIRED=test
 
-DESCRIPTION="Qt Bible study application using the SWORD library"
-HOMEPAGE="http://www.bibletime.info/"
+inherit cmake virtualx
+
+DESCRIPTION="Qt Bible-study application using the SWORD library"
+HOMEPAGE="http://bibletime.info/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+KEYWORDS="amd64 x86"
 
-# bug 313657
+# Some tests fail due to being unable to find an icon directory relative
+# to ${WORKDIR}, some others segfault. Needs work.
 RESTRICT="test"
 
 RDEPEND="
@@ -23,6 +25,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwebchannel:5
 	dev-qt/qtwebengine:5
 	dev-qt/qtwidgets:5
@@ -36,12 +39,23 @@ DEPEND="${RDEPEND}
 	net-misc/curl
 	sys-libs/zlib
 "
+#BDEPEND="test? (
+#	app-dicts/sword-Josephus
+#	app-dicts/sword-KJV
+#	app-dicts/sword-KJVA
+#	app-dicts/sword-Scofield
+#	app-dicts/sword-StrongsGreek
+#)"
 
 DOCS=( ChangeLog README.md )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
-	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_test() {
+	virtx cmake_src_test || die "Test run has failed"
 }
diff --git a/app-text/bibletime/bibletime-3.0.ebuild b/app-text/bibletime/bibletime-3.0.ebuild
new file mode 100644
index 000000000000..599fd22e4549
--- /dev/null
+++ b/app-text/bibletime/bibletime-3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED=test
+
+inherit cmake virtualx
+
+DESCRIPTION="Qt Bible-study application using the SWORD library"
+HOMEPAGE="http://bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Some tests fail due to being unable to find an icon directory relative
+# to ${WORKDIR}, some others segfault. Needs work.
+RESTRICT="test"
+
+RDEPEND=">=app-text/sword-1.8.1
+	dev-cpp/clucene
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	net-misc/curl
+	sys-libs/zlib"
+#BDEPEND="test? (
+#	app-dicts/sword-Josephus
+#	app-dicts/sword-KJV
+#	app-dicts/sword-KJVA
+#	app-dicts/sword-Scofield
+#	app-dicts/sword-StrongsGreek
+#)"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+		-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HANDBOOK_HTML=no
+		-DBUILD_HANDBOOK_PDF=no
+		-DBUILD_HOWTO_HTML=no
+		-DBUILD_HOWTO_PDF=no
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test || die "Test run has failed"
+}
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index f1ef81c14f45..c397d7aaccbf 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>theology@gentoo.org</email>
-		<name>Theology</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<longdescription>
-BibleTime is a Bible study application for Linux. It is based on the 
-K Desktop Environment and uses the SWORD programming library to work 
-with Bible texts, commentaries, dictionaries and books provided by 
+BibleTime is a Bible study application for Linux. It is based on the
+K Desktop Environment and uses the SWORD programming library to work
+with Bible texts, commentaries, dictionaries and books provided by
 the Crosswire Bible Society.
 	</longdescription>
 	<upstream>