Add speech USE-flag, finally fixes bug #320119. Clean ebuild a bit

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

3 files changed, 25 insertions, 17 deletions

diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index 23e5a366c4de..50a6bcee8493 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-base/gnustep-gui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.92 2012/02/08 14:52:02 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.93 2012/02/22 15:59:29 voyageur Exp $
+
+  22 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  gnustep-gui-0.22.0.ebuild, metadata.xml:
+  Add speech USE-flag, finally fixes bug #320119. Clean ebuild a bit
 
 *gnustep-gui-0.22.0 (08 Feb 2012)
 
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild
index 19688eb6911e..1219af6d93ff 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild
@@ -1,35 +1,35 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild,v 1.1 2012/02/08 14:52:02 voyageur Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.22.0.ebuild,v 1.2 2012/02/22 15:59:29 voyageur Exp $
 
+EAPI=4
 inherit gnustep-base multilib
 
 DESCRIPTION="Library of GUI classes written in Obj-C"
 HOMEPAGE="http://www.gnustep.org/"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="0"
 LICENSE="LGPL-2.1"
-
-IUSE="jpeg gif png cups"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cups gif jpeg png speech"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
+	app-text/aspell
 	>=gnustep-base/gnustep-base-1.24.0
-	x11-libs/libXt
+	media-libs/audiofile
 	>=media-libs/tiff-3
-	jpeg? ( virtual/jpeg )
+	x11-libs/libXt
+	cups? ( >=net-print/cups-1.1 )
 	gif? ( >=media-libs/giflib-4.1 )
+	jpeg? ( virtual/jpeg )
 	png? ( >=media-libs/libpng-1.2 )
-	cups? ( >=net-print/cups-1.1 )
-	media-libs/audiofile
-	app-text/aspell"
+	speech? ( app-accessibility/flite )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	gnustep-base_src_prepare
+
 	# remove hardcoded -g -Werror, bug #378179
 	sed -i -e 's/-g -Werror//' \
 		Tools/say/GNUmakefile \
@@ -44,12 +44,13 @@ src_configure() {
 	use gif && myconf="--disable-ungif --enable-libgif"
 
 	econf \
-		--with-tiff-include="${EPREFIX}"/usr/include \
-		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable cups) \
 		$(use_enable jpeg) \
 		$(use_enable png) \
-		$(use_enable cups) \
-		${myconf} || die "configure failed"
+		$(use_enable speech) \
+		--with-tiff-include="${EPREFIX}"/usr/include \
+		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
+		${myconf}
 }
 
 pkg_postinst() {
diff --git a/gnustep-base/gnustep-gui/metadata.xml b/gnustep-base/gnustep-gui/metadata.xml
index 898bf9282f17..90eca9e75e77 100644
--- a/gnustep-base/gnustep-gui/metadata.xml
+++ b/gnustep-base/gnustep-gui/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnustep</herd>
+<use>
+	<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag>
+</use>
 <longdescription>
 It is a library of graphical user interface classes written completely
 in the Objective-C language; the classes are based upon the OpenStep