version bump to 1.5.7 and clean up

6 files changed, 38 insertions, 14 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index d6da13c3b076..c67948451e17 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/sword
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.9 2003/10/23 17:13:42 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.10 2004/04/06 02:45:23 squinky86 Exp $
+
+
+*sword-1.5.7 (05 Apr 2004)
+
+  05 Apr 2004; Jon Hood <squinky86@gentoo.org> sword-1.5.7.ebuild:
+  version bump. Thanks to Timothy Stotts for this ebuild in bug
+  #39300.
 
   23 Oct 2003; Caleb Tennis <caleb@gentoo.org> sword-1.5.6.ebuild:
   Bump to x86 stable
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 76ef5c21cd17..44ca617ac45f 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,7 +1,8 @@
-MD5 96fff7d9e93784ba55084d963803fc98 ChangeLog 1109
-MD5 e8753e330aa244546e9845dff04b4652 sword-1.5.5.99.ebuild 997
-MD5 2e2db1e17a1ae6063c062256435c55ea sword-1.5.5.ebuild 1008
+MD5 2225a756cf4dc1a2bc36d5e64b073c05 sword-1.5.7.ebuild 1102
 MD5 887f4ccf2ef2114492b71bb1c2fe6d14 sword-1.5.6.ebuild 1008
-MD5 9e04e627c30e6862e7cae8a2e5b9af22 files/digest-sword-1.5.6 64
+MD5 2e2db1e17a1ae6063c062256435c55ea sword-1.5.5.ebuild 1008
+MD5 541d3a9137eabffd07160232ad35e67a ChangeLog 1280
+MD5 e279ffe17a23a81dce3748c0a3ef0f3f metadata.xml 468
 MD5 1d74f356d597b13019fc25fdfbec57af files/digest-sword-1.5.5 64
-MD5 344f7776d45fae5c236ee3d5915d4817 files/digest-sword-1.5.5.99 66
+MD5 9e04e627c30e6862e7cae8a2e5b9af22 files/digest-sword-1.5.6 64
+MD5 804c86a778da7cd957c88cf4640abfae files/digest-sword-1.5.7 64
diff --git a/app-text/sword/files/digest-sword-1.5.5.99 b/app-text/sword/files/digest-sword-1.5.5.99
deleted file mode 100644
index 108c761a2dc6..000000000000
--- a/app-text/sword/files/digest-sword-1.5.5.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52db9d2098657bb3dc6d6c17520e9553 sword-1.5.5.99.tar.gz 567181
diff --git a/app-text/sword/files/digest-sword-1.5.7 b/app-text/sword/files/digest-sword-1.5.7
new file mode 100644
index 000000000000..4a9e5e6da2e7
--- /dev/null
+++ b/app-text/sword/files/digest-sword-1.5.7
@@ -0,0 +1 @@
+MD5 369f09068839c646aeab691c63a40d67 sword-1.5.7.tar.gz 1482711
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
new file mode 100644
index 000000000000..b19770a9febf
--- /dev/null
+++ b/app-text/sword/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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
+societies to write new Bible software more quickly and easily.
+</longdescription>
+</pkgmetadata>
diff --git a/app-text/sword/sword-1.5.5.99.ebuild b/app-text/sword/sword-1.5.7.ebuild
index 12a1734397e9..321efca14217 100644
--- a/app-text/sword/sword-1.5.5.99.ebuild
+++ b/app-text/sword/sword-1.5.7.ebuild
@@ -1,25 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.5.99.ebuild,v 1.2 2004/03/12 09:18:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.7.ebuild,v 1.1 2004/04/06 02:45:23 squinky86 Exp $
 
 DESCRIPTION="library for bible reading software"
 HOMEPAGE="http://www.crosswire.org/sword/"
-SRC_URI="mirror://sourceforge/bibletime/${P}.tar.gz"
+SRC_URI="ftp://ftp.crosswire.org/pub/sword/source/v1.5/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
+IUSE="icu curl"
 DEPEND="virtual/glibc
-	sys-libs/zlib"
+	sys-libs/zlib
+	curl? ( >=net-misc/curl-7.9 )
+	icu? ( dev-libs/icu )"
 
 src_compile() {
-	econf
-	emake || die "parallel make failed"
+	econf --without-clucene --without-lucene `use_with icu` `use_with curl` || die "configure failed"
+	emake || die "compile failed failed"
 }
 
 src_install() {
-	einstall
+	einstall || die "install failed"
 
 	dodoc AUTHORS CODINGSTYLE INSTALL ChangeLog README
 	cp -R samples examples ${D}/usr/share/doc/${PF}