Version bump. Fix configure to not mess with CFLAGS, pin glib/gtk+ dependencies to slot 2.

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

2 files changed, 39 insertions, 11 deletions

diff --git a/app-accessibility/gnome-mag/ChangeLog b/app-accessibility/gnome-mag/ChangeLog
index 669510bc950b..e56d814048ab 100644
--- a/app-accessibility/gnome-mag/ChangeLog
+++ b/app-accessibility/gnome-mag/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/gnome-mag
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.177 2010/11/01 14:26:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.178 2010/11/01 15:48:15 eva Exp $
+
+*gnome-mag-0.16.3 (01 Nov 2010)
+
+  01 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-mag-0.15.9.ebuild, +gnome-mag-0.16.3.ebuild:
+  Version bump. Fix configure to not mess with CFLAGS, pin glib/gtk+
+  dependencies to slot 2.
 
   01 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   gnome-mag-0.16.1.ebuild:
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.15.9.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.16.3.ebuild
index 9baff1bc4c5d..e2ec2f2fa866 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.15.9.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.16.3.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.15.9.ebuild,v 1.8 2010/07/20 01:54:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.16.3.ebuild,v 1.1 2010/11/01 15:48:15 eva Exp $
 
-inherit gnome2 virtualx
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2 virtualx
 
 DESCRIPTION="Gnome magnification service definition"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.11.1
-	>=x11-libs/gtk+-2.6"
+RDEPEND=">=dev-libs/glib-2.11.1:2
+	>=x11-libs/gtk+-2.14:2"
 
 # FIXME: need libcolorblind (debian package)
 # python deps are for applets
@@ -31,6 +34,8 @@ RDEPEND="${RDEPEND}
 	>=gnome-extra/at-spi-1.5.2
 	>=gnome-base/orbit-2.3.100
 
+	dev-libs/dbus-glib
+
 	x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/libXdamage
@@ -45,13 +50,29 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
 
-DOCS="AUTHORS ChangeLog NEWS README"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF} --disable-colorblind-applet"
+}
+
+src_prepare() {
+	gnome2_src_prepare
 
-#pkg_setup() {
-#	G2CONF="${G2CONF} $(use_enable applet colorblind-applet)"
-#}
+	# Workaround intltool tests failure
+	echo "colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in
+colorblind/data/Colorblind_Applet.xml
+colorblind/data/colorblind-applet.schemas.in
+colorblind/data/colorblind-prefs.ui
+colorblind/ui/About.py
+colorblind/ui/ColorblindPreferencesUI.py
+colorblind/ui/WindowUI.py" >> "${S}"/po/POTFILES.skip
+
+	# Do not mess with CFLAGS
+	sed -e 's/CFLAGS="$CFLAGS -Werror"//' \
+		-e '/_DISABLE_DEPRECATED/d' \
+		-i configure.in configure || die "sed failed"
+}
 
 src_test() {
 	Xemake check || die "emake check failed"
-
 }