fix bug #47088 and change metadata.xml

5 files changed, 37 insertions, 10 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index c67948451e17..145acb53d452 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,10 +1,15 @@
 # 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.10 2004/04/06 02:45:23 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.11 2004/04/08 20:01:48 squinky86 Exp $
 
 
 *sword-1.5.7 (05 Apr 2004)
 
+  08 Apr 2004; Jon Hood <squinky86@gentoo.org>:
+  added patch for building with curl (closes bug #47088) thanks
+  to stamm@flashmail.com,
+  changed post_install information
+
   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.
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index d875ee4406f8..6995fe67e4c4 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,8 +1,9 @@
-MD5 067f7142fc8c636cfe2179a436130dff sword-1.5.7.ebuild 1201
+MD5 59aee822af324a0e101eaef61a78c611 sword-1.5.7.ebuild 1360
 MD5 887f4ccf2ef2114492b71bb1c2fe6d14 sword-1.5.6.ebuild 1008
 MD5 2e2db1e17a1ae6063c062256435c55ea sword-1.5.5.ebuild 1008
-MD5 fa6682c097e74ba5ed3c7596ab2b1286 ChangeLog 1285
-MD5 e279ffe17a23a81dce3748c0a3ef0f3f metadata.xml 468
+MD5 7c9eb0079a0923284840c0f76b10a42b ChangeLog 1459
+MD5 ad380c3ad43e07e96cb3f81b334994a4 metadata.xml 570
 MD5 1d74f356d597b13019fc25fdfbec57af files/digest-sword-1.5.5 64
 MD5 9e04e627c30e6862e7cae8a2e5b9af22 files/digest-sword-1.5.6 64
 MD5 804c86a778da7cd957c88cf4640abfae files/digest-sword-1.5.7 64
+MD5 c829247bcd6f79f1b977d835356de14b files/sword-1.5.7-gentoo.patch 498
diff --git a/app-text/sword/files/sword-1.5.7-gentoo.patch b/app-text/sword/files/sword-1.5.7-gentoo.patch
new file mode 100644
index 000000000000..4b823055b90e
--- /dev/null
+++ b/app-text/sword/files/sword-1.5.7-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur sword-1.5.7.vanilla/src/mgr/installmgr.cpp sword-1.5.7/src/mgr/installmgr.cpp
+--- sword-1.5.7.vanilla/src/mgr/installmgr.cpp	2003-11-25 13:11:13.000000000 -0600
++++ sword-1.5.7/src/mgr/installmgr.cpp	2004-04-08 15:51:34.933586760 -0500
+@@ -150,7 +150,7 @@
+ 		curl_easy_setopt(curl, CURLOPT_FILE, &ftpfile);
+ 
+ 		/* Switch on full protocol/debug output */
+-		curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE);
++		curl_easy_setopt(curl, CURLOPT_VERBOSE);
+ 
+ 		res = curl_easy_perform(curl);
+ 
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index b19770a9febf..236acc6f0cff 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>text-markup</herd>
 <maintainer>
  <email>squinky86@gentoo.org</email>
+ <description>It isn't exactly text-markup, but it's the closest herd
+ I could find</description>
 </maintainer>
 <longdescription>
 The SWORD Project is the CrossWire Bible Society's free Bible software
diff --git a/app-text/sword/sword-1.5.7.ebuild b/app-text/sword/sword-1.5.7.ebuild
index 321efca14217..8fdb3249d695 100644
--- a/app-text/sword/sword-1.5.7.ebuild
+++ b/app-text/sword/sword-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.1 2004/04/06 02:45:23 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.7.ebuild,v 1.2 2004/04/08 20:01:48 squinky86 Exp $
 
 DESCRIPTION="library for bible reading software"
 HOMEPAGE="http://www.crosswire.org/sword/"
@@ -16,9 +16,14 @@ DEPEND="virtual/glibc
 	curl? ( >=net-misc/curl-7.9 )
 	icu? ( dev-libs/icu )"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
 src_compile() {
 	econf --without-clucene --without-lucene `use_with icu` `use_with curl` || die "configure failed"
-	emake || die "compile failed failed"
+	emake || die "compile failed"
 }
 
 src_install() {
@@ -31,9 +36,11 @@ src_install() {
 
 pkg_postinst() {
 	einfo ""
-	einfo "Check out http://www.crosswire.org/sword/modules/"
-	einfo "to download modules that you would like to enhance"
-	einfo "the library with.  Follow module installation"
+	einfo "To install modules for SWORD, you can emerge:"
+	einfo "  app-text/sword-modules"
+	einfo "or check out http://www.crosswire.org/sword/modules/"
+	einfo "to download modules manually that you would like to"
+	einfo "use the library with.  Follow module installation"
 	einfo "instructions found on the web or in INSTALL.gz found"
 	einfo "in /usr/share/doc/${PF}"
 	einfo ""