Patch out a reference to XF86_CURRENT_VERSION which recently disappeared in upstream X.Org git and block against the older synaptics ebuild. Both thanks to papillon81 on IRC.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc4-00123-gd3ee1b4-dirty x86_64

4 files changed, 35 insertions, 7 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index fdbccd982e99..2e78be3aa0ac 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.3 2008/08/22 17:50:48 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.4 2008/08/23 21:28:55 chainsaw Exp $
+
+*xf86-input-synaptics-0.15.0-r1 (23 Aug 2008)
+
+  23 Aug 2008; <chainsaw@gentoo.org> +files/synaptics-xorg-version.patch,
+  -xf86-input-synaptics-0.15.0.ebuild,
+  +xf86-input-synaptics-0.15.0-r1.ebuild:
+  Patch out a reference to XF86_CURRENT_VERSION which recently disappeared
+  in upstream X.Org git and block against the older synaptics ebuild. Both
+  thanks to papillon81 on IRC.
 
   22 Aug 2008; <chainsaw@gentoo.org> files/11-x11-synaptics.fdi:
   Have FDI file also trigger for appletouch devices, from upstream commit
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 8139cfc3e32f..50f0c41962fe 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -5,14 +5,15 @@ AUX 11-x11-synaptics.fdi 593 RMD160 5b2d387e22b2dfd340e6e5e508f5b07bd916f5fc SHA
 AUX rc.conf 342 RMD160 65e507598001c497dec7b05ab5bb8e06ff1aac7a SHA1 cc76b983b33f8eb5c3624ba78db206781eab81bb SHA256 3334b80cd39226fafd948e16114ab094fffe9455625f608c80f8287a006d0716
 AUX rc.init 452 RMD160 202287feac6c79276fac32987cb1d75158bacfee SHA1 db38171e0c8e1d777ae8af2ce81e43950137892f SHA256 0d735340a0adb2e5e6c902253d4ef68fd80c3001b0ed31ea70d2a2690d738a1a
 AUX synaptics-fix-xinerama.patch 752 RMD160 5017471df5c4f47382938ccff9bbd66033c06a6f SHA1 14b53a0c4090739ddc4cff9e9ad94cb9e2499c87 SHA256 7bdec4ef00a520d52e00b8a1d0b6d61e89fde910e28baa306b8be23dd7aadd64
+AUX synaptics-xorg-version.patch 581 RMD160 eab8463f1fe5e78d6da033fcecdbd5714fce1287 SHA1 fd4e7e691b30f5571bc8905780dd16db1790f689 SHA256 39445b88a5ec8e82da69c3b93003af26e14c964fbf63710ae56e1204dc8e29e2
 DIST xf86-input-synaptics-0.15.0.tar.bz2 280770 RMD160 54648e5f3bdbcab1857ddb469f83aacba3f7af9d SHA1 41eaa1c77af11166ff5ec4abc013076f545bc676 SHA256 e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b
-EBUILD xf86-input-synaptics-0.15.0.ebuild 1878 RMD160 7cfead402659e64a216d6b521daafe880e94230f SHA1 b76a13d21372082767521d711ea4bf0d84ceadc7 SHA256 1dcefcaa4b0d4afac63deb3c146828593397903725bfb951c55c56964554ac8e
-MISC ChangeLog 1208 RMD160 eee9194d16e89858685900bfe1cd25f6f5c4d39c SHA1 7145dd4e624671947e15921a22dca6ee782d8200 SHA256 afc92898ed51459816471fc7dce923db66ae4fe22bc4d33a86606557340c23a5
+EBUILD xf86-input-synaptics-0.15.0-r1.ebuild 2023 RMD160 b206a58b2494897fb82ddf33f505adbab88534f7 SHA1 fc6af6f7e535496f9d0b95db4ef1c115fcdf4c86 SHA256 1405bf2ad958d4b3aada557ef62a75049c2b647b53bbf231d5dbad2afdf061ab
+MISC ChangeLog 1592 RMD160 fb0e6a58991b176899f7a3c61894260ef03bd564 SHA1 4bf6b6218dbbc3aecb8b5ccd94a30a64258bc223 SHA256 37223847cff1b6c8c510a8bb50df575381b77158dd026ad84d4c08d8a9d216e7
 MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiu/IgACgkQp5vW4rUFj5oIcgCgiRhRfA0r0Bo7QFG6mCBArn16
-kz4An1h9xAcASHjpp3vNFx/hntShvzrE
-=5Bdl
+iEYEARECAAYFAkiwgWgACgkQp5vW4rUFj5r7PACfWOPLc+uI1Op9zi3LzeBc1fnN
+KeIAnAk+btZAolklcX0wu21EMMx2K+Z9
+=2ihm
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch
new file mode 100644
index 000000000000..6580385568d9
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch
@@ -0,0 +1,14 @@
+diff -uNr xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c xf86-input-synaptics-0.15.0/src/synaptics.c
+--- xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c	2008-08-23 22:19:55.000000000 +0100
++++ xf86-input-synaptics-0.15.0/src/synaptics.c	2008-08-23 22:21:16.000000000 +0100
+@@ -136,8 +136,8 @@
+     MODULEVENDORSTRING,
+     MODINFOSTRING1,
+     MODINFOSTRING2,
+-    XF86_VERSION_CURRENT,
+-    1, 0, 0,
++    XORG_VERSION_CURRENT,
++    PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
+     ABI_CLASS_XINPUT,
+     ABI_XINPUT_VERSION,
+     MOD_CLASS_XINPUT,
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild
index 187941c9a70f..2eddf6db6866 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0.ebuild,v 1.2 2008/08/22 17:17:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.0-r1.ebuild,v 1.1 2008/08/23 21:28:55 chainsaw Exp $
 
 inherit toolchain-funcs eutils linux-info x-modular
 
@@ -12,6 +12,7 @@ IUSE="hal"
 RDEPEND="x11-libs/libXext
 	 hal? ( sys-apps/hal )"
 DEPEND="${RDEPEND}
+	!x11-drivers/synaptics
 	x11-base/xorg-server
 	x11-proto/inputproto
 	>=sys-apps/sed-4"
@@ -48,6 +49,9 @@ src_unpack() {
 	x-modular_unpack_source
 	# Fix to handle multiple screens through Xinerama properly. Bug #206614.
 	epatch "${FILESDIR}"/synaptics-fix-xinerama.patch
+
+	# Recent X.Org git versions stopped defining XF86-style version.
+	epatch "${FILESDIR}"/synaptics-xorg-version.patch
 }
 
 src_install() {