7 files changed, 32 insertions, 194 deletions
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index c8d993ee75f9..edd8bb4b84f8 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,22 +1,34 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dc99c8f091c039cd8ea9848260de359a ChangeLog 3364
-MD5 f9647fb228eef2c6527e10ca5985fb8f bibletime-1.4.2_pre1.ebuild 1648
-MD5 2c06f46a9dd6135fabb18fa3e8d8e47b bibletime-1.5.1.ebuild 2125
+DIST bibletime-1.5.2.tar.bz2 1172884 RMD160 a6b0f5036b14aaf6074615297f5246db350ba6c1 SHA1 5ebccf35c7ed09ab18be26722df2880ed9171fc4 SHA256 ec1acca315a74f04d6b076d96eb143dcc6b317faf1fc79612f24f3abca38afbf
+DIST bibletime-1.5.3.tar.bz2 1172436 RMD160 3effb93a81bf6773deff8b11afb5eca6d0192fcb SHA1 580093c6d7968f668b04a78a477f21cb01e0a252 SHA256 95a868a18b85ffb9f52671c3e2cb386ef09a0ca9651a78e929cb88a35b0b6aa5
+DIST bibletime-1.6beta2.tar.bz2 1200407 RMD160 742a5e3f5809a06ca93672001063be276183622b SHA1 a0ed0a85107c56552204eac8b280e41cabea125d SHA256 333644309e4fd03282430137c27a2f134a5b110b7c9829356a81d7576e203867
+DIST bibletime-i18n-1.5.1.tar.bz2 1007666 RMD160 7390f810ddec1b8309630054a8b87b5d56441825 SHA1 033e10502a2fe361100bdb9d2b652f6a16e5055d SHA256 fdd2056171221a08f045f9a0af5db63d39e761b49f146fc683956250265bebc5
+DIST bibletime-i18n-1.5.3.tar.bz2 1024639 RMD160 5455172a63001e84fc30628d41bd1a709f23e3e9 SHA1 05fb1a90e74ecf5fbe8d367da7eda15d8ba09497 SHA256 ac43274ae1b45e26c8ed38170657f94a146d8645122b0a2900e2bc39e9867c3e
+EBUILD bibletime-1.5.2.ebuild 2124 RMD160 9d3238ead4c36a66304022a697d8697db842ba15 SHA1 778abf2290e9d7bcfdcb4449d0e8608a258f44b7 SHA256 a120849b0a27bacf3af5567e210d76061802328a7f19f05090f1308a2552bdb9
 MD5 71fbe7fb969e1c7b885eb412dbb89539 bibletime-1.5.2.ebuild 2124
+RMD160 9d3238ead4c36a66304022a697d8697db842ba15 bibletime-1.5.2.ebuild 2124
+SHA256 a120849b0a27bacf3af5567e210d76061802328a7f19f05090f1308a2552bdb9 bibletime-1.5.2.ebuild 2124
+EBUILD bibletime-1.5.3.ebuild 2127 RMD160 6db65828330fc576d860b542d89053b709a65ae8 SHA1 fa2d0cc995c0e3e7e9e2eaca8ee278f417d60c9d SHA256 9cc6f96dfd8ba95ced7e56aefff3e29f6c0281409dcd9625de37d6c4d13052cc
 MD5 e4df4bfd1d155c373b6a95709e939861 bibletime-1.5.3.ebuild 2127
-MD5 9ba793b0a888d152bb471d4d6eaf7cca bibletime-1.5.ebuild 975
-MD5 e189003108b45c99da2b91c1605a3be1 files/digest-bibletime-1.4.2_pre1 74
-MD5 da1a592bd44f3a06aa0edbf58e849cec files/digest-bibletime-1.5 67
-MD5 a76be10929c45af2e0dfa694c3f9fea4 files/digest-bibletime-1.5.1 143
-MD5 5f0fb359006afb7561ab2a32c5d8b7b9 files/digest-bibletime-1.5.2 143
-MD5 81ebce6855ee7c8fb9053af72c4ee26f files/digest-bibletime-1.5.3 143
-MD5 f7c5ba21162c3c79edaebb2431cbe757 metadata.xml 430
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf+ancsIHjyDViGQRAo6bAKDJz5GvqacL9dZfEtWhftb8aLV3awCfSjuU
-R/BO7Uq2AosSo7MeGQ97KhM=
-=sj1y
------END PGP SIGNATURE-----
+RMD160 6db65828330fc576d860b542d89053b709a65ae8 bibletime-1.5.3.ebuild 2127
+SHA256 9cc6f96dfd8ba95ced7e56aefff3e29f6c0281409dcd9625de37d6c4d13052cc bibletime-1.5.3.ebuild 2127
+EBUILD bibletime-1.6_beta2.ebuild 2230 RMD160 3dc678e3da9632e1ee5bf19be5c9f72415310bb2 SHA1 e08d30eff63d74c724d54a8a64a761a97cc89d0b SHA256 58462970845c84eb464e8575a05187cb1c0c09f682d4d7d922700a5278820240
+MD5 7a8dfb5dbcf5d83a61bbec60debacb1c bibletime-1.6_beta2.ebuild 2230
+RMD160 3dc678e3da9632e1ee5bf19be5c9f72415310bb2 bibletime-1.6_beta2.ebuild 2230
+SHA256 58462970845c84eb464e8575a05187cb1c0c09f682d4d7d922700a5278820240 bibletime-1.6_beta2.ebuild 2230
+MISC ChangeLog 3673 RMD160 9ddb47563c25a58532570366b204e857bad4fd1b SHA1 5ba03db7a17a255e1843620676133a0adbdd5956 SHA256 004ea27448c3f3d9246fc396ef42141e1fe31b04e0140b2c0213a2ee05964c0f
+MD5 0b1cd47e4e9cb296d4aa067fb12cefda ChangeLog 3673
+RMD160 9ddb47563c25a58532570366b204e857bad4fd1b ChangeLog 3673
+SHA256 004ea27448c3f3d9246fc396ef42141e1fe31b04e0140b2c0213a2ee05964c0f ChangeLog 3673
+MISC metadata.xml 519 RMD160 1efcfc9c151e957054d9193a108999e340a6f0cb SHA1 453f32c4c05179aff7961c7833adac4df5b9240f SHA256 edcd4a5617801c972da5472badc56579ac2e3916977a065f722d5391e7c4fb1d
+MD5 ad5e3891d47792bb4c0ed616a8d2aa8e metadata.xml 519
+RMD160 1efcfc9c151e957054d9193a108999e340a6f0cb metadata.xml 519
+SHA256 edcd4a5617801c972da5472badc56579ac2e3916977a065f722d5391e7c4fb1d metadata.xml 519
+MD5 ad74288652a3711bb98ac12b77d9aadb files/digest-bibletime-1.5.2 521
+RMD160 31dca10116a312836efece3ac95fa8cfe9d23cda files/digest-bibletime-1.5.2 521
+SHA256 820e7ad23b2e0e639a79da0b9bac1d8d0ed6097d2b0c30988dc9ac8e9179065d files/digest-bibletime-1.5.2 521
+MD5 fd1a604c33dcff4a50c6a0f5cc2bbecc files/digest-bibletime-1.5.3 521
+RMD160 01aee3c3b2e28adef7a5c03290b1e86cfaaba1c5 files/digest-bibletime-1.5.3 521
+SHA256 856253469d5d21a9cadc567476dd60a17cf76e57884ab085227a3ca2a140b39d files/digest-bibletime-1.5.3 521
+MD5 fc86e93b01697b570eb2f39cc237b5ea files/digest-bibletime-1.6_beta2 530
+RMD160 393d35e4905b7d5ecc371090a82c972ff81ad67b files/digest-bibletime-1.6_beta2 530
+SHA256 55601e7d6037f6164df314d3a3ebb10b5b7aba1ba48c25f4aa55128adeadd37f files/digest-bibletime-1.6_beta2 530
diff --git a/app-text/bibletime/bibletime-1.4.2_pre1.ebuild b/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
deleted file mode 100644
index 68a8a8770b5e..000000000000
--- a/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 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.10 2005/07/27 21:21:38 greg_g Exp $
-
-inherit kde eutils
-
-DESCRIPTION="KDE Bible study application using the SWORD library."
-HOMEPAGE="http://bibletime.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~squinky86/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE="curl"
-
-RDEPEND=">=app-text/sword-1.5.8_pre1
-	>=net-misc/curl-7.10"
-DEPEND=${RDEPEND}
-need-kde 3
-
-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
-		ebeep 5
-		epause 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.5.1.ebuild b/app-text/bibletime/bibletime-1.5.1.ebuild
deleted file mode 100644
index 5b1804770cd1..000000000000
--- a/app-text/bibletime/bibletime-1.5.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.5.1.ebuild,v 1.1 2005/10/11 12:42:06 greg_g Exp $
-
-inherit kde eutils
-
-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.8"
-
-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/${PN}-i18n-${PV}.tar.bz2 )"
-done
-
-need-kde 3
-
-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}/${PN}-i18n-${PV}" ]; then
-		cd ${WORKDIR}/${PN}-i18n-${PV}/
-		sed -i -e "s,^POFILES.*,POFILES = ${MAKE_LANGS}," po/Makefile.am
-		sed -i -e "s,^SUBDIRS.*,SUBDIRS = ${MAKE_LANGS_DOC}," docs/Makefile.am
-		make -f admin/Makefile.common || die
-	fi
-}
-
-src_compile() {
-	kde_src_compile
-
-	local _S="${S}"
-	if [ -d "${WORKDIR}/${PN}-i18n-${PV}" ]; then
-		S="${WORKDIR}/${PN}-i18n-${PV}"
-		cd "${S}"
-		kde_src_compile
-	fi
-	S="${_S}"
-}
-
-src_install() {
-	kde_src_install
-
-	local _S="${S}"
-	if [ -d "${WORKDIR}/${PN}-i18n-${PV}" ]; then
-		S="${WORKDIR}/${PN}-i18n-${PV}"
-		cd "${S}"
-		kde_src_install
-	fi
-	S="${_S}"
-}
diff --git a/app-text/bibletime/bibletime-1.5.ebuild b/app-text/bibletime/bibletime-1.5.ebuild
deleted file mode 100644
index 7335b9d85031..000000000000
--- a/app-text/bibletime/bibletime-1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.5.ebuild,v 1.1 2005/07/27 21:21:38 greg_g Exp $
-
-inherit kde eutils
-
-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.8"
-
-need-kde 3
-
-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
-}
diff --git a/app-text/bibletime/files/digest-bibletime-1.4.2_pre1 b/app-text/bibletime/files/digest-bibletime-1.4.2_pre1
deleted file mode 100644
index a85dbacb5c28..000000000000
--- a/app-text/bibletime/files/digest-bibletime-1.4.2_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5bc5ed235775b0d602f37d5372bf06e8 bibletime-1.4.2_pre1.tar.bz2 2123314
diff --git a/app-text/bibletime/files/digest-bibletime-1.5 b/app-text/bibletime/files/digest-bibletime-1.5
deleted file mode 100644
index 01c80ebc03d3..000000000000
--- a/app-text/bibletime/files/digest-bibletime-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e760378bfd64890875437cd2fbf90428 bibletime-1.5.tar.bz2 1179773
diff --git a/app-text/bibletime/files/digest-bibletime-1.5.1 b/app-text/bibletime/files/digest-bibletime-1.5.1
deleted file mode 100644
index 6bcd6e2cd28a..000000000000
--- a/app-text/bibletime/files/digest-bibletime-1.5.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8dd771393d9183e81b5d7cc3d408f949 bibletime-1.5.1.tar.bz2 1178707
-MD5 e6e5e1865e1eaf01f3da0c48417ae18b bibletime-i18n-1.5.1.tar.bz2 1007666