creffett    14/10/15 04:04:26

  Modified:             ChangeLog
  Added:                bibletime-2.10.1.ebuild
  Log:
  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)

Revision  Changes    Path
1.72                 app-text/bibletime/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibletime/ChangeLog?rev=1.72&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibletime/ChangeLog?rev=1.72&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibletime/ChangeLog?r1=1.71&r2=1.72

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog   6 Aug 2014 07:09:32 -0000       1.71
+++ ChangeLog   15 Oct 2014 04:04:26 -0000      1.72
@@ -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 <creff...@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 <patr...@gentoo.org> bibletime-2.10.0.ebuild,
   bibletime-2.9.1.ebuild:



1.1                  app-text/bibletime/bibletime-2.10.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibletime/bibletime-2.10.1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/bibletime/bibletime-2.10.1.ebuild?rev=1.1&content-type=text/plain

Index: bibletime-2.10.1.ebuild
===================================================================
# 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
}




Reply via email to