version bump to fix #48523

4 files changed, 68 insertions, 3 deletions

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index c8a500e8506d..abeb7e5fc1fd 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/bibletime
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.11 2004/06/04 15:43:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.12 2004/06/23 21:49:22 squinky86 Exp $
+
+*bibletime-1.4.2_pre1 (23 Jun 2004)
+
+  23 Jun 2004; Jon Hood <squinky86@gentoo.org> bibletime-1.4.1.ebuild,
+  +bibletime-1.4.2_pre1.ebuild:
+  version bump, fixes #48523
 
   04 Jun 2004; Carsten Lohrke <carlo@gentoo.org> metadata.xml:
   wrong herd name: kde -> kde-other
diff --git a/app-text/bibletime/bibletime-1.4.1.ebuild b/app-text/bibletime/bibletime-1.4.1.ebuild
index 8e5269a89e79..38f932fca8a9 100644
--- a/app-text/bibletime/bibletime-1.4.1.ebuild
+++ b/app-text/bibletime/bibletime-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.4.1.ebuild,v 1.3 2004/06/02 16:39:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.4.1.ebuild,v 1.4 2004/06/23 21:49:22 squinky86 Exp $
 
 inherit kde
 need-kde 3
@@ -11,8 +11,9 @@ HOMEPAGE="http://bibletime.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
+# do not mark stable (bug #48523)
 KEYWORDS="~x86 ~ppc"
-newdepend ">=app-text/sword-1.5.7
+newdepend "=app-text/sword-1.5.7*
 	>=net-misc/curl-7.10"
 
 pkg_preinst() {
diff --git a/app-text/bibletime/bibletime-1.4.2_pre1.ebuild b/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
new file mode 100644
index 000000000000..e4354cf94e18
--- /dev/null
+++ b/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.4.2_pre1.ebuild,v 1.1 2004/06/23 21:49:22 squinky86 Exp $
+
+inherit kde
+need-kde 3
+
+IUSE="curl"
+DESCRIPTION="BibleTime KDE Bible study application using the SWORD library."
+HOMEPAGE="http://bibletime.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+# temporary ebuild to fix #48523
+KEYWORDS="~x86 ~ppc"
+newdepend ">=app-text/sword-1.5.8_pre1
+	>=net-misc/curl-7.10"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	./autogen.sh
+}
+
+pkg_preinst() {
+	if ! use curl ; then
+		ewarn
+		ewarn "You do not have \"curl\" support enabled in your USE variable."
+		ewarn "This means SWORD may not have been compiled with curl support."
+		ewarn "If you wish to use BibleTime's ability to download modules"
+		ewarn "straight from the SWORD website, please add \"curl\" to your"
+		ewarn "USE variable in /etc/make.conf or make sure app-text/sword was"
+		ewarn "compiled with support for curl:"
+		ewarn "  USE=\"curl\" emerge sword"
+		ewarn "Press ctrl+c to abort the merge of BibleTime if you want to"
+		ewarn "recompile SWORD with curl support."
+		ewarn
+		for TICKER in 1 2 3 4 5; do
+			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+			echo -ne "\a" ; sleep 1
+		done
+		sleep 8
+	fi
+}
+
+pkg_postinst() {
+	if use curl ; then
+		einfo
+		einfo "To use BibleTime's ability to install modules from"
+		einfo "The SWORD Project's website, make sure that SWORD"
+		einfo "was compiled with curl support, either by making"
+		einfo "sure the \"curl\" USE flag is set in /etc/make.conf"
+		einfo "or by installing SWORD with:"
+		einfo "  USE=\"curl\" emerge sword"
+		einfo
+	fi
+}
diff --git a/app-text/bibletime/files/digest-bibletime-1.4.2_pre1 b/app-text/bibletime/files/digest-bibletime-1.4.2_pre1
new file mode 100644
index 000000000000..a85dbacb5c28
--- /dev/null
+++ b/app-text/bibletime/files/digest-bibletime-1.4.2_pre1
@@ -0,0 +1 @@
+MD5 5bc5ed235775b0d602f37d5372bf06e8 bibletime-1.4.2_pre1.tar.bz2 2123314