sword: fix build with new curl

See bug 378055.

6 files changed, 341 insertions, 0 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
new file mode 100644
index 0000000..2f25784
--- /dev/null
+++ b/app-text/sword/ChangeLog
@@ -0,0 +1,237 @@
+# ChangeLog for app-text/sword
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.59 2011/06/11 17:52:00 beandog Exp $
+
+*sword-1.6.2 (11 Jun 2011)
+
+  11 Jun 2011; Steve Dibb <beandog@gentoo.org> +sword-1.6.2.ebuild:
+  Version bump, bug 344247
+
+  14 May 2010; Fabian Groffen <grobian@gentoo.org> sword-1.6.1.ebuild:
+  Add Prefix changes and keywords, bug #317935
+
+  10 Feb 2010; Joseph Jezak <josejx@gentoo.org> sword-1.6.0.ebuild:
+  Marked ppc stable for bug #294863.
+
+*sword-1.6.1 (05 Jan 2010)
+
+  05 Jan 2010; Steve Dibb <beandog@gentoo.org> +sword-1.6.1.ebuild:
+  Version bump
+
+  03 Dec 2009; Markus Meier <maekke@gentoo.org> sword-1.6.0.ebuild:
+  amd64 stable, bug #294863
+
+  30 Nov 2009; Markus Meier <maekke@gentoo.org> sword-1.6.0.ebuild:
+  x86 stable, bug #294863
+
+  12 Jul 2009; Mark Loeser <halcy0n@gentoo.org> sword-1.5.8-r2.ebuild,
+  sword-1.5.9-r2.ebuild, sword-1.5.10-r2.ebuild, sword-1.5.11.ebuild,
+  sword-1.6.0.ebuild:
+  Fix elog statement; bug #272904
+
+*sword-1.6.0 (01 Jun 2009)
+
+  01 Jun 2009; Patrick Lauer <patrick@gentoo.org> +sword-1.6.0.ebuild:
+  Bump to 1.6.0, closes #271965
+
+  15 May 2009; Ryan Hill <dirtyepic@gentoo.org> sword-1.5.11.ebuild,
+  +files/sword-1.5.11-gcc44.patch:
+  Fix building with GCC 4.4. Thanks to Kent Fredric for the patch. (bug
+  #269190)
+
+  26 Feb 2009; Joseph Jezak <josejx@gentoo.org> sword-1.5.11.ebuild:
+  Marked ppc stable for bug #245855.
+
+  15 Feb 2009; Markus Meier <maekke@gentoo.org> sword-1.5.11.ebuild:
+  x86 stable, bug #245855
+
+  05 Jan 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
+  drop local icu USE-flag description, as it's global now
+
+  20 Dec 2008; Markus Meier <maekke@gentoo.org> sword-1.5.10-r2.ebuild:
+  x86 stable, bug #245857
+
+  20 Dec 2008; nixnut <nixnut@gentoo.org> sword-1.5.10-r2.ebuild:
+  Stable on ppc wrt bug 245857
+
+  18 Dec 2008; Steve Dibb <beandog@gentoo.org> sword-1.5.9-r2.ebuild,
+  sword-1.5.10-r2.ebuild, sword-1.5.11.ebuild:
+  amd64 stable
+
+  02 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
+  Add USE flag description to metadata wrt GLEP 56.
+
+*sword-1.5.11 (29 Jul 2008)
+
+  29 Jul 2008; Steve Dibb <beandog@gentoo.org> +sword-1.5.11.ebuild:
+  Version bump, bug 232375
+
+  09 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/sword-1.5.10+gcc-4.3.patch, sword-1.5.10-r2.ebuild:
+  Add patch to build with GCC 4.3. Thanks to Marek Miller in bug #225479.
+
+  21 May 2008; Samuli Suominen <drac@gentoo.org> sword-1.5.8-r2.ebuild,
+  sword-1.5.9-r2.ebuild, sword-1.5.10-r2.ebuild:
+  Move pkgconfig to DEPEND.
+
+  21 May 2008; Samuli Suominen <drac@gentoo.org> sword-1.5.8-r2.ebuild,
+  sword-1.5.9-r2.ebuild, sword-1.5.10-r2.ebuild:
+  Move pkgconfig to DEPEND.
+
+  22 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  sword-1.5.8-r2.ebuild:
+  ppc stable, bug #210754
+
+  21 Feb 2008; <welp@gentoo.org> sword-1.5.8-r2.ebuild:
+  Stable on amd64; bug 210754
+
+  20 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  sword-1.5.8-r2.ebuild:
+  stable x86, security bug 210754
+
+*sword-1.5.10-r2 (20 Feb 2008)
+*sword-1.5.9-r2 (20 Feb 2008)
+*sword-1.5.8-r2 (20 Feb 2008)
+
+  20 Feb 2008; Steve Dibb <beandog@gentoo.org> +files/escape_range.patch,
+  +sword-1.5.8-r2.ebuild, +sword-1.5.9-r2.ebuild, +sword-1.5.10-r2.ebuild:
+  Add escape range patch, security bug 210754
+
+*sword-1.5.10-r1 (07 Jan 2008)
+*sword-1.5.9-r1 (07 Jan 2008)
+
+  07 Jan 2008; Steve Dibb <beandog@gentoo.org> +sword-1.5.8-r1.ebuild,
+  -sword-1.5.9.ebuild, +sword-1.5.9-r1.ebuild, -sword-1.5.10.ebuild,
+  +sword-1.5.10-r1.ebuild:
+  Filter non-safe flags (bug 202197), fix deps, ebuild cleanup
+
+*sword-1.5.10 (05 Jan 2008)
+
+  05 Jan 2008; Steve Dibb <beandog@gentoo.org> +sword-1.5.10.ebuild:
+  Version bump, bug 198617
+
+  19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove squinky86 from metadata.xml due to retirement.
+
+  10 Mar 2007; Roy Marples <uberlord@gentoo.org> sword-1.5.9.ebuild:
+  Added ~x86-fbsd keyword.
+
+  28 Jan 2007; Marius Mauch <genone@gentoo.org> sword-1.5.8.ebuild,
+  sword-1.5.9.ebuild:
+  Replacing einfo with elog
+
+  21 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  -sword-1.5.8-r1.ebuild, sword-1.5.9.ebuild:
+  Cleanup ebuild, add docs use flag; thanks to Jouni Rinne; bug 158468
+
+  21 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  -sword-1.5.8-r1.ebuild, sword-1.5.9.ebuild:
+  Cleanup ebuild, add docs use flag; thanks to Jouni Rinne; bug 158468
+
+*sword-1.5.9 (21 Oct 2006)
+
+  21 Oct 2006; Jon Hood <squinky86@gentoo.org> +sword-1.5.9.ebuild:
+  Version bump to support bibletime-1.6.
+
+  05 Jul 2006; <nixnut@gentoo.org> sword-1.5.8-r1.ebuild:
+  Added ~ppc wrt bug #136709
+
+*sword-1.5.8-r1 (13 Jun 2006)
+
+  13 Jun 2006; Jon Hood <squinky86@gentoo.org> +sword-1.5.8-r1.ebuild:
+  Version bump, add lucene support and fix icu build issues.
+
+  28 Apr 2006; Jon Hood <squinky86@gentoo.org> metadata.xml,
+  -sword-1.5.8_pre1.ebuild:
+  Re-add myself as maintainer. Remove old version so I don't have to support
+  cvs snapshots.
+
+  20 Nov 2005; Joseph Jezak <josejx@gentoo.org> sword-1.5.8.ebuild:
+  Marked ppc stable for bug #112834.
+
+  19 Nov 2005; Simon Stelling <blubb@gentoo.org> sword-1.5.8.ebuild:
+  stable on amd64
+
+  19 Nov 2005; Mark Loeser <halcy0n@gentoo.org> sword-1.5.8.ebuild:
+  Stable on x86; bug #112834
+
+*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:
+  Stable on ppc.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> sword-1.5.8_pre1.ebuild:
+  stable on amd64
+
+  02 Jul 2004; Jon Hood <squinky86@gentoo.org>
+  -files/sword-gcc34-gentoo.patch, -files/sword-installmgr-gentoo.patch,
+  -sword-1.5.6.ebuild, -sword-1.5.7.ebuild, sword-1.5.8_pre1.ebuild:
+  stable on x86, cleanup non-working ebuilds, marking stable early because
+  gcc updates cause failed compiles of earlier versions on the stable tree
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sword-1.5.6.ebuild,
+  sword-1.5.7.ebuild, sword-1.5.8_pre1.ebuild:
+  virtual/glibc -> virtual/libc
+
+*sword-1.5.8_pre1 (23 Jun 2004)
+
+  23 Jun 2004; Jon Hood <squinky86@gentoo.org> sword-1.5.7.ebuild,
+  +sword-1.5.8_pre1.ebuild:
+  version bump to fix #48523
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> sword-1.5.7.ebuild:
+  added ~amd64 keyword
+
+  01 May 2004; Jon Hood <squinky86@gentoo.org>
+  +files/sword-gcc34-gentoo.patch, sword-1.5.7.ebuild:
+  gcc3.4 compile time patch from Robert Moss <robert.moss@jesus.ox.ac.uk>
+
+*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
+  edit patch to apply to 1.5.6 to close bug #44041
+  remove older version
+
+  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
+
+*sword-1.5.6 (04 Oct 2003)
+
+  04 Oct 2003; Heinrich Wendel <lanius@gentoo.org> sword-1.5.4.ebuild,
+  sword-1.5.6.ebuild:
+  version bump
+
+*sword-1.5.5.99 (16 Jul 2003)
+
+  16 Jul 2003; Nick Hadaway <raker@gentoo.org> sword-1.5.5.99.ebuild:
+  Added new version for support of the latest bibletime-1.3rc1
+
+*sword-1.5.5 (02 Nov 2002)
+
+  02 Nov 2002; Nick Hadaway <raker@gentoo.org> sword-1.5.5.ebuild,
+  files/digest-sword-1.5.5 :
+  Version bump.
+
+*sword-1.5.4 (23 Oct 2002)
+
+  30 Oct 2002; Nick Hadaway <raker@gentoo.org> sword-1.5.4.ebuild :
+  Added final set of missing documentation.
+
+  26 Oct 2002; Nick Hadaway <raker@gentoo.org> sword-1.5.4.ebuild :
+  Added docs and the html api documentation
+
+  23 Oct 2002; Nick Hadaway <raker@gentoo.org> sword-1.5.4.ebuild,
+  files/digest-sword-1.5.4 :
+  Initial ebuild.
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
new file mode 100644
index 0000000..cf07d39
--- /dev/null
+++ b/app-text/sword/Manifest
@@ -0,0 +1,6 @@
+AUX sword-1.6.2-curl.patch 573 RMD160 ead9e57e86d414a2e0b9ade47ac4f33bb46a036d SHA1 4e6aa0d922b54488314c32485a6523bddf403097 SHA256 34316d58fb61fc33c52c69ab398b37c522071d594858844164ac634baac393ac
+AUX sword.conf 37 RMD160 faba7da387461ae680fdc514eb382ff0c2bf3b9c SHA1 1c25331915d8c6a420d3c8bd3e276fe1d07279b3 SHA256 5656c02ccb594d922f0fb6cc1b8babec3b6047385ade02d003182917c5b3e933
+DIST sword-1.6.2.tar.gz 1965427 RMD160 e85230c007782c526157a5650f3e5c1c27b60ea6 SHA1 d4f3b924ba6f78b436a33d4819c76f766e4551f8 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9
+EBUILD sword-1.6.2.ebuild 1590 RMD160 a57e64be8f30aafa076a0fff5f376864fd37ee49 SHA1 d75396622ed3e87adf946106cbf7ee5f5a43b6de SHA256 bb486ce234d9cddcf1c9161e3aa74b20dd20773c37ef94de4d23c38aba9c461a
+MISC ChangeLog 7946 RMD160 0903f9f2bbf788fa8d4d777409b20ff2122ddde1 SHA1 9134f60c4a50105a9f7bdd05f727bdc4938266d2 SHA256 6c66fe46407a601250f0a627e39043a80cf1c6c5b04c00dff7dd908937aa1780
+MISC metadata.xml 469 RMD160 84ca27f8b1c3dd4142a637c9dd89ef7405aec04d SHA1 56e97e8067ac18ff2ed9aa8f42e46dc3be8488c4 SHA256 78fd163e5975551082327b925b0df4f7d26a90a60e3f01911a2a1a74cd990789
diff --git a/app-text/sword/files/sword-1.6.2-curl.patch b/app-text/sword/files/sword-1.6.2-curl.patch
new file mode 100644
index 0000000..d5bcb8d
--- /dev/null
+++ b/app-text/sword/files/sword-1.6.2-curl.patch
@@ -0,0 +1,20 @@
+--- sword-1.6.2/src/mgr/curlftpt.cpp.orig	2010-03-20 14:49:54.000000000 +0300
++++ sword-1.6.2/src/mgr/curlftpt.cpp	2011-08-07 13:12:04.793884628 +0400
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+--- sword-1.6.2/src/mgr/curlhttpt.cpp.orig	2009-10-22 04:46:40.000000000 +0400
++++ sword-1.6.2/src/mgr/curlhttpt.cpp	2011-08-07 13:12:10.155783758 +0400
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
diff --git a/app-text/sword/files/sword.conf b/app-text/sword/files/sword.conf
new file mode 100644
index 0000000..49ea7ee
--- /dev/null
+++ b/app-text/sword/files/sword.conf
@@ -0,0 +1,2 @@
+[Install]
+DataPath=/usr/share/sword/
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
new file mode 100644
index 0000000..212f744
--- /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>theology</herd>
+<maintainer>
+  <email>theology@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.6.2.ebuild b/app-text/sword/sword-1.6.2.ebuild
new file mode 100644
index 0000000..0fd253a
--- /dev/null
+++ b/app-text/sword/sword-1.6.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.2.ebuild,v 1.1 2011/06/11 17:52:00 beandog Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Library for Bible reading software."
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+IUSE="curl debug doc icu"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	cat > "${T}"/sword.conf <<- _EOF
+		[Install]
+		DataPath=${EPREFIX}/usr/share/sword/
+	_EOF
+	# bug 378055
+	epatch "${FILESDIR}/${P}-curl.patch"
+}
+
+src_configure() {
+	strip-flags
+	econf --with-zlib \
+		--with-conf \
+		$(use_with curl) \
+		$(use_enable debug) \
+		$(use_with icu) || die "configure failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS CODINGSTYLE ChangeLog README
+	if use doc ;then
+		rm -rf examples/.cvsignore
+		rm -rf examples/cmdline/.cvsignore
+		rm -rf examples/cmdline/.deps
+		cp -R samples examples "${ED}/usr/share/doc/${PF}/"
+	fi
+	# global configuration file
+	insinto /etc
+	doins "${T}/sword.conf"
+}
+
+pkg_postinst() {
+	echo
+	elog "Check out http://www.crosswire.org/sword/modules/"
+	elog "to download modules that you would like to use with SWORD."
+	elog "Follow module installation instructions found on"
+	elog "the web or in ${EPREFIX}/usr/share/doc/${PF}/"
+	echo
+}