early version bump to fix stable x86 compile errors; removing broken ebuilds

6 files changed, 7 insertions, 74 deletions

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index a23718daafcb..189164f42b35 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/bibletime
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.13 2004/06/24 22:28:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.14 2004/07/03 01:08:10 squinky86 Exp $
+
+  02 Jul 2004; Jon Hood <squinky86@gentoo.org> -bibletime-1.3.ebuild,
+  -bibletime-1.4.1.ebuild, bibletime-1.4.2_pre1.ebuild:
+  stable on x86, remove old non-working versions
 
 *bibletime-1.4.2_pre1 (23 Jun 2004)
 
diff --git a/app-text/bibletime/bibletime-1.3.ebuild b/app-text/bibletime/bibletime-1.3.ebuild
deleted file mode 100644
index 39f9be9b02c6..000000000000
--- a/app-text/bibletime/bibletime-1.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.3.ebuild,v 1.4 2004/06/24 22:28:22 agriffis Exp $
-
-inherit kde
-need-kde 3
-
-IUSE=""
-DESCRIPTION="BibleTime KDE Bible study application using the SWORD library."
-HOMEPAGE="http://bibletime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-S="${WORKDIR}/${P/_/}"
-
-newdepend ">=app-text/sword-1.5.6"
diff --git a/app-text/bibletime/bibletime-1.4.1.ebuild b/app-text/bibletime/bibletime-1.4.1.ebuild
deleted file mode 100644
index a6c173c34bd0..000000000000
--- a/app-text/bibletime/bibletime-1.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.5 2004/06/24 22:28:22 agriffis 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"
-# do not mark stable (bug #48523)
-KEYWORDS="~x86 ~ppc"
-newdepend "=app-text/sword-1.5.7*
-	>=net-misc/curl-7.10"
-
-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/bibletime-1.4.2_pre1.ebuild b/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
index cd4c4c7506f1..f81ce81002f8 100644
--- a/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
+++ b/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.3 2004/06/24 22:28:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.4.2_pre1.ebuild,v 1.4 2004/07/03 01:08:10 squinky86 Exp $
 
 inherit kde
 need-kde 3
@@ -11,8 +11,7 @@ HOMEPAGE="http://bibletime.sourceforge.net/"
 SRC_URI="http://dev.gentoo.org/~squinky86/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-# temporary ebuild to fix #48523
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 newdepend ">=app-text/sword-1.5.8_pre1
 	>=net-misc/curl-7.10"
 
diff --git a/app-text/bibletime/files/digest-bibletime-1.3 b/app-text/bibletime/files/digest-bibletime-1.3
deleted file mode 100644
index fc1f15f09022..000000000000
--- a/app-text/bibletime/files/digest-bibletime-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 941ac3217e0fe43a515011fac4167af1 bibletime-1.3.tar.gz 2163629
diff --git a/app-text/bibletime/files/digest-bibletime-1.4.1 b/app-text/bibletime/files/digest-bibletime-1.4.1
deleted file mode 100644
index 253432cd7b84..000000000000
--- a/app-text/bibletime/files/digest-bibletime-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df6ab259b188b8555f9423c629d0b239 bibletime-1.4.1.tar.bz2 1647715