summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaak Ristioja <jaak@ristioja.ee>2020-05-09 13:14:16 +0300
committerJaak Ristioja <jaak@ristioja.ee>2020-05-09 14:28:08 +0300
commit188552b4d39f290d54ad50375b2a9003fea7d77b (patch)
tree4a36a88004d7a0404b5c9150ecca0d91094ddaa5
parentVersion bump to 3.0 beta 2 (diff)
downloadbibletime-188552b4d39f290d54ad50375b2a9003fea7d77b.tar.gz
bibletime-188552b4d39f290d54ad50375b2a9003fea7d77b.tar.bz2
bibletime-188552b4d39f290d54ad50375b2a9003fea7d77b.zip
app-text/bibletime-9999: Updates
Signed-off-by: Jaak Ristioja <jaak@ristioja.ee>
-rw-r--r--app-text/bibletime/Manifest4
-rw-r--r--app-text/bibletime/bibletime-9999.ebuild36
-rw-r--r--app-text/bibletime/metadata.xml8
3 files changed, 28 insertions, 20 deletions
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index d02127f..999e2cd 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -4,5 +4,5 @@ DIST bibletime-3.0_beta2.tar.xz 3646880 BLAKE2B f9ab9dcdc4732c3e46f4142a77a6dab3
EBUILD bibletime-2.11.2.ebuild 1093 BLAKE2B ed8ca761f1da37231b85ba4ec2691396df191112f2255fad3438c36dc2110158e50e6ea8b9d9697cfcfed2ad57902ad825704e4737c3f1bbc37d3eb6077fdb2a SHA512 12f50e72d26e51d3c28035e42e39a295633eb2d29844786b648c8a3dab6f5b6963545ed39b35604266f16c39ddc938a890f7ab789f7dbfc6979926945f0e0188
EBUILD bibletime-3.0_beta1.ebuild 1097 BLAKE2B be60f9e38298489b86bb3070d6573ce476534a7684de928c908bb3720bb3b16990ace07dcfa247c7c373b0ebec0ab510f2b2cc61e048ce830f34f9f467450063 SHA512 7751c2a937124f5ca254f6287587074e923dec302986ad0dbe26c75808b60cb860de9bee1d3ed686a200b38d56139b7279f24f2632c1d69e4caaa5a8e9632991
EBUILD bibletime-3.0_beta2.ebuild 1097 BLAKE2B be60f9e38298489b86bb3070d6573ce476534a7684de928c908bb3720bb3b16990ace07dcfa247c7c373b0ebec0ab510f2b2cc61e048ce830f34f9f467450063 SHA512 7751c2a937124f5ca254f6287587074e923dec302986ad0dbe26c75808b60cb860de9bee1d3ed686a200b38d56139b7279f24f2632c1d69e4caaa5a8e9632991
-EBUILD bibletime-9999.ebuild 1084 BLAKE2B d47402a14a3935dd7effeb8f62ac5dccea1e9b1f2284eff5a7c854bd3549e69221f758a4ae2024e797c780b1a57da483dd734d1aef67e7f208771b5fed6ecbcb SHA512 f65382f4afc899588f5fdf51940345687fa3f50feff748255b13d9a23a6b12ef22e92e4571db4d3357ec248d0bc35e84aa8b7c4fb3e3427c8e8bb0c290b4af3f
-MISC metadata.xml 518 BLAKE2B 40759b98b0a77dae63c259fcf635425e3915ef2b245ea8708e2e6dff8b70bbaff29858e62cc39aea74518c0382a8cec100aeac409a67b6a9a50bc41ead520570 SHA512 02c73080ccf852c9a87d7295cc9624fcdb9fd1a7edb62f1df39b7eede7a5dbc07ffcd40d6d2d940ce04fef0c35a2ad7ee0ece7f49109dc795ed3eaf7bb019a23
+EBUILD bibletime-9999.ebuild 1432 BLAKE2B 9cd88ceeb7851a5923df8bc0e03924a4d917e9b304f130c3813e1c3cedb7357b667537c782315b175f7f6c7397e7a00ed61c1947a8fe6d6615e30c202bae5114 SHA512 2615bbe1d31ec78d9d4785f4419c191732115f4dc3187bfa7b29f870f992027e17aa065d7e7c8414d86cf6756752b61df775e7086db28e3c37652a98ac7b84f3
+MISC metadata.xml 851 BLAKE2B 275fab4045b1e1a67fa068a0f44849480b5d1925818bd922c86deddcc62d0e753f96e479504663a6dc868ed3d4f6a3651471ac7df0705c04c1f1f714ff16e3f7 SHA512 0f7f0b2b0f875c47d22bc070746a0aef62a8965a6d417f01f6111dabf989531a18be6d3b7e7ea03acc901b9ab6c907fad363654e36adcf9ad406d8ba206ff596
diff --git a/app-text/bibletime/bibletime-9999.ebuild b/app-text/bibletime/bibletime-9999.ebuild
index 911be51..595a155 100644
--- a/app-text/bibletime/bibletime-9999.ebuild
+++ b/app-text/bibletime/bibletime-9999.ebuild
@@ -1,24 +1,22 @@
# Copyright 1999-2018 Gentoo Authors
-# Copyright 2010-2018 The BibleTime team
+# Copyright 2010-2020 The BibleTime team
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit cmake-utils git-r3
DESCRIPTION="Qt5 Bible study application using the SWORD library."
HOMEPAGE="http://www.bibletime.info/"
EGIT_REPO_URI="https://github.com/bibletime/bibletime.git"
-IUSE="debug"
-
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="handbook handbook_pdf howto howto_pdf"
RDEPEND="
- >=app-text/sword-1.7[curl]
+ >=app-text/sword-1.8.1[curl]
>=dev-cpp/clucene-0.9.16a
- dev-qt/linguist-tools:5
>=dev-qt/qtcore-5.6.0:5
dev-qt/qtwebengine:5[widgets]
dev-qt/qtwebchannel:5
@@ -28,8 +26,17 @@ RDEPEND="
dev-qt/qtscript:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
-dev-qt/qtxml:5"
-DEPEND="${RDEPEND} dev-qt/qttest:5"
+ dev-qt/qtxml:5"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5"
+HTML_DOC_DEPENDS="app-text/docbook-xsl-stylesheets app-text/po4a dev-libs/libxslt"
+PDF_DOC_DEPENDS="${HTML_DOC_DEPENDS} dev-java/fop"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ handbook? ( ${HTML_DOC_DEPENDS} )
+ handbook_pdf? ( ${PDF_DOC_DEPENDS} )
+ howto? ( ${HTML_DOC_DEPENDS} )
+ howto_pdf? ( ${PDF_DOC_DEPENDS} )"
DOCS="ChangeLog README.md"
@@ -39,15 +46,10 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
+ -DBUILD_HANDBOOK_HTML=$(usex handbook)
+ -DBUILD_HANDBOOK_PDF=$(usex handbook_pdf)
+ -DBUILD_HOWTO_HTML=$(usex howto)
+ -DBUILD_HOWTO_PDF=$(usex howto_pdf)
)
- if use debug; then
- mycmakeargs+=(
- -DCMAKE_BUILD_TYPE=Debug
- )
- else
- mycmakeargs+=(
- -DCMAKE_BUILD_TYPE=Release
- )
- fi
cmake-utils_src_configure
}
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index fbc52f9..a39852e 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>jaak+bibletime@ristioja.ee</email>
+ <email>jaak@ristioja.ee</email>
<name>Jaak Ristioja</name>
</maintainer>
<upstream>
@@ -11,4 +11,10 @@
<longdescription>
BibleTime is a Bible study application, written using C++, the Sword and Qt5 libraries.
</longdescription>
+ <use>
+ <flag name="handbook">Generate and install handbook in HTML format</flag>
+ <flag name="handbook_pdf">Generate and install handbook in PDF format</flag>
+ <flag name="howto">Generate and install howto in HTML format</flag>
+ <flag name="howto_pdf">Generate and install howto in PDF format</flag>
+ </use>
</pkgmetadata>