Version bump. Add dbus interface.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 44 insertions, 112 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/Manifest b/app-accessibility/gnome-mag/Manifest
index c3eaeb9098cb..3b88b48673b4 100644
--- a/app-accessibility/gnome-mag/Manifest
+++ b/app-accessibility/gnome-mag/Manifest
@@ -1,12 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-mag-0.15.9-magnifier-fix-warnings.patch 2464 RMD160 236670336325d6318595e1999521644da84d251d SHA1 41f9e3097457b08a93b55365d5f9feab19085e8f SHA256 ef62077efcef36a8960d5e9b369fe042fec9459317ac25c6b837db9e922f1859
-DIST gnome-mag-0.15.6.tar.bz2 555225 RMD160 9618250c424b09657e0c524b042e8901ad7dfbb2 SHA1 6d7da351164a690eca4906d52e67db1e4521c153 SHA256 ce747a1065c7d8f71271810eb949f06f8292a48b04e629e6b9d9028137ae3e01
-DIST gnome-mag-0.15.7.tar.bz2 517791 RMD160 0b238052324513a38884b418d41b0ca32b77b1c8 SHA1 8255a34422df3ca372fc54c23170ebd272d6c1af SHA256 393fc0d33db93a0efb01f6d4a45d8d8a283e39f34bc00d873ec38a41b1740464
-DIST gnome-mag-0.15.8.tar.bz2 504849 RMD160 a2771008eec11455b9cbcaa89157fc89a976a3d9 SHA1 8aa5b1b1028cd94cdc3f9ac7f290b9e510beac56 SHA256 c9ed20c85f9be37e5b90eb326e7093e46e34962ec67528f93dbd22033bd0dee2
 DIST gnome-mag-0.15.9.tar.bz2 532685 RMD160 b246e5d3eb8d2817287f7a54d10d3e17f7e24550 SHA1 b04c6728f8998d476ce1cb39734e72ca02d68bf5 SHA256 6f921419143088587dce201afd972a60317ade269e47b0d67a38872a7615a025
-EBUILD gnome-mag-0.15.6.ebuild 1120 RMD160 cfa83b7217cda779a651f183df83af3257ed05b9 SHA1 9468c5719472dda0142eddd88d9e7b52d874fdcc SHA256 cac7393af588b14eb1f0f3c42de3df2d3d40b2c046c45fc49bdf59751631e886
-EBUILD gnome-mag-0.15.7.ebuild 1128 RMD160 cdcf6f0a4162c722b9365f4d8c24ca6d0c71697a SHA1 ac4b09f19d3e7be2b141c699dda16e7de295db92 SHA256 45acf525b2a45dc529fdf738dc3334227fafced9f054cd758af122ae52f90da5
-EBUILD gnome-mag-0.15.8.ebuild 1321 RMD160 13c4761dd4b421de4dd2e36eca23cad1626024d5 SHA1 2212d390a81bae7adb73789f0729bf5fa58f4986 SHA256 3f98eb469b45f22d50eb2dbf72178e386fe7b4fbddd590e62403dfaaac709c51
+DIST gnome-mag-0.16.0.tar.bz2 551669 RMD160 4c4b501d22f4d6bf815d058dbb7ae70d67a731e3 SHA1 dc8c2e63278c3e8ba7a3657dac6348f85b1e5b97 SHA256 15fb6a7198a707aea31d73aa95e697f857ca7435b65a8cc4bc25aa1484152c75
 EBUILD gnome-mag-0.15.9-r1.ebuild 1486 RMD160 7e87263a28a740f52895d2259746aa1979396de2 SHA1 f7c113d1c602fc59ac1f2bf85c6ba09cb6ec6dcc SHA256 6d7209b345a7b7b1a3db5b094fdddf44b1911b7e823d63c6b326b54ac5d28ff8
 EBUILD gnome-mag-0.15.9.ebuild 1307 RMD160 bf83778ef1f252ae58a11e6beb24dac454828d8c SHA1 54d2dd91d018d9e251e2c99357232df028c33ffc SHA256 5b81a81ba475377d886605c1134f51a05318924e0aedb3fab2d00bbe8f87f953
-MISC ChangeLog 21031 RMD160 dda8b0bd880875af9427453bf829c7cee6a7e7db SHA1 af823716c5e8ad35e88c11b2ccfab462c2a84989 SHA256 5788e921c71b66fbfa2510126f95104138466d04b6971e0fd6a05c06e0b8a4a8
+EBUILD gnome-mag-0.16.0.ebuild 1858 RMD160 b6c711f2a42ea4539b3930ed973fa0ffedef5992 SHA1 11c39ba5a060c53a3266f2063639cf22cede4c59 SHA256 5b3e5a9812d41b4580cc1f39197058c5c23a3cd9ea3a871e746c6cbcaa1d4eb5
+MISC ChangeLog 21263 RMD160 bd007bb9ec80b9182045e64e6a66eb51002f9b2e SHA1 936e3816f48e1210853e976ee4332d4453d3f9f0 SHA256 d312cd607587e5d291a0abbf44741b5486720c5c0b9a3a7e4a4e14e1ba2d97c5
 MISC metadata.xml 172 RMD160 6901d426a49e26089e240a7a4f990204e08c15a1 SHA1 2a33de77ba2f0f4fdedeed148abdad125b78f996 SHA256 f14db6f3dc189eb3e4a3478d7c1bead86fe077d0c756b8426b64f7fc0d42d228
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt4f8IACgkQ1fmVwcYIWAafOACg5/zW5SBMZVF5+Npozn2BCwMI
+MjsAoI8Wz78u2rPDbY47xRgUiAasaJey
+=R+jh
+-----END PGP SIGNATURE-----
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"
-
 }