Bump to 2.3, fixes #288219. Thanks to Jaak Ristioja for finding an updated ebuild.

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

3 files changed, 25 insertions, 11 deletions

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index 9be5871fbbd5..81222191664b 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/bibletime
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.54 2009/06/27 10:50:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.55 2009/10/08 19:45:07 patrick Exp $
+
+*bibletime-2.3 (08 Oct 2009)
+
+  08 Oct 2009; Patrick Lauer <patrick@gentoo.org> -bibletime-1.7.ebuild,
+  +bibletime-2.3.ebuild:
+  Bump to 2.3, fixes #288219. Thanks to Jaak Ristioja for finding an updated
+  ebuild.
 
 *bibletime-2.0.1 (27 Jun 2009)
 
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index 3b35107177c5..7f34a24754d3 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,12 +1,12 @@
 AUX bibletime-1.6.5-desktop.patch 723 RMD160 d3293691ec0fe23a64b8eec4a6b6b919ee151c08 SHA1 a4d8592f1895290c4c5e593567f2197e9b8242ca SHA256 04d6a7c560c32ca7b8af0d519083a88b370f98796ff9f384b1df2ae410e53bc1
 DIST bibletime-1.6.5.1.tar.bz2 1231060 RMD160 a9f138b60a05a2a9dabffcb0e6072581d886fcb0 SHA1 5857cfc79d8e801a9c6b7a3812806a4e6b03e0c0 SHA256 dd4af417534d306245e73b5c9fadb2186038a5407cdf1a83434d7f082fb5faa9
-DIST bibletime-1.7.tar.gz 4399630 RMD160 739e1737cb73b4d381da1ff005a396f6c327010d SHA1 84b520362864e0356b5b2bb15f6dee4761c6c558 SHA256 3777a45c949d25237facd84b49e032a53563ef93c46158acf4201cbf2c8d27df
 DIST bibletime-2.0.1.tar.gz 4287313 RMD160 7ae676f26d6ec6484ac615ae4d6324f599a324c4 SHA1 4c476df1732868c0ba10b0675ec73ec12970f8b1 SHA256 7e7c97f13d19f4e3eb4eecd88dc2096c27b170f1cc1c1f66bea309f9583ba2dc
 DIST bibletime-2.0.tar.gz 4287082 RMD160 48a04dcd5a46bf0507df99b0ac0b44ab7688c86a SHA1 e3455aa8c509bbc8fa59a42e572eabc51e0fe9bb SHA256 b1c8ac2c12946d35be8dc4451c70689126df8d4a90b0aec17d1b96b93ada1ba7
+DIST bibletime-2.3.tar.gz 4587778 RMD160 9a53eaadb25bcaefe476452547ed9a79ae63dba0 SHA1 29967de8d0739e348329a357fa72a8d1e1c992e1 SHA256 b887016bfc5338b9501be08a85da2c7fd1b41728880ff4b037dcaefcf78b69fb
 DIST bibletime-i18n-1.6.5.tar.bz2 1086518 RMD160 2aa9bdc9dd1a78e490c01c9956e9136bf09a21fc SHA1 1f2dba78d2e3699b472848fc813eb0b63923df0a SHA256 88d4a3acdbc82e8fd6d93124787d25fb0451245f03bd6254507d27b42f7d8ddb
 EBUILD bibletime-1.6.5.1-r1.ebuild 877 RMD160 09b2a02726d4b949d0821bef4214aff822db24b4 SHA1 90f0543e789e4354e2ea3061df8dc436e6d49555 SHA256 db1b14d0609c21e52abf0676b472d8c07e22f0606b2b1876314a1f244bdd7dfa
-EBUILD bibletime-1.7.ebuild 679 RMD160 d404786ed4b920146415c41f197b4f44e88a0780 SHA1 f3704f092038a7939e13f4aa6b771e2ebc9fdf56 SHA256 ea31b65e8811b913485ee825f859aa5d7aed0a89a7cb2ce11b4d6d15e725d00f
 EBUILD bibletime-2.0.1.ebuild 724 RMD160 3c8fad7eee43769bd3fddd9223db83b63d697849 SHA1 0420f8db418cd36a6b46f0b5effe4d20f95c71ec SHA256 8289ce2581e2173984e200120ba637ede2ff837f4e332b0c4f4519fd93b49d86
 EBUILD bibletime-2.0.ebuild 688 RMD160 0e23372566086c0c491d556a18e7edfccd7c64ec SHA1 efc16d3858afb6293387e906703bdcc22d294223 SHA256 ccff8d1ef0b132ce1292b511aa22a813ced07044e2cd67e8843cdfe26f560b47
-MISC ChangeLog 7367 RMD160 772f87bce9d15e37978cc746a071fffc2ba152e6 SHA1 b1637d8ffbfb472e38e8464a2308ee89e0ae263d SHA256 8728009e6e5ededdf32fa8291b1505c970b86506251c2921d455cd6c0f194145
+EBUILD bibletime-2.3.ebuild 860 RMD160 3efe117543ccf6e88fffead6cb8d1db2db9e0631 SHA1 538377a60af369c41b18ac0c0a0c52b128026065 SHA256 c1c671eab6e44790c12ab1e5198e3e68f6e140c69d79c3241f4c5a9d2c9fb32a
+MISC ChangeLog 7583 RMD160 26ca49b67096d2211bc2fdad09ec21187880e25f SHA1 93dbf6bcbce6d9c814028432809a8fa2e09a3e5b SHA256 14198d54c8df0b88e3260993ca8ddb75d4c5533995a54c1e89ee03acafa8ca40
 MISC metadata.xml 436 RMD160 11ce6c34d5d5aa08fce2c3b35805500e321b2d6e SHA1 59d1f0c3d51bc75dc226655ffbd385b36b97f883 SHA256 d59c32394540212a4cb547af0ffa112a9d6f0d4bc9dfacaeda9395c518d88141
diff --git a/app-text/bibletime/bibletime-1.7.ebuild b/app-text/bibletime/bibletime-2.3.ebuild
index 06f74b9c3bc9..ff60ee21645f 100644
--- a/app-text/bibletime/bibletime-1.7.ebuild
+++ b/app-text/bibletime/bibletime-2.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.7.ebuild,v 1.1 2009/03/03 17:02:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.3.ebuild,v 1.1 2009/10/08 19:45:07 patrick Exp $
 
 EAPI=2
 
-inherit kde4-base
+inherit cmake-utils
 
-DESCRIPTION="KDE Bible study application using the SWORD library."
+DESCRIPTION="Qt4 Bible study application using the SWORD library."
 HOMEPAGE="http://www.bibletime.info/"
 SRC_URI="mirror://sourceforge/bibletime/${P}.tar.gz"
 
@@ -15,13 +15,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=app-text/sword-1.5.10
-	>=dev-cpp/clucene-0.9.16
+RDEPEND=">=app-text/sword-1.6.0
+	>=dev-cpp/clucene-0.9.16a
+	dev-libs/boost
+	>=x11-libs/qt-core-4.4.0:4
+	>=x11-libs/qt-dbus-4.4.0:4
+	>=x11-libs/qt-gui-4.4.0:4
+	>=x11-libs/qt-svg-4.4.0:4
 	>=x11-libs/qt-webkit-4.4.0:4"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.6.0
+	>=x11-libs/qt-test-4.4.0:4"
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		-DUSE_QT_WEBKIT=ON"
-	kde4-base_src_configure
+	cmake-utils_src_configure
 }