early version bump to fix stable x86 compile errors; removing broken ebuilds

8 files changed, 11 insertions, 139 deletions

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index da50e730168a..d20c739fb2c5 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/sword
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.18 2004/07/01 19:28:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.19 2004/07/03 01:07:28 squinky86 Exp $
+
+  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:
diff --git a/app-text/sword/files/digest-sword-1.5.6 b/app-text/sword/files/digest-sword-1.5.6
deleted file mode 100644
index 5a445bad1c70..000000000000
--- a/app-text/sword/files/digest-sword-1.5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a374e78edc8a8d8801955faf989007e sword-1.5.6.tar.gz 3427634
diff --git a/app-text/sword/files/digest-sword-1.5.7 b/app-text/sword/files/digest-sword-1.5.7
deleted file mode 100644
index 4a9e5e6da2e7..000000000000
--- a/app-text/sword/files/digest-sword-1.5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 369f09068839c646aeab691c63a40d67 sword-1.5.7.tar.gz 1482711
diff --git a/app-text/sword/files/sword-gcc34-gentoo.patch b/app-text/sword/files/sword-gcc34-gentoo.patch
deleted file mode 100644
index bf0869f9cb20..000000000000
--- a/app-text/sword/files/sword-gcc34-gentoo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/multimapwdef.h.old	2004-04-29 04:22:07.516715976 +0100
-+++ include/multimapwdef.h	2004-04-29 04:22:20.051810352 +0100
-@@ -12,14 +12,14 @@
- public:
- 	typedef std::pair<const Key, T> value_type;
- 	T& getWithDefault(const Key& k, const T& defaultValue) {
--		if (find(k) == end()) {
-+		if (find(k) == this->end()) {
- 			insert(value_type(k, defaultValue));
- 		}
- 		return (*(find(k))).second;
- 	}
- 
- 	T& operator[](const Key& k) {
--		if (find(k) == end()) {
-+		if (find(k) == this->end()) {
- 			insert(value_type(k, T()));
- 		}
- 		return (*(find(k))).second;
diff --git a/app-text/sword/files/sword-installmgr-gentoo.patch b/app-text/sword/files/sword-installmgr-gentoo.patch
deleted file mode 100644
index 90d664dcdbbf..000000000000
--- a/app-text/sword/files/sword-installmgr-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur sword-1.5.7.vanilla/src/mgr/installmgr.cpp sword-1.5.7/src/mgr/installmgr.cpp
---- src/mgr/installmgr.cpp	2003-11-25 13:11:13.000000000 -0600
-+++ 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, true);
- 
- 		res = curl_easy_perform(curl);
- 
diff --git a/app-text/sword/sword-1.5.6.ebuild b/app-text/sword/sword-1.5.6.ebuild
deleted file mode 100644
index 0c159b3e2aec..000000000000
--- a/app-text/sword/sword-1.5.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.6.ebuild,v 1.7 2004/07/01 12:05:37 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="library for bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/"
-SRC_URI="ftp://ftp.crosswire.org/pub/sword/source/v1.5/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE="curl"
-DEPEND="virtual/libc
-	sys-libs/zlib
-	curl? ( >=net-misc/curl-7.10.8 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-installmgr-gentoo.patch
-}
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	einstall
-
-	dodoc AUTHORS CODINGSTYLE INSTALL ChangeLog README
-	cp -R samples examples ${D}/usr/share/doc/${PF}
-	dohtml doc/api-documentation/html/*
-}
-
-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 "instructions found on the web or in INSTALL.gz found"
-	einfo "in /usr/share/doc/${PF}"
-	einfo ""
-}
diff --git a/app-text/sword/sword-1.5.7.ebuild b/app-text/sword/sword-1.5.7.ebuild
deleted file mode 100644
index 95c527e04c5f..000000000000
--- a/app-text/sword/sword-1.5.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.9 2004/07/01 12:05:37 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="library for bible reading software"
-HOMEPAGE="http://www.crosswire.org/sword/"
-SRC_URI="ftp://ftp.crosswire.org/pub/sword/source/v1.5/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# do not mark stable- problems when compiling (bug #48523)
-KEYWORDS="~x86 ~ppc ~amd64"
-
-IUSE="icu curl"
-DEPEND="virtual/libc
-	sys-libs/zlib
-	curl? ( >=net-misc/curl-7.10.8 )
-	icu? ( dev-libs/icu )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-installmgr-gentoo.patch
-	epatch ${FILESDIR}/${PN}-gcc34-gentoo.patch
-}
-
-src_compile() {
-	econf --without-clucene --without-lucene `use_with icu` `use_with curl` || die "configure failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodir /etc
-	doins ${FILESDIR}/sword.conf
-
-	dodoc AUTHORS CODINGSTYLE INSTALL ChangeLog README
-	cp -R samples examples ${D}/usr/share/doc/${PF}
-	dohtml doc/api-documentation/html/*
-}
-
-pkg_postinst() {
-	einfo ""
-	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 ""
-}
diff --git a/app-text/sword/sword-1.5.8_pre1.ebuild b/app-text/sword/sword-1.5.8_pre1.ebuild
index 9eaa277895ae..4ac270a4845b 100644
--- a/app-text/sword/sword-1.5.8_pre1.ebuild
+++ b/app-text/sword/sword-1.5.8_pre1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 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.3 2004/07/01 12:05:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.8_pre1.ebuild,v 1.4 2004/07/03 01:07:28 squinky86 Exp $
 
 DESCRIPTION="Library for Bible reading software"
 HOMEPAGE="http://www.crosswire.org/sword/"
 
 LICENSE="GPL-2"
 SLOT="0"
-# temporary ebuild to fix bug #48523- please do not mark stable
-KEYWORDS="~x86 ~ppc ~amd64"
+# cvs snapshot required as all other versions are broken
+KEYWORDS="x86 ~ppc ~amd64"
 SRC_URI="http://dev.gentoo.org/~squinky86/files/${P}.tar.bz2"
 IUSE="icu curl"
 RDEPEND="virtual/libc
@@ -33,7 +33,7 @@ src_compile() {
 src_install() {
 	einstall || die "install failed"
 	dodir /etc
-	insdir /etc
+	insinto /etc
 	doins ${FILESDIR}/sword.conf
 
 	dodoc AUTHORS CODINGSTYLE INSTALL ChangeLog README