Version bump, remove old release candidates.

(Portage version: 2.1.2_pre3-r6)

4 files changed, 99 insertions, 3 deletions

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index 324e4838509a..41fbc54a1b39 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/bibletime
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.35 2006/08/30 03:40:30 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.36 2006/10/21 17:10:38 squinky86 Exp $
+
+*bibletime-1.6 (21 Oct 2006)
+
+  21 Oct 2006; Jon Hood <squinky86@gentoo.org> -bibletime-1.6_rc1.ebuild,
+  +bibletime-1.6.ebuild:
+  Version bump, remove old release candidates.
 
 *bibletime-1.6_rc1 (30 Aug 2006)
 
diff --git a/app-text/bibletime/bibletime-1.5.3.ebuild b/app-text/bibletime/bibletime-1.5.3.ebuild
index ead9440e935b..2ee97e30409d 100644
--- a/app-text/bibletime/bibletime-1.5.3.ebuild
+++ b/app-text/bibletime/bibletime-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.5.3.ebuild,v 1.5 2006/07/07 14:26:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.5.3.ebuild,v 1.6 2006/10/21 17:10:38 squinky86 Exp $
 
 inherit kde eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND=">=app-text/sword-1.5.8"
+DEPEND="=app-text/sword-1.5.8*"
 
 LANGS_PKG=${PN}-i18n-1.5.1
 LANGS="af bg cs da de en_GB es fi fr hu it ko nl nn_NO no pl pt_BR ro ru sk ua"
diff --git a/app-text/bibletime/bibletime-1.6.ebuild b/app-text/bibletime/bibletime-1.6.ebuild
new file mode 100644
index 000000000000..c0f2361fd961
--- /dev/null
+++ b/app-text/bibletime/bibletime-1.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.6.ebuild,v 1.1 2006/10/21 17:10:38 squinky86 Exp $
+
+inherit kde eutils versionator
+
+DESCRIPTION="KDE Bible study application using the SWORD library."
+HOMEPAGE="http://www.bibletime.info/"
+SRC_URI="mirror://sourceforge/bibletime/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=app-text/sword-1.5.9
+	>=dev-cpp/clucene-0.9.15"
+
+LANGS_PKG=${PN}-i18n-${PV}
+LANGS="af bg cs da de en_GB es fi fr hu it ko nl nn_NO no pl pt_BR ro ru sk ua"
+LANGS_DOC="bg cs de fi fr it ko nl pt_BR ru"
+
+for X in ${LANGS}; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/bibletime/${LANGS_PKG}.tar.bz2 )"
+done
+
+need-kde 3.4
+
+pkg_setup() {
+	if ! built_with_use app-text/sword curl; then
+		echo
+		ewarn "The SWORD library 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 make sure app-text/sword"
+		ewarn "was compiled with USE=\"curl\"."
+		ewarn "Press ctrl+c to abort the merge of BibleTime if you want to"
+		ewarn "recompile SWORD with curl support."
+		echo
+		ebeep 5
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	local MAKE_LANGS MAKE_LANGS_DOC
+	for X in ${LANGS}; do
+		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X/pt_BR/pt_br}.po"
+	done
+	for X in ${LANGS_DOC}; do
+		use linguas_${X} && MAKE_LANGS_DOC="${MAKE_LANGS_DOC} ${X/pt_BR/pt-br}"
+	done
+
+	if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then
+		cd "${WORKDIR}/${LANGS_PKG}"
+		sed -i -e "s,^POFILES.*,POFILES = ${MAKE_LANGS}," po/Makefile.am
+		sed -i -e "s,^SUBDIRS.*,SUBDIRS = ${MAKE_LANGS_DOC}," docs/Makefile.am
+		rm configure
+	fi
+}
+
+src_compile() {
+	kde_src_compile
+
+	local _S="${S}"
+	if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then
+		S="${WORKDIR}/${LANGS_PKG}"
+		cd "${S}"
+		kde_src_compile
+	fi
+	S="${_S}"
+}
+
+src_install() {
+	kde_src_install
+
+	local _S="${S}"
+	if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then
+		S="${WORKDIR}/${LANGS_PKG}"
+		cd "${S}"
+		kde_src_install
+	fi
+	S="${_S}"
+}
diff --git a/app-text/bibletime/files/digest-bibletime-1.6 b/app-text/bibletime/files/digest-bibletime-1.6
new file mode 100644
index 000000000000..98c92cbde50f
--- /dev/null
+++ b/app-text/bibletime/files/digest-bibletime-1.6
@@ -0,0 +1,6 @@
+MD5 44ba2d9bd907d38ea86ad5ff565d6af0 bibletime-1.6.tar.bz2 1228793
+RMD160 6a38ffa80d2ee44cc543f17ebe213d786b5b8c5c bibletime-1.6.tar.bz2 1228793
+SHA256 ef3e83a27bfafb0a73141c417628b27692161b5dbde2cafdca1af31751d5b886 bibletime-1.6.tar.bz2 1228793
+MD5 74fc1fc129b619a10948043368242ef9 bibletime-i18n-1.6.tar.bz2 992260
+RMD160 69ac897213af5f745a725ddb7af13549038a8d7b bibletime-i18n-1.6.tar.bz2 992260
+SHA256 b3e0564e9faf6d9d82c74a958e7eff2f35d2c50b638caa14ca87421bc19e0cd2 bibletime-i18n-1.6.tar.bz2 992260