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

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

3 files changed, 35 insertions, 9 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/Manifest b/gnome-extra/gpointing-device-settings/Manifest
index 559fb04d065a..0234f12eb5a5 100644
--- a/gnome-extra/gpointing-device-settings/Manifest
+++ b/gnome-extra/gpointing-device-settings/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gpointing-device-settings-1.5.1-crash.patch 1097 RMD160 0d3f8b5ff6beebc9e15539b531d476e310ed79f6 SHA1 a9d843e1fe90223d516a4120b710452dbe3d7bf4 SHA256 84dbd85a86fe05892f035a367271fc633f589742ad62510df94357aae5dfa3d9
 AUX gpointing-device-settings-1.5.1-gtk22.patch 8272 RMD160 9caaf6b1ddc894deb2f700734d2919cb36fba55c SHA1 f2f84cafc51af6a71f6f565bd8ac99202d505e42 SHA256 b8fa0c56351d6bd65a3709e34d10903bee1c761fe1b57acefdff3c03a4e6553a
 AUX gpointing-device-settings-1.5.1-plugin.patch 5068 RMD160 c8a51a1c82182596ef170233cb914d621c8b0a92 SHA1 347c8f342675683ebb5a95ad1138790e741fb1df SHA256 f74bb7c430ceafaccf31c783c252ccd1e911ef21c414d89ace687dabf0d0df2d
@@ -6,6 +9,13 @@ DIST gpointing-device-settings-1.3.2.tar.gz 423274 RMD160 8aa662e2513b0f27eccc10
 DIST gpointing-device-settings-1.5.1.tar.gz 458352 RMD160 93b2f30d2cdfe643c745fb5163dd8c93a6369d3d SHA1 7f7e2fa02efdcc597dd6f3713f2c52325b00c26c SHA256 cccdbb5cd3ea18b9458ca23fd3bfbdc98410917f2037472b08ac239dbd2639b3
 EBUILD gpointing-device-settings-1.3.2.ebuild 1052 RMD160 537d89da0a653cac5ae72df4f20a05898a51784b SHA1 52dca3f9f8c44f08c157a6d95d1b6519e06ad93f SHA256 1e82640bb60b862a68a94336da292e62880f2c59ded0dd94fda03fc3d3b4f964
 EBUILD gpointing-device-settings-1.5.1-r1.ebuild 1329 RMD160 9ee84eb89e1ced0b52295d7c938daac2ace43ff1 SHA1 97aaf7bb229a02ba552f9ce750aae8886d325ff8 SHA256 54022895752ab774b8802e96892337aa12b15382d65f075c212b432d8c19be36
-EBUILD gpointing-device-settings-1.5.1.ebuild 1125 RMD160 0c62b3dd4a77b2e7babbb79eeeb84f88c5c07705 SHA1 4f36294240b58311f7febcc59c19204d70030682 SHA256 396f29b9bc1930690bfc911b66b6f742a66014b57b4428bc57eccf93bbc8a54a
-MISC ChangeLog 1970 RMD160 8f2a9f279bd87e8a2adff68e4e15c7489f80e742 SHA1 c31c47b808eaa6a5207dad9858037f05e41233a2 SHA256 897cf88501dcad7c46ca9fa9211344568e0d86ce79ba20fa188cd2a69eda46b6
+EBUILD gpointing-device-settings-1.5.1.ebuild 1365 RMD160 ffbdf14d1b56085efd2516009a264399927ff361 SHA1 58075f5b6660026ecb6c91eab7cce778d00b751a SHA256 8dd353636a563a4bf687a4d2531274843e7c2f25e03f26206f772c21ea261d47
+MISC ChangeLog 2145 RMD160 1ca8b82f62097000123e938955eea6a1c38ab14f SHA1 92ab6a50d53247499b7edf0da7bdc954c8606809 SHA256 0acdc5e66bff5c63c422d3238dcc89a951c70f1a8c39043bac9aea35f3bdc7ff
 MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk1X0SAACgkQCaWpQKGI+9QhCQCePJtqy9Vo7m3bWhWjttvvTyYM
+knQAnRQrC4vNssVokU8bZDWrkAQMWQta
+=YKbE
+-----END PGP SIGNATURE-----
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