New version (#94873). Ebuild cleanup.

(Portage version: 2.0.51.22-r2)

10 files changed, 95 insertions, 12 deletions

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index ef6a846e20c5..affe02066e5a 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/bibletime
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.19 2005/03/24 00:42:37 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.20 2005/07/27 21:21:38 greg_g Exp $
+
+*bibletime-1.5 (27 Jul 2005)
+
+  27 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> metadata.xml,
+  bibletime-1.4.2_pre1.ebuild, +bibletime-1.5.ebuild:
+  New version (#94873). Ebuild cleanup.
 
   24 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
   bibletime-1.4.2_pre1.ebuild:
diff --git a/app-text/bibletime/bibletime-1.4.2_pre1.ebuild b/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
index 4af16fd29ef3..68a8a8770b5e 100644
--- a/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
+++ b/app-text/bibletime/bibletime-1.4.2_pre1.ebuild
@@ -1,10 +1,10 @@
 # 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.9 2005/03/24 00:42:37 luckyduck Exp $
+# $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="BibleTime KDE Bible study application using the SWORD library."
+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"
 
diff --git a/app-text/bibletime/bibletime-1.5.ebuild b/app-text/bibletime/bibletime-1.5.ebuild
new file mode 100644
index 000000000000..7335b9d85031
--- /dev/null
+++ b/app-text/bibletime/bibletime-1.5.ebuild
@@ -0,0 +1,32 @@
+# 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.5 b/app-text/bibletime/files/digest-bibletime-1.5
new file mode 100644
index 000000000000..01c80ebc03d3
--- /dev/null
+++ b/app-text/bibletime/files/digest-bibletime-1.5
@@ -0,0 +1 @@
+MD5 e760378bfd64890875437cd2fbf90428 bibletime-1.5.tar.bz2 1179773
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index 326abe1787b2..77a5f0d95899 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 <longdescription>
 BibleTime is a Bible study application for Linux. It is based on the 
 K Desktop Environment and uses the SWORD programming library to work 
diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index f6432224dfcf..7ba153878c35 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/sword
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.22 2005/04/24 11:43:30 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.23 2005/07/27 21:19:12 greg_g Exp $
+
+*sword-1.5.8 (27 Jul 2005)
+
+  27 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> metadata.xml,
+  sword-1.5.8_pre1.ebuild, +sword-1.5.8.ebuild:
+  New version (#94873). Ebuild cleanup.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   sword-1.5.8_pre1.ebuild:
diff --git a/app-text/sword/files/digest-sword-1.5.8 b/app-text/sword/files/digest-sword-1.5.8
new file mode 100644
index 000000000000..d8397f8e0ec6
--- /dev/null
+++ b/app-text/sword/files/digest-sword-1.5.8
@@ -0,0 +1 @@
+MD5 c36398c84bfb044c0c66ef3ffcf29400 sword-1.5.8.tar.gz 1714799
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index b19770a9febf..ea458e49d038 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 <longdescription>
 The SWORD Project is the CrossWire Bible Society's free Bible software
 project. Its purpose is to create tools that allow programmers and Bible
diff --git a/app-text/sword/sword-1.5.8.ebuild b/app-text/sword/sword-1.5.8.ebuild
new file mode 100644
index 000000000000..7f4046f2e698
--- /dev/null
+++ b/app-text/sword/sword-1.5.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.8.ebuild,v 1.1 2005/07/27 21:19:12 greg_g Exp $
+
+DESCRIPTION="Library for Bible reading software."
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl icu debug"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_compile() {
+	local myconf="--without-lucene --with-zlib --with-conf
+	              $(use_enable debug) $(use_with curl)"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
+
+	cp -R samples examples ${D}/usr/share/doc/${PF}/
+}
+
+pkg_postinst() {
+	echo
+	einfo "Check out http://www.crosswire.org/sword/modules/"
+	einfo "to download modules that you would like to use the"
+	einfo "library with.  Follow module installation instructions"
+	einfo "found on the web or in /usr/share/doc/${PF}/INSTALL.gz."
+	echo
+}
diff --git a/app-text/sword/sword-1.5.8_pre1.ebuild b/app-text/sword/sword-1.5.8_pre1.ebuild
index 515c0669592b..9bb833463445 100644
--- a/app-text/sword/sword-1.5.8_pre1.ebuild
+++ b/app-text/sword/sword-1.5.8_pre1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.8_pre1.ebuild,v 1.7 2005/04/24 11:43:30 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.8_pre1.ebuild,v 1.8 2005/07/27 21:19:12 greg_g Exp $
 
-DESCRIPTION="Library for Bible reading software"
+DESCRIPTION="Library for Bible reading software."
 HOMEPAGE="http://www.crosswire.org/sword/"
 
 LICENSE="GPL-2"