Drop java support as configure is completly broken and makes that support automagic (bug #188136), also, looks like nothing in the tree needs that support and other distributions are already suppling this without java support for a long time.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 102 insertions, 3 deletions

diff --git a/app-accessibility/gnome-speech/ChangeLog b/app-accessibility/gnome-speech/ChangeLog
index 49e1cd30316e..5ea30308eb8d 100644
--- a/app-accessibility/gnome-speech/ChangeLog
+++ b/app-accessibility/gnome-speech/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/gnome-speech
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.144 2010/07/20 14:56:53 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.145 2011/06/05 17:32:15 pacho Exp $
+
+*gnome-speech-0.4.25-r1 (05 Jun 2011)
+
+  05 Jun 2011; Pacho Ramos <pacho@gentoo.org> +gnome-speech-0.4.25-r1.ebuild,
+  +files/gnome-speech-0.4.25-disable-java.patch:
+  Drop java support as configure is completly broken and makes that support
+  automagic (bug #188136), also, looks like nothing in the tree needs that
+  support and other distributions are already suppling this without java
+  support for a long time.
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> gnome-speech-0.4.25.ebuild:
   Drop HPPA keywording (bug #324511).
diff --git a/app-accessibility/gnome-speech/Manifest b/app-accessibility/gnome-speech/Manifest
index 11edf965dd52..f6e5a1e9c643 100644
--- a/app-accessibility/gnome-speech/Manifest
+++ b/app-accessibility/gnome-speech/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnome-speech-0.4.25-disable-java.patch 704 RMD160 f695949a46a9895a28ce1d7b5e4c6e4eb5730c74 SHA1 a0936117f2b20a3534f7b72162b28a8b0fa097ab SHA256 99b56d68c907c5e2fb8d8b49584ad247d15efa9ba0a4a39913310cfffee64669
 DIST gnome-speech-0.4.25.tar.bz2 336706 RMD160 305f0e820ce77039776a1c3d3fa259d4f628b88e SHA1 c229af1583c522212e067990eafaf6a58df42966 SHA256 1c0a38b30f58a7cb392ed2c46790045d1e2a7426fd9daed8bb1918cbdb95fad2
+EBUILD gnome-speech-0.4.25-r1.ebuild 1310 RMD160 3edc9e13420256bc3eda58c329f428cc741842d5 SHA1 be23c9ac6b2a41273c9c6a5975121228cd5d4d9c SHA256 bb25e3d3648711d5c64d59ded65ddd3ab2a5b551d31780fca1639bb4421f470b
 EBUILD gnome-speech-0.4.25.ebuild 2127 RMD160 a71cb36c3d361df4d696bc7049ecb30a84f7d579 SHA1 9fa689d40c3240ece9983cf4bc8b8dcfd7bd4318 SHA256 fd550d45cb45cdadb968e75f7b3ac0d2da641ca11a27041d5b7be83e9db6c87a
-MISC ChangeLog 20941 RMD160 1244fad62476adc73f0db55e4c41ed2d87bc5646 SHA1 963d438bb49df04a6cbc0e4c105d4456911ad5c0 SHA256 61cd2973c7ee30a725e948b01cef32e479bc39287de3b27dc6ab72436b887962
+MISC ChangeLog 21361 RMD160 0f1d220e992205a4c6be762a6b5a2a8ba6ef7d3c SHA1 9d80c58e08edb9efb9a896fbd921b5130c563352 SHA256 9fb541f6d4bb3c93b2d0270c723e3f127a7b1b16ba828864771fd43bcd50bb2b
 MISC metadata.xml 436 RMD160 c34b9639afc771b6996afcc45e5cd84cb05ce6a4 SHA1 d4f19b6deaa873b709f853b1b2784488bcc43703 SHA256 21ab4cf12e9c0716576f8b2291497df573100c6734dd342598e872e408f4db42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3rvaUACgkQCaWpQKGI+9S+rQCghS/FsaVWsQChQxjHufjOjWOl
+itEAnRDQ2SAWr+e5ZjP0XdYi/ug1viwp
+=V+pf
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/gnome-speech/files/gnome-speech-0.4.25-disable-java.patch b/app-accessibility/gnome-speech/files/gnome-speech-0.4.25-disable-java.patch
new file mode 100644
index 000000000000..9fa3708bbc9f
--- /dev/null
+++ b/app-accessibility/gnome-speech/files/gnome-speech-0.4.25-disable-java.patch
@@ -0,0 +1,29 @@
+$OpenBSD: patch-configure,v 1.5 2009/02/16 00:42:53 ajacoutot Exp $
+
+Force disable Java support. Configure script is broken and doesn't
+correctly disable it.
+
+--- configure.orig	Sun Feb 15 18:43:46 2009
++++ configure	Mon Feb 16 01:38:37 2009
+@@ -21256,7 +21256,7 @@ fi
+ 
+ # Java support
+ 
+-
++if false; then # skip Java configure part, it's broken.
+ # Check whether --with-java_home was given.
+ if test "${with_java_home+set}" = set; then
+   withval=$with_java_home; if test "$withval" = "no" ; then
+@@ -21729,8 +21729,11 @@ else
+   BUILD_JAVA_PACKAGE_FALSE=
+ fi
+ 
++fi # skip java
+ 
+-
++JAVA_SUPPORT="false"
++BUILD_JAVA_PACKAGE_TRUE='#'
++BUILD_JAVA_PACKAGE_FALSE=
+ 
+ # GNOME Speech Java Package location
+ 
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild
new file mode 100644
index 000000000000..9806160b9ee9
--- /dev/null
+++ b/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild,v 1.1 2011/06/05 17:32:15 pacho Exp $
+
+EAPI="4"
+
+inherit gnome2 eutils
+
+DESCRIPTION="Simple general API for producing text-to-speech output"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+espeak festival"
+
+COMMON_DEPEND=">=gnome-base/orbit-2.3.94
+	>=gnome-base/libbonobo-1.97
+	>=dev-libs/glib-2:2
+	espeak? ( app-accessibility/espeak )"
+
+RDEPEND="$COMMON_DEPEND
+	festival? ( app-accessibility/festival )"
+
+DEPEND="$COMMON_DEPEND
+	>=dev-util/pkgconfig-0.9"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF} $(use_with festival) --with-speech-dispatcher"
+
+	if ! use espeak; then
+		 G2CONF="${G2CONF} --without-espeak-dir"
+	fi
+
+	# We don't want java support at all as configure is broken and nothing needs it
+	export JAVAC=no
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	epatch "${FILESDIR}/${P}-disable-java.patch"
+
+	sed -i \
+		-e 's:\(GNOME_SPEECH_JAR_DIR=\).*:\1"/usr/share/java-access-bridge/lib/":' \
+		-e 's:\(FREETTS_DRIVER_JAR_DIR=\).*:\1"/usr/share/java-access-bridge/lib/":' \
+		"${S}"/configure
+}