Version bump. CC substitution fixes. Bugs squashed: #56850, #67687. Thanks spyderous.

6 files changed, 67 insertions, 9 deletions

diff --git a/x11-misc/synaptics/ChangeLog b/x11-misc/synaptics/ChangeLog
index 83c01d85bc00..5b6cfb72c731 100644
--- a/x11-misc/synaptics/ChangeLog
+++ b/x11-misc/synaptics/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/synaptics
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.31 2004/10/04 06:07:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.32 2004/10/24 04:25:56 battousai Exp $
+
+*synaptics-0.13.6 (24 Oct 2004)
+
+  24 Oct 2004; <bryan@gentoo.org> synaptics-0.13.4.ebuild,
+  synaptics-0.13.5.ebuild, +synaptics-0.13.6.ebuild:
+  Bump to 0.13.6. Changed the ebuilds to use new gcc-config logic for the
+  Makefile substitution. The new logic fixes bug #67687. The version bump
+  should fix bug #56850 (broken ALPS patch). Thanks to Ben Taitelbaum
+  <btaitelb@cs.oberlin.edu> for feedback on the ALPS patch. Thanks to Donnie
+  Berkholz <spyderous@gentoo.org> for the new gcc-config stuff.
 
   03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
   synaptics-0.13.4.ebuild, synaptics-0.13.5.ebuild:
diff --git a/x11-misc/synaptics/Manifest b/x11-misc/synaptics/Manifest
index 73389d9a1bbc..03a913047722 100644
--- a/x11-misc/synaptics/Manifest
+++ b/x11-misc/synaptics/Manifest
@@ -1,9 +1,11 @@
 MD5 9c2eaacb4ca8199b934135a34be310ef ChangeLog 5216
 MD5 7fdeefd89269976f35269e66213a607c metadata.xml 156
 MD5 a590d361f01cf40d78c1ea2517aa92cd synaptics-0.13.4.ebuild 1705
-MD5 6f123c5756979645124c72a68d9add9f synaptics-0.13.5.ebuild 1539
-MD5 e46163bec0b3237d0d7e371b767cd077 files/rc.conf 329
+MD5 f183f6481477a9355c967308900e8ba4 synaptics-0.13.5.ebuild 1550
+MD5 f183f6481477a9355c967308900e8ba4 synaptics-0.13.6.ebuild 1550
 MD5 067a5ceccd7ad07ed61282df9322de1d files/digest-synaptics-0.13.4 69
 MD5 7a41d446ba0d6bdeafc8bae707000244 files/digest-synaptics-0.13.5 69
+MD5 e46163bec0b3237d0d7e371b767cd077 files/rc.conf 329
 MD5 6fd019ebb1dd7433d16845d73595f81b files/rc.init 440
 MD5 9baef68bd3cb3c6facda94f636743baf files/synaptics-0.13.4-amd64.patch 889
+MD5 a8b449fc485a0322cd253b93fc402721 files/digest-synaptics-0.13.6 69
diff --git a/x11-misc/synaptics/files/digest-synaptics-0.13.6 b/x11-misc/synaptics/files/digest-synaptics-0.13.6
new file mode 100644
index 000000000000..1d777ebadcb7
--- /dev/null
+++ b/x11-misc/synaptics/files/digest-synaptics-0.13.6
@@ -0,0 +1 @@
+MD5 5eb839232724fdb15028d0ae1aa76241 synaptics-0.13.6.tar.bz2 118768
diff --git a/x11-misc/synaptics/synaptics-0.13.4.ebuild b/x11-misc/synaptics/synaptics-0.13.4.ebuild
index 548d627c5431..9497ac299402 100644
--- a/x11-misc/synaptics/synaptics-0.13.4.ebuild
+++ b/x11-misc/synaptics/synaptics-0.13.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.4.ebuild,v 1.2 2004/10/04 06:07:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.4.ebuild,v 1.3 2004/10/24 04:25:56 battousai Exp $
 
-inherit eutils
+inherit gcc eutils
 
 # This ebuild overwrites synaptics files installed by <= xfree-4.3.0-r6
 # and xfree-4.3.99.14 >= X >= xfree-4.3.99.8.
@@ -30,7 +30,7 @@ src_unpack() {
 
 	# Put stuff into /usr/X11R6, also switch up the CC and CFLAGS stuff.
 	sed -i -e "s:BINDIR = \\\$(DESTDIR)/usr/local/bin:BINDIR = ${D}/usr/X11R6/bin:g" ${S}/Makefile
-	sed -i -e "s:CC = gcc:CC = ${CC}:g" ${S}/Makefile
+	sed -i -e "s:CC = gcc:CC = $(gcc-getCC):g" ${S}/Makefile
 	sed -i -e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" ${S}/Makefile
 	sed -i -e "s:MANDIR = .*:MANDIR = \\\$(DESTDIR)/usr/man/man1:" ${S}/Makefile
 }
diff --git a/x11-misc/synaptics/synaptics-0.13.5.ebuild b/x11-misc/synaptics/synaptics-0.13.5.ebuild
index edf8ad7f55a8..cb18bb6079c5 100644
--- a/x11-misc/synaptics/synaptics-0.13.5.ebuild
+++ b/x11-misc/synaptics/synaptics-0.13.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.5.ebuild,v 1.3 2004/10/04 06:07:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.5.ebuild,v 1.4 2004/10/24 04:25:56 battousai Exp $
 
-inherit eutils
+inherit gcc eutils
 
 # This ebuild overwrites synaptics files installed by <= xfree-4.3.0-r6
 # and xfree-4.3.99.14 >= X >= xfree-4.3.99.8.
@@ -24,7 +24,7 @@ src_unpack() {
 
 	# Put stuff into /usr/X11R6, also switch up the CC and CFLAGS stuff.
 	sed -i -e "s:BINDIR = \\\$(DESTDIR)/usr/local/bin:BINDIR = ${D}/usr/X11R6/bin:g" ${S}/Makefile
-	sed -i -e "s:CC = gcc:CC = ${CC}:g" ${S}/Makefile
+	sed -i -e "s:CC = gcc:CC = $(gcc-getCC):g" ${S}/Makefile
 	sed -i -e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" ${S}/Makefile
 	sed -i -e "s:MANDIR = .*:MANDIR = \\\$(DESTDIR)/usr/man/man1:" ${S}/Makefile
 }
diff --git a/x11-misc/synaptics/synaptics-0.13.6.ebuild b/x11-misc/synaptics/synaptics-0.13.6.ebuild
new file mode 100644
index 000000000000..d41b269bc5d1
--- /dev/null
+++ b/x11-misc/synaptics/synaptics-0.13.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.6.ebuild,v 1.1 2004/10/24 04:25:56 battousai Exp $
+
+inherit gcc eutils
+
+# This ebuild overwrites synaptics files installed by <= xfree-4.3.0-r6
+# and xfree-4.3.99.14 >= X >= xfree-4.3.99.8.
+
+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="x86 ~amd64"
+IUSE=""
+RDEPEND="virtual/x11"
+DEPEND=">=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Put stuff into /usr/X11R6, also switch up the CC and CFLAGS stuff.
+	sed -i -e "s:BINDIR = \\\$(DESTDIR)/usr/local/bin:BINDIR = ${D}/usr/X11R6/bin:g" ${S}/Makefile
+	sed -i -e "s:CC = gcc:CC = $(gcc-getCC):g" ${S}/Makefile
+	sed -i -e "s:CDEBUGFLAGS = -O2:CDEBUGFLAGS = ${CFLAGS}:g" ${S}/Makefile
+	sed -i -e "s:MANDIR = .*:MANDIR = \\\$(DESTDIR)/usr/man/man1:" ${S}/Makefile
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dodir /usr/X11R6/{bin,lib/modules/input}
+
+	# Yes, they got the DESTDIR stuff going. And there was much rejoicing.
+	make DESTDIR=${D} install || die
+	dodoc {script/usbmouse,alps.patch,COMPATIBILITY,FILES,INSTALL{,.DE},LICENSE,NEWS,TODO,README{,.alps}}
+	# 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
+}