Fix dependencies and incorrect use of G2CONF.

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

3 files changed, 28 insertions, 8 deletions

diff --git a/app-accessibility/gnome-mousetrap/ChangeLog b/app-accessibility/gnome-mousetrap/ChangeLog
index f6e0ead25abf..ad6e818f52a7 100644
--- a/app-accessibility/gnome-mousetrap/ChangeLog
+++ b/app-accessibility/gnome-mousetrap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/gnome-mousetrap
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mousetrap/ChangeLog,v 1.1 2009/11/22 17:06:12 mrpouet Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mousetrap/ChangeLog,v 1.2 2010/08/09 17:58:41 eva Exp $
+
+  09 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-mousetrap-0.3.ebuild:
+  Fix dependencies and incorrect use of G2CONF.
 
 *gnome-mousetrap-0.3 (22 Nov 2009)
 
diff --git a/app-accessibility/gnome-mousetrap/Manifest b/app-accessibility/gnome-mousetrap/Manifest
index f6b59ae2419d..bebb3731f99c 100644
--- a/app-accessibility/gnome-mousetrap/Manifest
+++ b/app-accessibility/gnome-mousetrap/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnome-mousetrap_0.3+svn17-3.diff.gz 8961 RMD160 8617b2e861e5f2d88e4f39c3d4e1c73792a1e9a7 SHA1 14bf4f2c951e87900829cbd9e2d6777e2ea5c7be SHA256 8de08062ccaf60e81d7d25035dc0181bbf4fdb0c153f4e89e5ef8df85b7fe520
 DIST gnome-mousetrap_0.3+svn17.orig.tar.gz 1442978 RMD160 5e3a612c12ba012159e0ab965af3e827b68b5baf SHA1 fc483908ce006d58710d3759d648910d4f0801cc SHA256 72cfdf17f738fa3049756a276bdcd274f54b59050fd7f40134658ffab3cc46ff
-EBUILD gnome-mousetrap-0.3.ebuild 1152 RMD160 712845c109cb0bd721f8bc96918f126582fa729d SHA1 b465905101d1bcf957112f6171012cee31b799bc SHA256 ed24b56e8eec5e517d2c50a3003bb399281a21209609ae3344cf1534e601fce4
-MISC ChangeLog 402 RMD160 600c26cd1b87f23778392d8d58633aa226ece52b SHA1 c2ad093d45a1f4fb5da5ac396e4c93e11c91429b SHA256 3f08cbe46c49200f2f60d2cf8ea8e87663cab21581c985d82916e35f9c96f3ef
+EBUILD gnome-mousetrap-0.3.ebuild 1293 RMD160 0ced483d809b206d5e9fb9cc203bfdfcba6c0fd0 SHA1 983ec50473b37b177c92959360e8ab6e105a1c03 SHA256 5ba949eef72d2607178d7e4b49c92644448a497a97e7e64c99bce12c6f8e6611
+MISC ChangeLog 531 RMD160 56ca1883c833e977ddd7a011a90dc7babd752e23 SHA1 df89b06e076534f3fa8ed8026684767fa85d81bb SHA256 85afed4129c52c781f88bb8166c5b716f55ec6e6bd7e828b271de774fa81eb91
 MISC metadata.xml 173 RMD160 874be142f8e5f54428b883ce44317bc203f5b038 SHA1 c4504f9053803d117ac1edc3476bd0d86c673039 SHA256 3ec76992b5791e7e7841047c0565c5bc7b1243c6c026fd5973ce074fa14a14eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxgQd4ACgkQ1fmVwcYIWAbmsACg4LlhCQGDFWL1EYhoiwif+4Fk
+UxsAn1wzFhRljJffa4rczTNm+APBY4DT
+=zgQi
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/gnome-mousetrap/gnome-mousetrap-0.3.ebuild b/app-accessibility/gnome-mousetrap/gnome-mousetrap-0.3.ebuild
index 2d629387f30c..c3c92335a88e 100644
--- a/app-accessibility/gnome-mousetrap/gnome-mousetrap-0.3.ebuild
+++ b/app-accessibility/gnome-mousetrap/gnome-mousetrap-0.3.ebuild
@@ -1,6 +1,6 @@
-# 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-mousetrap/gnome-mousetrap-0.3.ebuild,v 1.1 2009/11/22 17:06:12 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mousetrap/gnome-mousetrap-0.3.ebuild,v 1.2 2010/08/09 17:58:41 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -23,16 +23,19 @@ IUSE="doc"
 
 RDEPEND="gnome-extra/at-spi
 	media-libs/opencv[python]
+	dev-python/libgnome-python
 	dev-python/python-xlib"
 DEPEND="${RDEPEND}
-	dev-util/intltool"
+	>=dev-util/intltool-0.35"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_setup() {
-	G2CONF="--disable-dependency-tracking
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
 		$(use_enable doc pydoc)"
 }
+
 src_prepare() {
 	gnome2_src_prepare
 	epatch "${WORKDIR}/${MY_P}-${PATCHLEVEL}.diff"
@@ -40,4 +43,7 @@ src_prepare() {
 	# Use a specific version of python is a bad thing
 	sed 's:/usr/bin/python2.5:/usr/bin/python:g' \
 		-i src/mouseTrap/mousetrap.in || die "sed failed"
+
+	# Fix intltool tests
+	echo "src/mouseTrap/scripts/profiles/dragProfile.py" >> po/POTFILES.skip
 }