old

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

11 files changed, 8 insertions, 426 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index 4c0c1c37b8dd..b2e5fa3f6a0e 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/sword
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.64 2012/03/16 20:06:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.65 2012/03/16 20:07:18 ssuominen Exp $
+
+  16 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -sword-1.5.8-r2.ebuild,
+  -sword-1.5.9-r2.ebuild, -sword-1.5.10-r2.ebuild,
+  -files/sword-1.5.10+gcc-4.3.patch, -sword-1.5.11.ebuild,
+  -files/sword-1.5.11-gcc44.patch, -sword-1.6.0.ebuild, -sword-1.6.1.ebuild,
+  -files/escape_range.patch, -files/sword.conf:
+  old
 
   16 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> sword-1.6.2.ebuild:
   x86 stable wrt #408255
diff --git a/app-text/sword/files/escape_range.patch b/app-text/sword/files/escape_range.patch
deleted file mode 100644
index e967c4c68256..000000000000
--- a/app-text/sword/files/escape_range.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- utilities/diatheke/cgi/diatheke.pl.orig	2008-02-19 20:53:33.000000000 -0700
-+++ utilities/diatheke/cgi/diatheke.pl	2008-02-19 20:54:05.000000000 -0700
-@@ -110,8 +110,7 @@
- 	    $range = $mydata;
- 	    $range =~ tr/+/ /;
- 	    $range =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
--	    $range = "-r \"$range\"";
--            $range = shell_escape($range);
-+	    $range = "-r '" . shell_escape($range) . "'";
- 	}
- 
- 	elsif ($varname eq "strongs") {
diff --git a/app-text/sword/files/sword-1.5.10+gcc-4.3.patch b/app-text/sword/files/sword-1.5.10+gcc-4.3.patch
deleted file mode 100644
index 968be88c898e..000000000000
--- a/app-text/sword/files/sword-1.5.10+gcc-4.3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- include/gbfwordjs.h.orig	2008-06-09 00:45:08.000000000 +0200
-+++ include/gbfwordjs.h	2008-06-09 00:45:49.000000000 +0200
-@@ -21,6 +21,8 @@
- #ifndef GBFWORDSJS_H
- #define GBFWORDSJS_H
- 
-+
-+#include <cstdio>
- #include <swoptfilter.h>
- 
- SWORD_NAMESPACE_START
-
---- include/flatapi.h.orig	2008-06-09 00:51:23.000000000 +0200
-+++ include/flatapi.h	2008-06-09 00:51:43.000000000 +0200
-@@ -29,6 +29,8 @@
- 
- extern "C" {
- 
-+
-+#include <stdint.h>
- #define SWHANDLE intptr_t
- 
- 
-
---- utilities/diatheke/corediatheke.h.orig	2008-06-09 00:57:06.000000000 +0200
-+++ utilities/diatheke/corediatheke.h	2008-06-09 00:57:57.000000000 +0200
-@@ -3,7 +3,8 @@
- // Licensed under GNU General Public License (GPL)
- // see accompanying LICENSE file for license details
- 
--#include <stdio.h>
-+#include <cstdio>
-+#include <fstream>
- 
- #include "diathekemgr.h"
- #include <localemgr.h>
-
---- utilities/diatheke/osiscgi.h.orig	2008-06-09 01:01:14.000000000 +0200
-+++ utilities/diatheke/osiscgi.h	2008-06-09 01:01:45.000000000 +0200
-@@ -19,6 +19,7 @@
- 
- #include <swbasicfilter.h>
- 
-+#include <cctype>
- #include <defs.h>
- 
- SWORD_NAMESPACE_START
-
diff --git a/app-text/sword/files/sword-1.5.11-gcc44.patch b/app-text/sword/files/sword-1.5.11-gcc44.patch
deleted file mode 100644
index c2dd3d0fa706..000000000000
--- a/app-text/sword/files/sword-1.5.11-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sword-1.5.11-orig/utilities/emptyvss.cpp
-+++ sword-1.5.11/utilities/emptyvss.cpp
-@@ -2,6 +2,7 @@
- #include <swmodule.h>
- #include <versekey.h>
- #include <iostream>
-+#include <cstdio>
- 
- #ifndef NO_SWORD_NAMESPACE
- using sword::SWMgr;
diff --git a/app-text/sword/files/sword.conf b/app-text/sword/files/sword.conf
deleted file mode 100644
index 49ea7eeeb752..000000000000
--- a/app-text/sword/files/sword.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Install]
-DataPath=/usr/share/sword/
diff --git a/app-text/sword/sword-1.5.10-r2.ebuild b/app-text/sword/sword-1.5.10-r2.ebuild
deleted file mode 100644
index 28fcf5d583b8..000000000000
--- a/app-text/sword/sword-1.5.10-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.10-r2.ebuild,v 1.7 2009/07/12 18:08:07 halcy0n Exp $
-
-inherit 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.5/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="curl debug doc icu lucene"
-
-RDEPEND="sys-libs/zlib
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu )
-	lucene? ( dev-cpp/clucene )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/escape_range.patch"
-	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
-}
-
-src_compile() {
-	strip-flags
-	econf --with-zlib \
-		--with-conf \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_with icu) \
-		$(use_enable lucene) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
-	if use doc ;then
-		rm -rf examples/.cvsignore
-		rm -rf examples/cmdline/.cvsignore
-		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${D}/usr/share/doc/${PF}/"
-	fi
-	# global configuration file
-	insinto /etc
-	doins "${FILESDIR}/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 /usr/share/doc/${PF}/"
-	echo
-}
diff --git a/app-text/sword/sword-1.5.11.ebuild b/app-text/sword/sword-1.5.11.ebuild
deleted file mode 100644
index 0ba54d2d5268..000000000000
--- a/app-text/sword/sword-1.5.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.11.ebuild,v 1.6 2009/07/12 18:08:07 halcy0n Exp $
-
-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.5/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="curl debug doc icu lucene"
-
-RDEPEND="sys-libs/zlib
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu )
-	lucene? ( dev-cpp/clucene )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc44.patch		#269190
-}
-
-src_compile() {
-	strip-flags
-	econf --with-zlib \
-		--with-conf \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_with icu) \
-		$(use_enable lucene) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
-	if use doc ;then
-		rm -rf examples/.cvsignore
-		rm -rf examples/cmdline/.cvsignore
-		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${D}/usr/share/doc/${PF}/"
-	fi
-	# global configuration file
-	insinto /etc
-	doins "${FILESDIR}/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 /usr/share/doc/${PF}/"
-	echo
-}
diff --git a/app-text/sword/sword-1.5.8-r2.ebuild b/app-text/sword/sword-1.5.8-r2.ebuild
deleted file mode 100644
index 82907b541721..000000000000
--- a/app-text/sword/sword-1.5.8-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 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-r2.ebuild,v 1.6 2009/07/12 18:08:07 halcy0n Exp $
-
-inherit 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.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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/escape_range.patch"
-}
-
-src_compile() {
-	strip-flags
-	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
-	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 /usr/share/doc/${PF}/"
-	echo
-}
diff --git a/app-text/sword/sword-1.5.9-r2.ebuild b/app-text/sword/sword-1.5.9-r2.ebuild
deleted file mode 100644
index a537ab5e1177..000000000000
--- a/app-text/sword/sword-1.5.9-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.9-r2.ebuild,v 1.4 2009/07/12 18:08:07 halcy0n Exp $
-
-inherit 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.5/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="curl debug doc icu lucene"
-
-RDEPEND="sys-libs/zlib
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu )
-	lucene? ( dev-cpp/clucene )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/escape_range.patch"
-}
-
-src_compile() {
-	strip-flags
-	econf --with-zlib \
-		--with-conf \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_with icu) \
-		$(use_enable lucene) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
-	if use doc ;then
-		rm -rf examples/.cvsignore
-		rm -rf examples/cmdline/.cvsignore
-		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${D}/usr/share/doc/${PF}/"
-	fi
-	# global configuration file
-	insinto /etc
-	doins "${FILESDIR}/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 /usr/share/doc/${PF}/"
-	echo
-}
diff --git a/app-text/sword/sword-1.6.0.ebuild b/app-text/sword/sword-1.6.0.ebuild
deleted file mode 100644
index 682b04603584..000000000000
--- a/app-text/sword/sword-1.6.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.0.ebuild,v 1.5 2010/02/10 03:57:23 josejx Exp $
-
-inherit 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"
-IUSE="curl debug doc icu lucene"
-
-RDEPEND="sys-libs/zlib
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu )
-	lucene? ( dev-cpp/clucene )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	strip-flags
-	econf --with-zlib \
-		--with-conf \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_with icu) \
-		$(use_enable lucene) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
-	if use doc ;then
-		rm -rf examples/.cvsignore
-		rm -rf examples/cmdline/.cvsignore
-		rm -rf examples/cmdline/.deps
-		cp -R samples examples "${D}/usr/share/doc/${PF}/"
-	fi
-	# global configuration file
-	insinto /etc
-	doins "${FILESDIR}/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 /usr/share/doc/${PF}/"
-	echo
-}
diff --git a/app-text/sword/sword-1.6.1.ebuild b/app-text/sword/sword-1.6.1.ebuild
deleted file mode 100644
index 64a9dcdd3c43..000000000000
--- a/app-text/sword/sword-1.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.1.ebuild,v 1.2 2010/05/14 08:14:39 grobian Exp $
-
-EAPI="3"
-
-inherit 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 lucene"
-
-RDEPEND="sys-libs/zlib
-	curl? ( net-misc/curl )
-	icu? ( dev-libs/icu )
-	lucene? ( dev-cpp/clucene )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	cat > "${T}"/sword.conf <<- _EOF
-		[Install]
-		DataPath=${EPREFIX}/usr/share/sword/
-	_EOF
-}
-
-src_configure() {
-	strip-flags
-	econf --with-zlib \
-		--with-conf \
-		$(use_with curl) \
-		$(use_enable debug) \
-		$(use_with icu) \
-		$(use_with lucene) || 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
-}