prune old releases and fix dependencies wrt to bug #193497

(Portage version: 2.1.4_rc9)

7 files changed, 16 insertions, 97 deletions

diff --git a/app-text/gnomesword/ChangeLog b/app-text/gnomesword/ChangeLog
index ac5c365b4acd..82916fb4e71c 100644
--- a/app-text/gnomesword/ChangeLog
+++ b/app-text/gnomesword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/gnomesword
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.21 2007/07/13 01:48:41 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.22 2007/12/13 22:35:30 eva Exp $
+
+  13 Dec 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  gnomesword-2.1.7.ebuild, -gnomesword-2.2.1.ebuild,
+  -gnomesword-2.2.2.1.ebuild, gnomesword-2.2.3.ebuild:
+  prune old releases and fix dependencies wrt to bug #193497
 
 *gnomesword-2.2.3 (13 Jul 2007)
 
diff --git a/app-text/gnomesword/files/digest-gnomesword-2.2.1 b/app-text/gnomesword/files/digest-gnomesword-2.2.1
deleted file mode 100644
index 5a553b650d46..000000000000
--- a/app-text/gnomesword/files/digest-gnomesword-2.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39699ce93c105456960fca4b57b6dc7e gnomesword-2.2.1.tar.gz 3255190
-RMD160 383e87ba5e42fee909334fb0e3b8d2b647064dd1 gnomesword-2.2.1.tar.gz 3255190
-SHA256 0ecb5c9c0b70caea617539ebf1f3e6bf30145b9c885cd90c4f4ba084dcfe58b0 gnomesword-2.2.1.tar.gz 3255190
diff --git a/app-text/gnomesword/files/digest-gnomesword-2.2.2.1 b/app-text/gnomesword/files/digest-gnomesword-2.2.2.1
deleted file mode 100644
index fea91d1c4b22..000000000000
--- a/app-text/gnomesword/files/digest-gnomesword-2.2.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d06a815ca81621add7f01365cca625e5 gnomesword-2.2.2.1.tar.gz 3337627
-RMD160 8f71067cce5238f60e43f6bed90d7740e4ec26f4 gnomesword-2.2.2.1.tar.gz 3337627
-SHA256 815f5451ad5549649de98ae39525e818928a074126614442231ff5243073827d gnomesword-2.2.2.1.tar.gz 3337627
diff --git a/app-text/gnomesword/gnomesword-2.1.7.ebuild b/app-text/gnomesword/gnomesword-2.1.7.ebuild
index a5fb91245025..3a6127095004 100644
--- a/app-text/gnomesword/gnomesword-2.1.7.ebuild
+++ b/app-text/gnomesword/gnomesword-2.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.1.7.ebuild,v 1.7 2007/01/28 05:47:45 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.1.7.ebuild,v 1.8 2007/12/13 22:35:30 eva Exp $
 
 inherit libtool gnome2 eutils
 
@@ -17,7 +17,6 @@ RDEPEND="=gnome-extra/gtkhtml-3*
 	=app-text/sword-1.5.8*
 	>=x11-libs/gtk+-2
 	>=gnome-base/libgnomeui-2
-	>=gnome-extra/gal-0.22
 	dev-libs/libxml2
 	virtual/libc
 	spell? ( app-text/gnome-spell
@@ -33,8 +32,8 @@ DOCS="NEWS ChangeLog README TODO"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-commentary_dialog.c.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-commentary_dialog.c.patch"
 }
 
 pkg_postinst() {
diff --git a/app-text/gnomesword/gnomesword-2.2.1.ebuild b/app-text/gnomesword/gnomesword-2.2.1.ebuild
deleted file mode 100644
index 92faefe7d0e3..000000000000
--- a/app-text/gnomesword/gnomesword-2.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.2.1.ebuild,v 1.1 2007/02/04 00:59:20 mjolnir Exp $
-
-inherit libtool gnome2 eutils
-
-DESCRIPTION="Gnome Bible study software"
-HOMEPAGE="http://gnomesword.sf.net/"
-SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="spell"
-
-RDEPEND="=gnome-extra/gtkhtml-3*
-	=app-text/sword-1.5.9*
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-extra/gal-0.22
-	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} $(use_enable spell pspell)"
-DOCS="NEWS ChangeLog README TODO"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	einfo "Gnomesword requires modules to be of any use. You may install the"
-	einfo "sword-modules package, or download modules individually from the"
-	einfo "sword website: http://crosswire.org/sword/"
-}
diff --git a/app-text/gnomesword/gnomesword-2.2.2.1.ebuild b/app-text/gnomesword/gnomesword-2.2.2.1.ebuild
deleted file mode 100644
index 248fbe9b8425..000000000000
--- a/app-text/gnomesword/gnomesword-2.2.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.2.2.1.ebuild,v 1.2 2007/03/10 21:20:34 uberlord Exp $
-
-inherit libtool gnome2 eutils
-
-DESCRIPTION="Gnome Bible study software"
-HOMEPAGE="http://gnomesword.sf.net/"
-SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="spell"
-RDEPEND="=gnome-extra/gtkhtml-3*
-	=app-text/sword-1.5.9*
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-extra/gal-0.22
-	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} $(use_enable spell pspell)"
-DOCS="NEWS ChangeLog README TODO"
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	einfo "Gnomesword requires modules to be of any use. You may install the"
-	einfo "sword-modules package, or download modules individually from the"
-	einfo "sword website: http://crosswire.org/sword/"
-}
diff --git a/app-text/gnomesword/gnomesword-2.2.3.ebuild b/app-text/gnomesword/gnomesword-2.2.3.ebuild
index 82a45df3e778..eb3c2dadc6bf 100644
--- a/app-text/gnomesword/gnomesword-2.2.3.ebuild
+++ b/app-text/gnomesword/gnomesword-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.2.3.ebuild,v 1.1 2007/07/13 01:48:41 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.2.3.ebuild,v 1.2 2007/12/13 22:35:30 eva Exp $
 
 inherit libtool gnome2 eutils
 
@@ -11,15 +11,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="spell"
-RDEPEND="=gnome-extra/gtkhtml-3*
+RDEPEND=">=gnome-extra/gtkhtml-3.14
 	=app-text/sword-1.5.9*
 	>=x11-libs/gtk+-2
 	>=gnome-base/libgnomeui-2
-	>=gnome-extra/gal-0.22
+	>=gnome-base/libgnomeprintui-2.2
+	>=gnome-base/libglade-2
 	dev-libs/libxml2
 	virtual/libc
-	spell? ( app-text/gnome-spell
-	>=gnome-base/libbonoboui-2 )"
+	spell? (
+		app-text/gnome-spell
+		>=gnome-base/libbonoboui-2 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12
 	>=dev-util/intltool-0.29