Remove invalid USE debug inherited with gnome2.eclass. Disable mozilla plug-in because it needs =xulrunner-1.8* wrt #280049. Fix building with GLIBC 2.10+ wrt #276298. Port from built_with_use to EAPI=2 USE deps. Fix missing deps intltool and rarian.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

3 files changed, 70 insertions, 30 deletions

diff --git a/sci-chemistry/gchemutils/ChangeLog b/sci-chemistry/gchemutils/ChangeLog
index cd9976619ce6..9afcf8fcdfcd 100644
--- a/sci-chemistry/gchemutils/ChangeLog
+++ b/sci-chemistry/gchemutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/gchemutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/ChangeLog,v 1.8 2009/02/28 00:40:51 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/ChangeLog,v 1.9 2009/08/08 08:44:25 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  gchemutils-0.10.3.ebuild, +files/gchemutils-0.10.3-glibc-2.10.patch:
+  Remove invalid USE debug inherited with gnome2.eclass. Disable mozilla
+  plug-in because it needs =xulrunner-1.8* wrt #280049. Fix building with
+  GLIBC 2.10+ wrt #276298. Port from built_with_use to EAPI=2 USE deps. Fix
+  missing deps intltool and rarian.
 
   28 Feb 2009; Jeff Gardner <je_fro@gentoo.org> gchemutils-0.10.3.ebuild:
   Fix SRC_URI
diff --git a/sci-chemistry/gchemutils/files/gchemutils-0.10.3-glibc-2.10.patch b/sci-chemistry/gchemutils/files/gchemutils-0.10.3-glibc-2.10.patch
new file mode 100644
index 000000000000..45cf973810cd
--- /dev/null
+++ b/sci-chemistry/gchemutils/files/gchemutils-0.10.3-glibc-2.10.patch
@@ -0,0 +1,37 @@
+diff -ur gnome-chemistry-utils-0.10.3.orig/libs/gcu/element.cc gnome-chemistry-utils-0.10.3/libs/gcu/element.cc
+--- gnome-chemistry-utils-0.10.3.orig/libs/gcu/element.cc	2009-01-05 21:09:59.000000000 +0200
++++ gnome-chemistry-utils-0.10.3/libs/gcu/element.cc	2009-08-08 11:30:16.000000000 +0300
+@@ -44,8 +44,8 @@
+ 
+ static void ReadValue (char const *source, GcuValue &value)
+ {
+-	char *buf, *dot;
+-	value.value = strtod (source, &buf);
++	const char *buf, *dot;
++	value.value = strtod (source, const_cast <char**> (&buf));
+ 	dot = strchr (source, '.');
+ 	value.prec = (dot)? buf - dot - 1: 0;
+ 	value.delta = (*buf == '(')? strtol (buf + 1, NULL, 10): 0;
+@@ -53,8 +53,8 @@
+ 
+ static void ReadDimensionalValue (char const *source, GcuDimensionalValue &value)
+ {
+-	char *buf, *dot;
+-	value.value = strtod (source, &buf);
++	const char *buf, *dot;
++	value.value = strtod (source, const_cast <char**> (&buf));
+ 	dot = strchr (source, '.');
+ 	value.prec = (dot)? buf - dot - 1: 0;
+ 	value.delta = (*buf == '(')? strtol (buf + 1, NULL, 10): 0;
+diff -ur gnome-chemistry-utils-0.10.3.orig/libs/gcu/spectrumdoc.cc gnome-chemistry-utils-0.10.3/libs/gcu/spectrumdoc.cc
+--- gnome-chemistry-utils-0.10.3.orig/libs/gcu/spectrumdoc.cc	2009-01-05 21:09:59.000000000 +0200
++++ gnome-chemistry-utils-0.10.3/libs/gcu/spectrumdoc.cc	2009-08-08 11:29:46.000000000 +0300
+@@ -1411,7 +1411,7 @@
+ 	char buf[32], c = data[0];
+ 	double val = 0., newval = 0.;
+ 	bool pos, diff = false;
+-	char *eq = strstr (data, "$$");
++	char *eq = strstr (const_cast <char *> (data), "$$");
+ 	if (eq)
+ 		*eq = 0;
+ 	pos = true;
diff --git a/sci-chemistry/gchemutils/gchemutils-0.10.3.ebuild b/sci-chemistry/gchemutils/gchemutils-0.10.3.ebuild
index 3d3ad61d83b9..cee360884702 100644
--- a/sci-chemistry/gchemutils/gchemutils-0.10.3.ebuild
+++ b/sci-chemistry/gchemutils/gchemutils-0.10.3.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.10.3.ebuild,v 1.2 2009/02/28 00:40:51 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.10.3.ebuild,v 1.3 2009/08/08 08:44:25 ssuominen Exp $
 
-inherit gnome2 autotools
+EAPI=2
+GCONF_DEBUG=no
+MY_P=gnome-chemistry-utils-${PV}
+
+inherit autotools eutils gnome2
 
-MY_P="gnome-chemistry-utils-${PV}"
 DESCRIPTION="C++ classes and Gtk+-2 widgets related to chemistry"
 HOMEPAGE="http://www.nongnu.org/gchemutils/"
 SRC_URI="http://savannah.nongnu.org/download/gchemutils/0.10/${MY_P}.tar.bz2"
@@ -14,41 +17,34 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="=gnome-base/libglade-2*
-		>=gnome-base/libgnomeprintui-2.4.0
-		>=x11-libs/goffice-0.6.5
-		x11-libs/gtkglext
-		app-text/gnome-doc-utils
-		>=sci-chemistry/openbabel-2.1.1
-		sci-chemistry/bodr
-		sci-chemistry/chemical-mime-data"
-
+RDEPEND="gnome-base/libglade:2.0
+	>=gnome-base/libgnomeprintui-2.4
+	>=gnome-extra/libgsf-1.14[gnome]
+	>=x11-libs/goffice-0.6.5:0.6[gnome]
+	x11-libs/gtkglext
+	app-text/gnome-doc-utils
+	>=sci-chemistry/openbabel-2.1.1
+	sci-chemistry/bodr
+	sci-chemistry/chemical-mime-data"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	app-text/rarian
+	dev-util/intltool
 	!sci-chemistry/gchempaint"
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	if ! built_with_use x11-libs/goffice:0.6 gnome ; then
-		eerror "Please rebuild >=x11-libs/goffice-0.6.5 with gnome support enabled."
-		eerror "This needs gnome-extra/libgsf to be built with gnome support."
-		eerror "echo \"x11-libs/goffice gnome\" >> /etc/portage/package.use"
-		eerror "and"
-		eerror "echo \"gnome-extra/libgsf gnome\" >> /etc/portage/package.use"
-		eerror "or add  \"gnome\" to your USE string in /etc/make.conf"
-		die "No Gnome support found in goffice."
-
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 	eautoreconf
 }
 
-src_compile() {
-	gnome2_src_compile --disable-update-databases --docdir=/usr/share/doc/${PN}/html
+src_configure() {
+	gnome2_src_configure \
+		--docdir=/usr/share/doc/${PN}/html \
+		--disable-update-databases \
+		--disable-mozilla-plugin
 }
 
 pkg_postinst() {