Bump, add qt5 build option, fix build when qt5 is present

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 28DB029C)

3 files changed, 96 insertions, 1 deletions

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index 89ee4a3c3876..dfbcbd80e2f6 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/bibletime
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.71 2014/08/06 07:09:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.72 2014/10/15 04:04:26 creffett Exp $
+
+*bibletime-2.10.1 (15 Oct 2014)
+
+  15 Oct 2014; Chris Reffett <creffett@gentoo.org> +bibletime-2.10.1.ebuild,
+  +files/bibletime-2.10.1-qt5-printsupport.patch:
+  Bump, add qt5 build option, fix build when qt5 is present
 
   06 Aug 2014; Patrick Lauer <patrick@gentoo.org> bibletime-2.10.0.ebuild,
   bibletime-2.9.1.ebuild:
diff --git a/app-text/bibletime/bibletime-2.10.1.ebuild b/app-text/bibletime/bibletime-2.10.1.ebuild
new file mode 100644
index 000000000000..53cc2358c58b
--- /dev/null
+++ b/app-text/bibletime/bibletime-2.10.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.10.1.ebuild,v 1.1 2014/10/15 04:04:26 creffett Exp $
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt Bible study application using the SWORD library"
+HOMEPAGE="http://www.bibletime.info/"
+SRC_URI="mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug qt5"
+
+# bug 313657
+# RESTRICT="test"
+
+RDEPEND="
+	>=app-text/sword-1.6.0
+	>=dev-cpp/clucene-2.3.3.4
+	qt5? (
+		dev-qt/linguist-tools:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtwebkit:4
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	net-misc/curl
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qttest:5
+	)
+	!qt5? (
+		dev-qt/qttest:4
+	)
+"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+	epatch "${FILESDIR}/${PN}-2.10.1-qt5-printsupport.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_WEBKIT=ON
+	)
+	if use !qt5; then
+		mycmakeargs+=(-DBT_FORCE_USE_QT4=)
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch b/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch
new file mode 100644
index 000000000000..203705485409
--- /dev/null
+++ b/app-text/bibletime/files/bibletime-2.10.1-qt5-printsupport.patch
@@ -0,0 +1,21 @@
+diff -ruN bibletime-2.10.1-orig/CMakeLists.txt bibletime-2.10.1/CMakeLists.txt
+--- bibletime-2.10.1-orig/CMakeLists.txt	2014-10-14 21:20:59.068697225 -0400
++++ bibletime-2.10.1/CMakeLists.txt	2014-10-14 21:23:20.045693427 -0400
+@@ -172,12 +172,14 @@
+   )
+ 
+   IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
+-    qt5_use_modules("bibletime" Widgets Qml Quick Network)
++      qt5_use_modules("bibletime" Widgets Qml Quick Network PrintSupport)
+   ELSE()
+     IF(BT_Use_DBus)
+-      qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml Network)
++      qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml
++	      Network PrintSupport)
+     ELSE()
+-      qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network)
++      qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network
++	      PrintSupport)
+     ENDIF()
+   ENDIF()
+ ELSE()