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

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

3 files changed, 52 insertions, 14 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/Manifest b/app-accessibility/gnome-mag/Manifest
index 5f93641b4a48..c91f78f9bfc0 100644
--- a/app-accessibility/gnome-mag/Manifest
+++ b/app-accessibility/gnome-mag/Manifest
@@ -1,9 +1,19 @@
+-----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.9.tar.bz2 532685 RMD160 b246e5d3eb8d2817287f7a54d10d3e17f7e24550 SHA1 b04c6728f8998d476ce1cb39734e72ca02d68bf5 SHA256 6f921419143088587dce201afd972a60317ade269e47b0d67a38872a7615a025
 DIST gnome-mag-0.16.1.tar.bz2 546444 RMD160 be70383eb4321478cd72b56f8ae0f22aa74e8bad SHA1 a7629cf9ce7c8a065de806c8fb7bd7f536a1d647 SHA256 92541c30a70a6cf59ec3fb3f46d27a598173984f786f7c6bc1bd3e4be65ad3fa
 DIST gnome-mag-0.16.2.tar.bz2 555502 RMD160 8d50b35657b0f1d83dff9c64764c4ae2d3745103 SHA1 ec4ba656b53d9e3544907a31b4b9743c52795ea9 SHA256 816690a2f98aac33c8eec0ef2ec098c77d3aefd4653086f0a9529b5b5d9ced23
-EBUILD gnome-mag-0.15.9.ebuild 1302 RMD160 ff6f16ff957d043542212e472094b18d7336e666 SHA1 d8666271171f5e04926ffe0e8775e8880e558349 SHA256 93cdb381154818c2ef498f1c4de30c44689a35dc89022ffe9279a17eb7d6107c
+DIST gnome-mag-0.16.3.tar.bz2 554588 RMD160 f1a137314a1d35de45e816c645a5e15c2524ce49 SHA1 90cf2f7ffd27344e392659ba97e1921a57012c1a SHA256 1ea1b1218ce621226b0397c4c548db29636ab663da7943440327e04345916d99
 EBUILD gnome-mag-0.16.1.ebuild 1851 RMD160 4179979443997ac323022d1ecdb0694e755cbea2 SHA1 f20368040f32d16a65571258083178b39b378aad SHA256 a7a93f01354bbba7543638986c6dd1b54a139f87b835e8166a2a0bcf211e47cf
 EBUILD gnome-mag-0.16.2.ebuild 1725 RMD160 64c1c82f08fe883038890d11949a70478c25b659 SHA1 e683e76fb594703db8fc4ffc9a7a0e86fa2c851a SHA256 5cda214e177bc69699d21aac42380bc0266a53bf4f436de681e035033771e8b8
-MISC ChangeLog 22427 RMD160 e50cc1998f0131823cc97404cdef1b04241dd52c SHA1 22588b1448cceaa9cc40deaf8b3022a897293aa4 SHA256 406689ead78c99998bedf74c04eb4d01870cfec102f0961588046fdb90161e35
+EBUILD gnome-mag-0.16.3.ebuild 1882 RMD160 c48906786713c9705572a5a9575f35235e9bf420 SHA1 438c363c98b8469fd54cbdbfa607b007261db408 SHA256 c125bbdb3e69130c64225afbb9f33ca40ed9e70a1ea3afe2f2a518fb4b1b8858
+MISC ChangeLog 22658 RMD160 1b4aabd7966035705dc6d26ac78d0dde90904c21 SHA1 053fd3520b58dd1322efdfa7786a0d2bd660a094 SHA256 459547b39d48cc6345a3dea59f5b0672899717477f5fc7f8e87abd28d9562fc0
 MISC metadata.xml 172 RMD160 6901d426a49e26089e240a7a4f990204e08c15a1 SHA1 2a33de77ba2f0f4fdedeed148abdad125b78f996 SHA256 f14db6f3dc189eb3e4a3478d7c1bead86fe077d0c756b8426b64f7fc0d42d228
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzO4U8ACgkQ1fmVwcYIWAaxCACfYhfeBRMwXoTFQHqaTE93J1Gk
+8egAoKEKlgODuIucBLVwmV6TMH+6Fvi+
+=y9ax
+-----END PGP SIGNATURE-----
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"
-
 }