Fix build against gtk+-2.22 for current stable also, dropping DEPRECATED flags.

(Portage version: 2.1.9.39/cvs/Linux x86_64)

2 files changed, 23 insertions, 7 deletions

diff --git a/gnome-extra/gpointing-device-settings/ChangeLog b/gnome-extra/gpointing-device-settings/ChangeLog
index e0edce7a4383..91ac6fa46090 100644
--- a/gnome-extra/gpointing-device-settings/ChangeLog
+++ b/gnome-extra/gpointing-device-settings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gpointing-device-settings
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/ChangeLog,v 1.8 2010/11/10 12:33:38 pva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/ChangeLog,v 1.9 2011/02/13 12:39:54 pacho Exp $
+
+  13 Feb 2011; Pacho Ramos <pacho@gentoo.org>
+  gpointing-device-settings-1.5.1.ebuild:
+  Fix build against gtk+-2.22 for current stable also, dropping DEPRECATED
+  flags.
 
 *gpointing-device-settings-1.5.1-r1 (10 Nov 2010)
 
diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1.ebuild
index aaf38e722c01..e85af105a39e 100644
--- a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1.ebuild
+++ b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1.ebuild,v 1.3 2010/06/13 16:40:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1.ebuild,v 1.4 2011/02/13 12:39:54 pacho Exp $
 
+EAPI="3"
 GCONF_DEBUG="no"
-inherit eutils gnome2
+inherit eutils gnome2 autotools
 
 DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
 HOMEPAGE="http://live.gnome.org/GPointingDeviceSettings"
@@ -15,8 +16,8 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 # recent enough x11-base/xorg-server required
-RDEPEND=">=dev-libs/glib-2.10
-	>=x11-libs/gtk+-2.14.0
+RDEPEND=">=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-2.14.0:2
 	>=gnome-base/gconf-2.24
 	>=gnome-base/gnome-settings-daemon-2.28
 	>=x11-libs/libXi-1.2
@@ -29,6 +30,16 @@ DEPEND="${RDEPEND}
 
 DOCS="MAINTAINERS NEWS TODO"
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Drop DEPRECATED flags
+	sed -i -e 's/ -D[A-Z_]*DISABLE_DEPRECATED//' configure configure.ac || die
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
 src_install() {
 	gnome2_src_install