version bump, and this one should finally work with amd64 and other 64bit arches

Package-Manager: portage-2.0.53

5 files changed, 96 insertions, 12 deletions

diff --git a/x11-misc/synaptics/ChangeLog b/x11-misc/synaptics/ChangeLog
index d5173011e8ed..983e17368203 100644
--- a/x11-misc/synaptics/ChangeLog
+++ b/x11-misc/synaptics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/synaptics
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.47 2005/10/08 17:12:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.48 2005/12/09 15:23:11 seemant Exp $
+
+*synaptics-0.14.4 (09 Dec 2005)
+
+  09 Dec 2005; Seemant Kulleen <seemant@gentoo.org>
+  +files/synaptics-0.14.4-makefile.patch, +synaptics-0.14.4.ebuild:
+  version bump, and this one should finally work with amd64 and other 64bit
+  arches
 
   08 Oct 2005; Sven Wegener <swegener@gentoo.org> synaptics-0.14.1.ebuild,
   synaptics-0.14.2.ebuild, synaptics-0.14.3.ebuild:
diff --git a/x11-misc/synaptics/Manifest b/x11-misc/synaptics/Manifest
index 3535871376bf..19eff1729066 100644
--- a/x11-misc/synaptics/Manifest
+++ b/x11-misc/synaptics/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 99f68dee739189506e9174fbeffa2aed ChangeLog 8651
+MD5 8c84a8c0cda4f0dfaa4b3f3bf12e947e ChangeLog 8889
 MD5 595f2c641792adda7a9f78f547a3f98b files/digest-synaptics-0.14.1 69
 MD5 b18951d106b4ce580ac6177b199cf712 files/digest-synaptics-0.14.2 69
 MD5 f2c16c935f2447340a41eb72bb137f57 files/digest-synaptics-0.14.3 69
+MD5 7a7d3c5180f7a18b8b19bc2221017874 files/digest-synaptics-0.14.4 69
 MD5 e46163bec0b3237d0d7e371b767cd077 files/rc.conf 329
 MD5 6fd019ebb1dd7433d16845d73595f81b files/rc.init 440
+MD5 3ec08c321d3c37e64e3ee5a08ac4cdd7 files/synaptics-0.14.4-makefile.patch 1252
 MD5 f2c484f02a746852ee1295ca1f092e8d files/synaptics-0.14.x-gcc4-the-sentinels-have-attacked.patch 538
 MD5 1cb923bfa5e7e99ae6804f147a1c730c metadata.xml 164
 MD5 296db1bb8b4b4e9f269437ca0aad747a synaptics-0.14.1.ebuild 1962
 MD5 a4ab06d7c8effb31d72c0f2c7af04834 synaptics-0.14.2.ebuild 1962
 MD5 3ec94a739b240ba37a2fb4fe129f8f96 synaptics-0.14.3.ebuild 1963
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDR/4HI1lqEGTUzyQRAibfAJ9B+0lFFU9p+3o7Xgppp7NrsAqbYwCgoLU+
-8VJ0ZNEwFDQtVqDJDjnY++M=
-=jZLt
------END PGP SIGNATURE-----
+MD5 55aef65497c9cf6b6e2b134268379a79 synaptics-0.14.4.ebuild 1604
diff --git a/x11-misc/synaptics/files/digest-synaptics-0.14.4 b/x11-misc/synaptics/files/digest-synaptics-0.14.4
new file mode 100644
index 000000000000..e4c6cde43e5b
--- /dev/null
+++ b/x11-misc/synaptics/files/digest-synaptics-0.14.4
@@ -0,0 +1 @@
+MD5 ae9aef7a146346fbfc7edfdd63cdd273 synaptics-0.14.4.tar.bz2 125524
diff --git a/x11-misc/synaptics/files/synaptics-0.14.4-makefile.patch b/x11-misc/synaptics/files/synaptics-0.14.4-makefile.patch
new file mode 100644
index 000000000000..0ea0adc9980a
--- /dev/null
+++ b/x11-misc/synaptics/files/synaptics-0.14.4-makefile.patch
@@ -0,0 +1,30 @@
+--- Makefile.orig	2005-12-09 10:14:00.000000000 -0500
++++ Makefile	2005-12-09 10:14:44.000000000 -0500
+@@ -7,10 +7,10 @@
+ # Define the TOP variable to build using include files from a local source tree.
+ #TOP = /usr/src/redhat/BUILD/XFree86-4.3.0/xc
+ 
+-INSTALLED_X = $(DESTDIR)/usr/X11R6
++INSTALLED_X = $(DESTDIR)/usr
+ LOCAL_X = Xincludes/usr/X11R6
+-BINDIR = $(DESTDIR)/usr/local/bin
+-MANDIR = $(DESTDIR)/usr/local/man
++BINDIR = $(DESTDIR)/usr/bin
++MANDIR = $(DESTDIR)/usr/share/man
+ 
+ ifeq ($(ARCH),)
+   ARCH = $(shell /bin/arch)
+@@ -62,10 +62,10 @@
+ 
+ CCOPTIONS := -pedantic -Wall -Wpointer-arith
+ CCOPTIONS += $(call check_gcc,-fno-merge-constants,)
+-CCOPTIONS += $(call check_gcc,-fno-pic,)
++CCOPTIONS += $(call check_gcc,)
+ CDEBUGFLAGS = -O2
+-CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)"
+-CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\""  -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include
++CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -DVERSION="\"$(VERSION)\"" -DVERSION_ID="$(VERSION_ID)" -fPIC
++CFLAGSCLIENT = $(CDEBUGFLAGS) $(CCOPTIONS) -DVERSION="\"$(VERSION)\""  -DVERSION_ID="$(VERSION_ID)" -I$(X_INCLUDES_ROOT)/include -fno-pic
+ 
+ CC = gcc
+ 
diff --git a/x11-misc/synaptics/synaptics-0.14.4.ebuild b/x11-misc/synaptics/synaptics-0.14.4.ebuild
new file mode 100644
index 000000000000..b3b87710aa3b
--- /dev/null
+++ b/x11-misc/synaptics/synaptics-0.14.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.14.4.ebuild,v 1.1 2005/12/09 15:23:11 seemant Exp $
+
+inherit toolchain-funcs eutils
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dlloader"
+RDEPEND="virtual/x11"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-makefile.patch
+
+	# 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
+}
+
+src_compile() {
+	emake || die
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15"
+	then
+		$(tc-getCC) -shared -nostdlib -o synaptics_drv.so synaptics_drv.o -Bstatic -lgcc
+	fi
+}
+
+src_install() {
+	# Yes, they got the DESTDIR stuff going. And there was much rejoicing.
+	make DESTDIR=${D} install || die
+	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15"
+	then
+		exeinto /usr/$(get_libdir)/xorg/modules/input
+		doexe synaptics_drv.so
+		rm ${D}/usr/$(get_libdir)/modules/input/synaptics_drv.o
+	fi
+
+	dodoc script/usbmouse alps.patch
+	dodoc COMPATIBILITY FILES INSTALL* LICENSE NEWS TODO README*
+
+	# Stupid new daemon, didn't work for me because of shm issues
+	exeinto /etc/init.d && newexe ${FILESDIR}/rc.init syndaemon
+	insinto /etc/conf.d && newins ${FILESDIR}/rc.conf syndaemon
+}