Ebuild r-bump with features to fix bugs #134309, #206614, #215323.

Package-Manager: portage-2.1.4.4

5 files changed, 137 insertions, 12 deletions

diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index 90383a37da8a..343966ffe1e8 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-drivers/synaptics
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.32 2008/02/24 02:45:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.33 2008/04/01 23:57:31 battousai Exp $
+
+*synaptics-0.14.6-r2 (01 Apr 2008)
+
+  01 Apr 2008; Bryan Stine <battousai@gentoo.org>
+  +files/synaptics-fix-xinerama.patch,
+  +files/synaptics-install-so-exec.patch, +synaptics-0.14.6-r2.ebuild:
+  Ebuild revision bump with a few new features. First, added a patch to
+  driver code to allow the touchpad to interact correctly with multiple
+  screens using Xinerama, fixing bug #206614. Second, added a patch to the
+  Makefile to install the Xorg module as executable to allow the Xorg loader
+  to bring it in automatically, fixing bug #215323. Finally, added
+  linux-info logic to the ebuild to check the kernel config for
+  CONFIG_INPUT_EVDEV (either as a module or built-in) as the driver requires
+  that interface for full support; fixes bug #134309. Revision-bumped the
+  ebuild to ensure the Xinerama and executable patches get pulled onto
+  users' systems.
 
   24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
   Update my email.
diff --git a/x11-drivers/synaptics/Manifest b/x11-drivers/synaptics/Manifest
index a901c6bc21c6..d257ec2f2ea1 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rc.conf 330 RMD160 75825d70b749ae4e8b59b4066428d73815b19d70 SHA1 639736e2b424fcd3d6a78d0e6a3f90bed49ee6f4 SHA256 1776915a739c2f1432ab1602717cac1ff2464160a9d33d20124853a93605f6a5
 AUX rc.init 440 RMD160 82c30d248ef010cdd41600e3b19878b9f2ea6ff0 SHA1 cfb299682f9ec85340950917cbfebe5387080b32 SHA256 314d7d7c7d20608a398b439427e9c74cfaf2521996abc50af8a7963f1e7f22b8
 AUX synaptics-0.14.4-r2-makefile-fpic.patch 681 RMD160 492189b170c19043e35e28d9d347d61d718eef0a SHA1 d784c87ef1d144bb863f5fb05f69b511c528bf8f SHA256 c8cbd624521f7490a04df72d8a2738c5bb586b57c560af0bb60b860f286658bc
@@ -8,19 +5,15 @@ AUX synaptics-0.14.4-r2-makefile.patch 531 RMD160 64ac6a8bd06befe99f126a1cad0802
 AUX synaptics-0.14.5-makefile-fpic.patch 604 RMD160 610b6f52382cab61d669c7ed126796a7ba0c96f2 SHA1 ff235d5ea1b20a4b19a5339fc31afeb88750f8d3 SHA256 bfe89f8ecae8a0af6e8b478ed29f5fe652bf3aa6016d6c41a7a678fc25f92c36
 AUX synaptics-0.14.5-xorg-7.1-compile-fix.patch 2249 RMD160 639955f8ae5162d4c3b4f527a6e6bb1cf4c0bb26 SHA1 0d59b2d11dbb94127ee843310e3badcaff6b61e1 SHA256 0de534613bd1df8b0b36f0387fcea858e463833bb6f4248b71c0975d7effae19
 AUX synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538 RMD160 aec4ddbe8c93439d2245aeea1909eeb0e9ee555f SHA1 985ee12c3b61cdb89c97d150a52da4df85e2f236 SHA256 81cd1a662faf37141ca1e731c0ef63ba493a99b2c794d8ceb9510a7367e4f97c
+AUX synaptics-fix-xinerama.patch 602 RMD160 128bc48024c04d789cc1393462e81c2dbe6bae5c SHA1 225993afe0f2ec6be5df7e132f60a92db0c54815 SHA256 8feb3ca55e1c476b068dda6b411ad6a317ac8fa4d3569fe38a0e5af14b8cb1c7
 AUX synaptics-fixeventgrab.diff 2826 RMD160 0888ceb9cb2847d336be4c267ee8a4f6aee76a1d SHA1 38de7f5c4c94f89e5170b4ff6306cc6b1d7fac84 SHA256 90f49ad2885202a23ad70e3630d712dc26249c4d3035cff2e0094de2f806dab8
+AUX synaptics-install-so-exec.patch 337 RMD160 e9111545b7c04ab66bd1ff36d116d25baa205ef1 SHA1 c9f67efed41c5c4a1201b1261be0d72f912e4ab6 SHA256 227a147a0d7d0c9528d51ffec03506db530af8a6911c6f89f45e451fdc4d39eb
 AUX synaptics_input_api.diff 2181 RMD160 c7adda057b1591721abb4e2cba73e5fca1442361 SHA1 e0ac5c149a4a2899feacc1eaea27b78fa3c4a97b SHA256 0f415142a67a1a2cac51d9e67a33e7cadd9a20846b3f187db1ab5ff280b9c1f8
 DIST synaptics-0.14.5.tar.bz2 126743 RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c18893 SHA1 54788ea58ff0c07b3ae492e8dae9a2253b586af5 SHA256 aaad8ee83d5c6fd1e46be7201086645bd271281843751f850d345c7a9545b796
 DIST synaptics-0.14.6.tar.bz2 126833 RMD160 7a8b103aa314eb13dc512c663c501108cc24a574 SHA1 41443e253e73546657b40435c8c9bfa0a91662bc SHA256 f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
 EBUILD synaptics-0.14.5-r1.ebuild 1353 RMD160 d3071d9aae10467cef885a291afe2d53bda4ed48 SHA1 c49b2b5d9053d8ea415d3cf27cf58927d9a8c87f SHA256 d51a03799fe941502ac0431976c543462e19983e9b8eb5d601b1d51131361929
 EBUILD synaptics-0.14.6-r1.ebuild 1477 RMD160 b0ec6a3b6ce2f875240d25a447796a84e2bb3487 SHA1 cbaf6ff70d38156bbadeed1bf8b8f350bda881a1 SHA256 8bc6e347be42a113074933c7010f7d32cd2bd75e9a42758c811faa9c9ac54d0e
+EBUILD synaptics-0.14.6-r2.ebuild 2452 RMD160 4c6d512ef09ed348a4c45d814d5ddcb1fe63718e SHA1 7c8d482a76618f977887c85a4b893b630220710e SHA256 96d36d00b716eb3412d86feb3daf620a72ae006821f43061e7010290321c73d8
 EBUILD synaptics-0.14.6.ebuild 1266 RMD160 d9bc93d3b1370119950e7b7f70d8273a192441fb SHA1 efd0935366b14afb5f5d2d7913fa03b1dbaccb3e SHA256 146a0ad8a1b0801c2bfad34d315525972094dc828d93359e6937a086b70d2b2a
-MISC ChangeLog 15301 RMD160 161042cc06394cea583a5d7036da23e61d2f5202 SHA1 94bca3317b9ed557de62613efc995eae4c8ef38b SHA256 9fde87c51c3c2b5fff15195a3c4f7d3959a0d5729aad4230445beb540e790d7f
+MISC ChangeLog 16165 RMD160 7e264eb771a34160a8eafc3078df6fedefc94554 SHA1 e46046ab185819637c22147484785263d9623446 SHA256 d64238d572294ab117e452e5d26357cdf25b0e158bc00bb55379501bf57ce2b2
 MISC metadata.xml 164 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 SHA1 6b624c0de1c67e3014f357344afe6dbb818f64bd SHA256 8bb377723c4bb750b364a747cc43f6438cd13731e361728f416ab6f4928bcb58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHwNo8XVaO67S1rtsRAmphAKD5dXMhwQGgu+ACHt1rAiD12Kbu3gCeMjXo
-NiKIKQcS0W2XsZ18eYIWp0k=
-=xXuL
------END PGP SIGNATURE-----
diff --git a/x11-drivers/synaptics/files/synaptics-fix-xinerama.patch b/x11-drivers/synaptics/files/synaptics-fix-xinerama.patch
new file mode 100644
index 000000000000..7d97af690b59
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-fix-xinerama.patch
@@ -0,0 +1,16 @@
+--- synaptics-0.14.6.orig/synaptics.c	2008-01-18 23:32:59.000000000 -0500
++++ synaptics-0.14.6/synaptics.c	2008-01-18 23:32:15.000000000 -0500
+@@ -617,10 +617,10 @@
+ 			    miPointerGetMotionBufferSize());
+ 
+     /* X valuator */
+-    xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
++    xf86InitValuatorAxisStruct(dev, 0, -1, -1, 1, 0, 1);
+     xf86InitValuatorDefaults(dev, 0);
+     /* Y valuator */
+-    xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
++    xf86InitValuatorAxisStruct(dev, 1, -1, -1, 1, 0, 1);
+     xf86InitValuatorDefaults(dev, 1);
+ 
+     xf86MotionHistoryAllocate(local);
+
diff --git a/x11-drivers/synaptics/files/synaptics-install-so-exec.patch b/x11-drivers/synaptics/files/synaptics-install-so-exec.patch
new file mode 100644
index 000000000000..c71f4d5198a6
--- /dev/null
+++ b/x11-drivers/synaptics/files/synaptics-install-so-exec.patch
@@ -0,0 +1,11 @@
+--- synaptics-0.14.6/Makefile.orig	2008-04-01 16:10:04.000000000 -0400
++++ synaptics-0.14.6/Makefile	2008-04-01 16:10:23.000000000 -0400
+@@ -115,7 +115,7 @@
+ 	install -D $< $@
+ 
+ $(INPUT_MODULE_DIR)/$(SYNAPTICS_DRV) : $(SYNAPTICS_DRV)
+-	install --mode=0644 -D $< $@
++	install --mode=0755 -D $< $@
+ 
+ $(SYNAPTICS_DRV): $(OBJS)
+ 	$(RM) $@
diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
new file mode 100644
index 000000000000..318860ca3587
--- /dev/null
+++ b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild,v 1.1 2008/04/01 23:57:31 battousai Exp $
+
+inherit toolchain-funcs eutils linux-info
+
+IUSE=""
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/"
+SRC_URI="http://w1.894.telia.com/~u89404340/touchpad/files/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-server
+	>=sys-apps/sed-4"
+
+evdev-input_check() {
+	# Check kernel config for required event interface support (either
+	# built-in or as a module. Bug #134309.
+
+	ebegin "Checking kernel config for event device support"
+	linux_chkconfig_present INPUT_EVDEV
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		ewarn "Synaptics driver requires event interface support."
+		ewarn "Please enable the event interface in your kernel config."
+		ewarn "The option can be found at:"
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Input device support"
+		ewarn "      -*- Generic input layer"
+		ewarn "        <*> Event interface"
+		ewarn
+		ewarn "Then rebuild the kernel or install the module."
+		epause 5
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	evdev-input_check
+}
+
+src_unpack() {
+	unpack ${A} ; cd "${S}"
+
+	# Switch up the CC and CFLAGS stuff.
+	sed -i \
+		-e "s:CC = gcc:CC = $(tc-getCC):g" \
+		-e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" \
+		"${S}"/Makefile
+
+	# Fix grabbing of event devices so it will not stop working together with
+	# packages which grab their devices at their own like sys-apps/inputd does.
+	epatch "${FILESDIR}"/synaptics-fixeventgrab.diff
+
+	epatch "${FILESDIR}"/synaptics_input_api.diff
+
+	# Patch the Makefile to install the library as executable. Bug #215323.
+	epatch "${FILESDIR}"/synaptics-install-so-exec.patch
+
+	# Fix to handle multiple screens through Xinerama properly. Bug #206614.
+	epatch "${FILESDIR}"/synaptics-fix-xinerama.patch
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		PREFIX=/usr \
+		MANDIR="${D}"/usr/share/man \
+		install || die
+
+	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
+	dodoc COMPATIBILITY FILES INSTALL* NEWS TODO README*
+
+	# Stupid new daemon, didn't work for me because of shm issues
+	newinitd "${FILESDIR}"/rc.init syndaemon
+	newconfd "${FILESDIR}"/rc.conf syndaemon
+}