Fix sword dependency, remove old version.

(Portage version: 2.1.2_pre3-r6)
 (Unsigned Manifest commit)

4 files changed, 8 insertions, 73 deletions

diff --git a/app-text/gnomesword/Manifest b/app-text/gnomesword/Manifest
index 9698f8ad4d9f..47f0766dcd65 100644
--- a/app-text/gnomesword/Manifest
+++ b/app-text/gnomesword/Manifest
@@ -1,32 +1,20 @@
-AUX gnomesword-2.1.1-gcc-3.4.patch 365 RMD160 3bdeceb35bceaa29795637c6079e2e9587f3892d SHA1 3df42524ad9122412a4b887685a38c71febaa629 SHA256 26292d8acb0dd3b8f6f338c2b200947fc69623d4bfcf46413dcd07985b507ac9
-MD5 c7c3a66ca0618cbc1ec047753829a4aa files/gnomesword-2.1.1-gcc-3.4.patch 365
-RMD160 3bdeceb35bceaa29795637c6079e2e9587f3892d files/gnomesword-2.1.1-gcc-3.4.patch 365
-SHA256 26292d8acb0dd3b8f6f338c2b200947fc69623d4bfcf46413dcd07985b507ac9 files/gnomesword-2.1.1-gcc-3.4.patch 365
 AUX gnomesword-2.1.7-commentary_dialog.c.patch 3650 RMD160 339564b85ebf2078e04eb5a4d8f62c9a0ace50ed SHA1 d08e21bfa563abb2ef2d474d12025382e89c90ba SHA256 4a6daf46d0b114acc1eca0c18101cb276cf1d5c531f79dbae57dd25313fe1665
 MD5 2bc4aa62654d1bf4215a5dc448fd5022 files/gnomesword-2.1.7-commentary_dialog.c.patch 3650
 RMD160 339564b85ebf2078e04eb5a4d8f62c9a0ace50ed files/gnomesword-2.1.7-commentary_dialog.c.patch 3650
 SHA256 4a6daf46d0b114acc1eca0c18101cb276cf1d5c531f79dbae57dd25313fe1665 files/gnomesword-2.1.7-commentary_dialog.c.patch 3650
-DIST gnomesword-2.1.1.tar.gz 1758480
 DIST gnomesword-2.1.7.tar.gz 2516069 RMD160 ecae162431f0fbd7147cd67e18a56a79eb8e55f6 SHA1 fdb77d43788e68228cc353b312d876ee5ab2ab20 SHA256 9478c6b0826d2d21343db8ce35a56ab6260db588d591e59c069d57ffc3c07a87
-EBUILD gnomesword-2.1.1.ebuild 1010 RMD160 b0a539b0f9dd5abe3227ffd6b132306a3e365aa9 SHA1 6dbc5e11f3beb4f545ce123b3344ca39763a0eda SHA256 966a4a983b0ba0327ddaec194725c25ae2b2f09f4bcfbe6d3a42d549d9975aea
-MD5 5430d1afa5a8106c1674405af9d921c2 gnomesword-2.1.1.ebuild 1010
-RMD160 b0a539b0f9dd5abe3227ffd6b132306a3e365aa9 gnomesword-2.1.1.ebuild 1010
-SHA256 966a4a983b0ba0327ddaec194725c25ae2b2f09f4bcfbe6d3a42d549d9975aea gnomesword-2.1.1.ebuild 1010
-EBUILD gnomesword-2.1.7.ebuild 1200 RMD160 79eb338c087a1f3e833d79d81ac7fb59dd014a79 SHA1 2bef552b05a105dd03d49cf3163e14ef8dd5db6b SHA256 aa1fcf9ef08075781bebe6fb4037bfef8454e2844285acecf9139c4d124f7d93
-MD5 b0c339d6ffb16ace9cd1645aeb710396 gnomesword-2.1.7.ebuild 1200
-RMD160 79eb338c087a1f3e833d79d81ac7fb59dd014a79 gnomesword-2.1.7.ebuild 1200
-SHA256 aa1fcf9ef08075781bebe6fb4037bfef8454e2844285acecf9139c4d124f7d93 gnomesword-2.1.7.ebuild 1200
-MISC ChangeLog 1917 RMD160 95457b8bf565a123f03f2a80dea59b7ee9a96f55 SHA1 065838cbd4d868122eb680a2c1e389614621a8e2 SHA256 e91955171c5c1ee5d883022ba3c39c1b1d7bdd1533140ed58bdc68bf878c6ebc
-MD5 e31d56f7a01c19bf84a7c2114f1392ea ChangeLog 1917
-RMD160 95457b8bf565a123f03f2a80dea59b7ee9a96f55 ChangeLog 1917
-SHA256 e91955171c5c1ee5d883022ba3c39c1b1d7bdd1533140ed58bdc68bf878c6ebc ChangeLog 1917
+EBUILD gnomesword-2.1.7.ebuild 1200 RMD160 c66629e3b8293a4b01bef7ef531b2dc17aeb7b22 SHA1 e9a0529921428d607d46637f959769e1c2d937a1 SHA256 ecec400da68ea8f9c626923336c0df648e3b13279b12f4a0e9e6e67a635cc829
+MD5 03998b3c93d4ce45d3a8ce6c4aaa220a gnomesword-2.1.7.ebuild 1200
+RMD160 c66629e3b8293a4b01bef7ef531b2dc17aeb7b22 gnomesword-2.1.7.ebuild 1200
+SHA256 ecec400da68ea8f9c626923336c0df648e3b13279b12f4a0e9e6e67a635cc829 gnomesword-2.1.7.ebuild 1200
+MISC ChangeLog 2103 RMD160 ca5e165befab0b2b52d99d3b70dfbbdf5c0d04e0 SHA1 e11b5e11f3bbd2be56f85e3cc1f214442137f99d SHA256 4436b13feb0ba7a5c4d010a2eacdce73d9950a36a7379d112930b818e7d75252
+MD5 46219d948bee7c15e69e74755ff6b952 ChangeLog 2103
+RMD160 ca5e165befab0b2b52d99d3b70dfbbdf5c0d04e0 ChangeLog 2103
+SHA256 4436b13feb0ba7a5c4d010a2eacdce73d9950a36a7379d112930b818e7d75252 ChangeLog 2103
 MISC metadata.xml 247 RMD160 9951b031c811a444e4ba88e687dcf13219c19c35 SHA1 9caed47052f4bf4073ad396315ca7959a3baa33b SHA256 9cf2f19dc4aa639bb7ba04a81e9e45f76e5d51723fa17bb94bd6cbc8c4d5af06
 MD5 5adfc3ab32f89cd4a0dd8d947094e194 metadata.xml 247
 RMD160 9951b031c811a444e4ba88e687dcf13219c19c35 metadata.xml 247
 SHA256 9cf2f19dc4aa639bb7ba04a81e9e45f76e5d51723fa17bb94bd6cbc8c4d5af06 metadata.xml 247
-MD5 c0c12f952a54eadc42e02d1a65435ed5 files/digest-gnomesword-2.1.1 69
-RMD160 3081dd5f03ea43c05d30dd91e384bfb17254a7e2 files/digest-gnomesword-2.1.1 69
-SHA256 c4dddbdde51c6cb0d2eccc686f33ed1a290fae2087c1ca500dbe0c00e3163132 files/digest-gnomesword-2.1.1 69
 MD5 042b409aaddc3bf735316784447ce5c9 files/digest-gnomesword-2.1.7 253
 RMD160 c0e7557e0722f113a3856aa7f9a6a1341b0467f1 files/digest-gnomesword-2.1.7 253
 SHA256 4874acf66aa853f37fc4371a28cfc21f74152686cde5a1ffa8aac5d75d395ea6 files/digest-gnomesword-2.1.7 253
diff --git a/app-text/gnomesword/files/digest-gnomesword-2.1.1 b/app-text/gnomesword/files/digest-gnomesword-2.1.1
deleted file mode 100644
index 045f2905355a..000000000000
--- a/app-text/gnomesword/files/digest-gnomesword-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46b0c941e4f5780aaf8a72da87d0d045 gnomesword-2.1.1.tar.gz 1758480
diff --git a/app-text/gnomesword/files/gnomesword-2.1.1-gcc-3.4.patch b/app-text/gnomesword/files/gnomesword-2.1.1-gcc-3.4.patch
deleted file mode 100644
index 4152dc22e8c0..000000000000
--- a/app-text/gnomesword/files/gnomesword-2.1.1-gcc-3.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/backend/sword_main.cc	2004-07-01 17:45:30.000000000 +0200
-+++ src/backend/sword_main.cc.new	2005-03-25 20:42:53.566287072 +0100
-@@ -190,8 +190,8 @@
- 	VerseKey key;
- 	GList *retlist = NULL;
- 	char *book = NULL;
--	unsigned int bytes_read;
--	unsigned int bytes_written;
-+	gsize bytes_read;
-+	gsize bytes_written;
- 	GError *error;
- 	int i = 0, j = 0, x = 2;
- 	
diff --git a/app-text/gnomesword/gnomesword-2.1.1.ebuild b/app-text/gnomesword/gnomesword-2.1.1.ebuild
deleted file mode 100644
index ac43755450da..000000000000
--- a/app-text/gnomesword/gnomesword-2.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.1.1.ebuild,v 1.11 2006/07/12 05:36:30 tsunam Exp $
-
-inherit libtool gnome2 eutils
-
-DESCRIPTION="Gnome Bible study software"
-HOMEPAGE="http://gnomesword.sf.net/"
-SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
-IUSE="spell"
-
-RDEPEND="=gnome-extra/gtkhtml-3.0*
-	>=app-text/sword-1.5.8_pre1
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnomeui-2
-	=gnome-extra/gal-1.99*
-	dev-libs/libxml2
-	virtual/libc
-	spell? ( app-text/gnome-spell
-	>=gnome-base/libbonoboui-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.14"
-
-G2CONF="${G2CONF} --enable-sword_cvs $(use_enable spell pspell)"
-DOCS="COPYING NEWS ChangeLog README TODO"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gnomesword-2.1.1-gcc-3.4.patch
-}