Version bump. Add dbus interface.

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

4 files changed, 31 insertions, 105 deletions

diff --git a/app-accessibility/gnome-mag/ChangeLog b/app-accessibility/gnome-mag/ChangeLog
index 91bfe2e4fee8..7c9b7858ce99 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.168 2010/01/17 23:23:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.169 2010/02/14 22:56:36 eva Exp $
+
+*gnome-mag-0.16.0 (14 Feb 2010)
+
+  14 Feb 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-mag-0.15.6.ebuild, -gnome-mag-0.15.7.ebuild,
+  -gnome-mag-0.15.8.ebuild, +gnome-mag-0.16.0.ebuild:
+  Version bump. Add dbus interface.
 
   17 Jan 2010; Jeroen Roovers <jer@gentoo.org> gnome-mag-0.15.9.ebuild:
   Stable for HPPA (bug #281427).
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.15.6.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.15.6.ebuild
deleted file mode 100644
index a5d3f291e578..000000000000
--- a/app-accessibility/gnome-mag/gnome-mag-0.15.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 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.6.ebuild,v 1.9 2009/06/08 03:02:05 jer Exp $
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Gnome magnification service definition"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.11.1
-	>=x11-libs/gtk+-2.6"
-
-# python deps are for applets
-RDEPEND="${RDEPEND}
-	>=dev-python/pygtk-2.6
-	dev-python/pygobject
-
-	>=dev-python/gconf-python-2.10
-	>=dev-python/libgnome-python-2.10
-	>=dev-python/gnome-applets-python-2.10
-
-	>=gnome-base/libbonobo-1.107
-	>=gnome-extra/at-spi-1.5.2
-	>=gnome-base/orbit-2.3.100
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXcomposite"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_test() {
-	Xemake check || die "emake check failed"
-
-}
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.15.7.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.15.7.ebuild
deleted file mode 100644
index 1b2abc34933a..000000000000
--- a/app-accessibility/gnome-mag/gnome-mag-0.15.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 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.7.ebuild,v 1.1 2009/07/09 22:33:21 eva Exp $
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Gnome magnification service definition"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.11.1
-	>=x11-libs/gtk+-2.6"
-
-# python deps are for applets
-RDEPEND="${RDEPEND}
-	>=dev-python/pygtk-2.6
-	dev-python/pygobject
-
-	>=dev-python/gconf-python-2.10
-	>=dev-python/libgnome-python-2.10
-	>=dev-python/gnome-applets-python-2.10
-
-	>=gnome-base/libbonobo-1.107
-	>=gnome-extra/at-spi-1.5.2
-	>=gnome-base/orbit-2.3.100
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXcomposite"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_test() {
-	Xemake check || die "emake check failed"
-
-}
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.15.8.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.16.0.ebuild
index b8a5989c34b8..e280ec509f17 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.15.8.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.16.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.8.ebuild,v 1.2 2009/08/03 16:42:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.16.0.ebuild,v 1.1 2010/02/14 22:56:36 eva Exp $
 
-inherit gnome2 virtualx
+EAPI="2"
+
+inherit eutils gnome2 virtualx
 
 DESCRIPTION="Gnome magnification service definition"
 HOMEPAGE="http://www.gnome.org/"
@@ -31,6 +33,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
@@ -51,7 +55,22 @@ DOCS="AUTHORS ChangeLog NEWS README"
 #	G2CONF="${G2CONF} $(use_enable applet colorblind-applet)"
 #}
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix some ugly warnings, originally per upstream bug #578798
+	epatch "${FILESDIR}/${PN}-0.15.9-magnifier-fix-warnings.patch"
+
+	# 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
+}
+
 src_test() {
 	Xemake check || die "emake check failed"
-
 }