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

Package-Manager: portage-2.2.0_alpha88/cvs/Linux x86_64

4 files changed, 31 insertions, 23 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/Manifest b/gnustep-base/gnustep-gui/Manifest
index 5bd79d43c0be..430f183a2ade 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -7,13 +7,13 @@ DIST gnustep-gui-0.20.0.tar.gz 2648224 RMD160 3a5ef7fa61d0a192e036866a19749b7a6d
 DIST gnustep-gui-0.22.0.tar.gz 2734733 RMD160 20153480d712a148e9e504f09273f70e1ba2f6d2 SHA1 dc9654ea3437810a9b4bfd3d2193a25628a88b41 SHA256 201a02da45a3ad2285fee6a6fcc7c8a463632e27d3175d7293e2290e573fca5d
 EBUILD gnustep-gui-0.18.0.ebuild 1495 RMD160 ccf66cd2735d87f2fd0db94dc8a9cf1239f32773 SHA1 87765d8769a09c26f19d09d143b083274cce7e4d SHA256 5ec9a28b2c3de969cd7e9a0418a46466121b33bd18693130052e06adc2fc4c5f
 EBUILD gnustep-gui-0.20.0.ebuild 1587 RMD160 3fc4716d24e233ee58c4e6d0253551b399cdb135 SHA1 d6dab3e3e6f122d10a60bc6b21cef56e49299281 SHA256 7e6a6dfadc205e7eca8f2ddf5970a02590334ed150a002961092ab91f27aea69
-EBUILD gnustep-gui-0.22.0.ebuild 1588 RMD160 c86ac7d21c9f96f01d0781644fc274e57e88ed77 SHA1 cf1aeefbf774f7a34bccf6e6d06b1463d4a64e59 SHA256 bfbc89981958a5ce3990906f4cb430cf94dbb65c7829f09cb5c6dc2a49d92b88
-MISC ChangeLog 16835 RMD160 59197df9d88331c35b29f23d907a3e190cb8e089 SHA1 78fa99fd3c19e37210ea30305cca13f76c3c6c94 SHA256 ec9b6e040253444427f72beb97852557ed7c647134772dfc0c5c30910dd08ab2
-MISC metadata.xml 1355 RMD160 827c24953436fc2f6f00e6ed106dce431340ec35 SHA1 68cacccc861155f0ae65177787811fd66eb61579 SHA256 25cc768361f0311d0356e24a68dda7f1cee30c717644cb37884440e6ad0b976b
+EBUILD gnustep-gui-0.22.0.ebuild 1628 RMD160 23debf5c076f9fe33f56b99dee6490c7f8230c88 SHA1 ccde797e0d82a6f84278d778f6d0f1631e5f2b64 SHA256 6b1c85c9b9a10767432041309fcc44d8cc4b3c93aff763df6fff8de1161a3e39
+MISC ChangeLog 17003 RMD160 1900baa3c00ec036785dda0fcdf5f66a68fe8ab7 SHA1 15c3058d21a670767ad375654207bf53436b88d0 SHA256 5d4a239d55ab3d3f350b432f37ddc205f62606620703bf4ad5cea8a3554ccab6
+MISC metadata.xml 1451 RMD160 4f4ff532af733831a6896c6062da9ab58f07c9c0 SHA1 0b9fcf751ad8fcb3357dec0634e788d161babf14 SHA256 19af87d928529fb5ef4cb595d950bd0881d5e11d202afdbc3238e1468407f09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8yjCUACgkQFYEBGcdFJfI5IQD/WFd6/wCO7IyKOzFdoFrIgNF1
-jnlSDub+f6SVkGafVjgA/2jLclqJWooT9lDKD/Y7eQkw/UjGv2urHkSNvMW04mYw
-=rQwz
+iF4EAREIAAYFAk9FEO8ACgkQFYEBGcdFJfJvuAD/XWWPTMKYwJ2ahOz0aKFU5AbR
+VOsSrj/AHyj/CnV/QfIA/1U21BjPwmSYh1v5bjcbBhA6Uoljio/YBpHGGrXi4qKr
+=odF6
 -----END PGP SIGNATURE-----
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