Fix build failure reported in bug #384001 (wrt Allan Gottlieb).

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

3 files changed, 12 insertions, 17 deletions

diff --git a/gnome-extra/gpointing-device-settings/ChangeLog b/gnome-extra/gpointing-device-settings/ChangeLog
index cd04465a7c22..b522cbd58c8e 100644
--- a/gnome-extra/gpointing-device-settings/ChangeLog
+++ b/gnome-extra/gpointing-device-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gpointing-device-settings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/ChangeLog,v 1.12 2011/03/30 11:09:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/ChangeLog,v 1.13 2011/10/02 13:44:18 pva Exp $
+
+  02 Oct 2011; Peter Volkov <pva@gentoo.org>
+  gpointing-device-settings-1.5.1-r2.ebuild:
+  Fix build failure reported in bug #384001 (wrt Allan Gottlieb).
 
   30 Mar 2011; Christoph Mende <angelos@gentoo.org>
   gpointing-device-settings-1.3.2.ebuild,
diff --git a/gnome-extra/gpointing-device-settings/Manifest b/gnome-extra/gpointing-device-settings/Manifest
index 059717dd70d0..a5c7b31203fb 100644
--- a/gnome-extra/gpointing-device-settings/Manifest
+++ b/gnome-extra/gpointing-device-settings/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gpointing-device-settings-1.5.1-crash.patch 1097 RMD160 0d3f8b5ff6beebc9e15539b531d476e310ed79f6 SHA1 a9d843e1fe90223d516a4120b710452dbe3d7bf4 SHA256 84dbd85a86fe05892f035a367271fc633f589742ad62510df94357aae5dfa3d9
 AUX gpointing-device-settings-1.5.1-gsd-crash.patch 2062 RMD160 36932390272a60f6bbd3b0ba4f9b8223431cad89 SHA1 ae4b448f8c378b513bd5a503be5163584a6ed156 SHA256 73260c4d4e4b4d1c6e8493fba77841fd57101019a3416d2a7bc1609f8d7ba3fd
 AUX gpointing-device-settings-1.5.1-gtk22.patch 8272 RMD160 9caaf6b1ddc894deb2f700734d2919cb36fba55c SHA1 f2f84cafc51af6a71f6f565bd8ac99202d505e42 SHA256 b8fa0c56351d6bd65a3709e34d10903bee1c761fe1b57acefdff3c03a4e6553a
@@ -10,16 +7,7 @@ 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 1069 RMD160 bd1ee8cbfd7373a566a8d1f9e73965175eb054d3 SHA1 af6df44962ac6d0dc046187926c6548874509464 SHA256 70ccd0cbe6f969ce03ac067fc569bb8a7be0503c5c38fdbe126a592b5d1cb8e2
 EBUILD gpointing-device-settings-1.5.1-r1.ebuild 1339 RMD160 ed3f16d01163c3cb12e1b5251e916113fa9cdebd SHA1 6dad4b3ae77c1abdef63a49919c03006a17bbcf6 SHA256 87fb74c13bb9ef0ed7686b03897d5a7ba8859a0c4e0230dd1d037122ded8901d
-EBUILD gpointing-device-settings-1.5.1-r2.ebuild 1169 RMD160 701603614c56fbf93bbdabc5da42b704df315b06 SHA1 68640fe93beb6256e29d891bf328b9ebf292a27a SHA256 fd07f49b0187029c81ac1e824f435e9253ae5ec215f8bd3a74bde361c6cccb24
+EBUILD gpointing-device-settings-1.5.1-r2.ebuild 1283 RMD160 8f42539526dae7f1f6dd84646f509b585c5318a7 SHA1 cbf0a932ac18fbf0a5b6fbda2bd1fe4122bad741 SHA256 8b4601b053962cdcdefa30b3a903e7d2ecba38b4c0432086d89094b3a0fa6130
 EBUILD gpointing-device-settings-1.5.1.ebuild 1365 RMD160 ffbdf14d1b56085efd2516009a264399927ff361 SHA1 58075f5b6660026ecb6c91eab7cce778d00b751a SHA256 8dd353636a563a4bf687a4d2531274843e7c2f25e03f26206f772c21ea261d47
-MISC ChangeLog 2841 RMD160 967812f95b4e7d005e327dd6006030d262d57e93 SHA1 c38244318f62d09cae621341efb0b5c632ea86a3 SHA256 f45db96644823581c09015cfeea7cebfb95f00b4e1d09e512cc28a668abe5c28
+MISC ChangeLog 2994 RMD160 9ff1ee8c2fffae957de8afff895047991a10c0e8 SHA1 5155cde9d396bf64ee3cda04da0c01d3728e631f SHA256 0461a43d0ca43bc94716c8222a6732406803b4b56139ee2022ec9a9a36297f6c
 MISC metadata.xml 228 RMD160 bcdd76c994501350b97e70c443e09ebf3172df41 SHA1 1a35ed2e9e695b6f228703fce8baf6c3a5ae71d0 SHA256 c1d5f02bf3a5a5a936093a7df8732f0d4ae6cda289d1f24f938651a98e2809cb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59nx4ACgkQfXuS5UK5QB02aQP6A9ZpncLwVABf2mX4vRKEWuBJ
-yxURLrRzZ12KpZoIPxxcmpKhKR0C6eNd3gNUFuDUUwuhEzgBuVITPKb1jKguMUVt
-yrbk3m71TbHBKE3/MQymt+5xyiT95RQPuUdztYmjrDXtiRdlrnXUxZ3RVLTWEg/+
-fpCuyfk67r7w5kex0HI=
-=psWS
------END PGP SIGNATURE-----
diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
index 8c2f197d42e7..d2e216a9057e 100644
--- a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
+++ b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
@@ -1,10 +1,10 @@
 # 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-r2.ebuild,v 1.2 2011/03/28 22:39:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild,v 1.3 2011/10/02 13:44:18 pva Exp $
 
 EAPI="2"
 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"
@@ -37,5 +37,8 @@ src_prepare() {
 		"${FILESDIR}/${P}-reboot.patch" \
 		"${FILESDIR}/${P}-gtk22.patch" \
 		"${FILESDIR}/${P}-gsd-crash.patch"
+	sed 's|\(^GPDS_CFLAGS=.*-D[A-Z_]*_DISABLE_DEPRECATED.*\)|#\1|' \
+		-i configure.ac || die
+	eautoreconf
 	gnome2_src_prepare
 }