Remove hpell depend thanks to alonbl in bug 177546

(Portage version: 2.1.2.7)

4 files changed, 18 insertions, 30 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 8a34f26dd59d..045cc84f59dd 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.456 2007/05/05 13:56:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.457 2007/05/07 21:09:44 genstef Exp $
+
+  07 May 2007; Stefan Schweizer <genstef@gentoo.org>
+  kdelibs-3.5.5-r10.ebuild, kdelibs-3.5.6-r7.ebuild,
+  kdelibs-3.5.6-r8.ebuild:
+  Remove hpell depend thanks to alonbl in bug 177546
 
   05 May 2007; Carsten Lohrke <carlo@gentoo.org> ChangeLog:
   Restore ChangeLog.
diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild
index bb8ad2e3cac6..989aca46b659 100644
--- a/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.5-r10.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/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild,v 1.9 2007/04/09 19:35:43 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild,v 1.10 2007/05/07 21:09:44 genstef Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -15,7 +15,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
-zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
+zeroconf avahi kernel_linux fam lua kdehiddenvisibility"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
@@ -45,8 +45,7 @@ RDEPEND="$(qt_min_version 3.3.3)
 	utempter? ( sys-libs/libutempter )
 	!kde-base/kde-env
 	lua? ( dev-lang/lua )
-	spell? ( app-text/aspell app-dicts/aspell-en
-		linguas_he? ( >=app-text/hspell-1.0 ) )"
+	spell? ( app-text/aspell app-dicts/aspell-en )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -139,11 +138,7 @@ src_compile() {
 		myconf="${myconf} --disable-dnssd"
 	fi
 
-	if use spell; then
-		myconf="${myconf} $(use_with linguas_he hspell)"
-	else
-		myconf="${myconf} --without-hspell"
-	fi
+	myconf="${myconf} --without-hspell"
 
 	if has_version x11-apps/rgb; then
 		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild
index ebc7f09539a4..265c307cacb3 100644
--- a/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.6-r7.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/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild,v 1.2 2007/04/29 17:23:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild,v 1.3 2007/05/07 21:09:44 genstef Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -15,7 +15,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
+avahi kernel_linux fam lua kdehiddenvisibility"
 
 # Added aspell-en as dependency to work around bug 131512.
 # Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
@@ -43,8 +43,7 @@ RDEPEND="$(qt_min_version 3.3.3)
 	utempter? ( sys-libs/libutempter )
 	!kde-base/kde-env
 	lua? ( dev-lang/lua )
-	spell? ( app-text/aspell app-dicts/aspell-en
-	linguas_he? ( >=app-text/hspell-1.0 ) )"
+	spell? ( app-text/aspell app-dicts/aspell-en )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -114,6 +113,7 @@ src_compile() {
 
 	myconf="--with-distribution=Gentoo --disable-fast-malloc
 			--with-libart --with-libidn --with-ssl
+			--without-hspell
 			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
 			$(use_with acl) $(use_with alsa)
 			$(use_with arts) $(use_enable cups)
@@ -129,12 +129,6 @@ src_compile() {
 		myconf="${myconf} --disable-dnssd"
 	fi
 
-	if use spell; then
-		myconf="${myconf} $(use_with linguas_he hspell)"
-	else
-		myconf="${myconf} --without-hspell"
-	fi
-
 	if has_version x11-apps/rgb; then
 		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
 	fi
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild
index e55c67af9a8b..9f5c8fa58d58 100644
--- a/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.6-r8.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/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild,v 1.1 2007/05/05 12:30:32 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild,v 1.2 2007/05/07 21:09:44 genstef Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -15,7 +15,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
+avahi kernel_linux fam lua kdehiddenvisibility"
 
 # Added aspell-en as dependency to work around bug 131512.
 # Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
@@ -43,8 +43,7 @@ RDEPEND="$(qt_min_version 3.3.3)
 	utempter? ( sys-libs/libutempter )
 	!kde-base/kde-env
 	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0
-	linguas_he? ( >=app-text/hspell-1.0 ) )
+	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
 	>=sys-apps/portage-2.1.2.6"
 
 DEPEND="${RDEPEND}
@@ -115,6 +114,7 @@ src_compile() {
 
 	myconf="--with-distribution=Gentoo --disable-fast-malloc
 			--with-libart --with-libidn --with-ssl
+			--without-hspell
 			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
 			$(use_with acl) $(use_with alsa)
 			$(use_with arts) $(use_enable cups)
@@ -130,12 +130,6 @@ src_compile() {
 		myconf="${myconf} --disable-dnssd"
 	fi
 
-	if use spell; then
-		myconf="${myconf} $(use_with linguas_he hspell)"
-	else
-		myconf="${myconf} --without-hspell"
-	fi
-
 	if has_version x11-apps/rgb; then
 		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
 	fi