0.13.3 goes bump in the night

4 files changed, 51 insertions, 83 deletions

diff --git a/x11-misc/synaptics/ChangeLog b/x11-misc/synaptics/ChangeLog
index f5dfd5481909..4b42c31c4735 100644
--- a/x11-misc/synaptics/ChangeLog
+++ b/x11-misc/synaptics/ChangeLog
@@ -1,89 +1,14 @@
 # ChangeLog for x11-misc/synaptics
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.19 2004/06/13 05:42:18 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.20 2004/06/15 02:26:10 battousai Exp $
 
-  13 Jun 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.12.4.ebuild,
-  synaptics-0.12.5.ebuild, synaptics-0.13.2.ebuild:
-  Reverting DEPEND change back to xfree -r6 as xfree -r7 is still masked.
+*synaptics-0.13.3 (14 Jun 2004)
 
-  11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  synaptics-0.12.4.ebuild, synaptics-0.12.5.ebuild, synaptics-0.13.2.ebuild:
-  xfree -r6 became -r7.
+  14 Jun 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.13.3.ebuild:
+  Bumped version to 0.13.3.
 
-  31 May 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.13.2.ebuild:
-  Add back the xorg-x11 RDEPEND. Fixes 52627, thanks to Ta^3 on FreeNode.
+*synaptics-0.13.2-r1 14 Jun 2004
 
-  31 May 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.13.2.ebuild:
-  Added a little sed magic to change the MANDIR to /usr/man/man1 instead of
-  /usr/local... Thanks to Simon Cooper <thecoop@runbox.com> for reporting the
-  bug.
-
-*synaptics-0.13.2 (10 May 2004)
-
-  10 May 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.13.2.ebuild:
-  Version bump. Upstream made quite a few cleanups, some bug fixes and a few new
-  features.
-
-  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  synaptics-0.12.5.ebuild:
-  Missing space in DEPEND.
-
-  07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  synaptics-0.12.5.ebuild:
-  Add xorg-x11 to possible.
-
-*synaptics-0.12.5 (31 Mar 2004)
-
-  31 Mar 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.12.5.ebuild:
-  Version bumpity.
-
-  23 Feb 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.12.4.ebuild:
-  Oops. Fixed my stupid RDEPEND mistake.
-
-*synaptics-0.12.4 (19 Feb 2004)
-
-  19 Feb 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.12.4.ebuild:
-  Version bump. This version has some good upstream Makefile fixes, including
-  DESTDIR compliance and ability to detect and build against XFree86 SDK
-  headers.
-
-  15 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
-  Removing myself as primary maintainer, this is now a herd thing.
-
-  15 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; files/rc.init:
-  Fix typo.
-
-  15 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; files/rc.conf,
-  files/rc.init:
-  Somehow I forgot to add the init.d and conf.d scripts for syndaemon, and
-  nobody even noticed.
-
-  23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; synaptics-0.12.0.ebuild:
-  Re-marking as testing, it's not allowed to depend on something unstable.
-
-  23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; synaptics-0.12.0.ebuild:
-  Stable on x86.
-
-*synaptics-0.12.1 (23 Nov 2003)
-
-  23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; synaptics-0.12.1.ebuild:
-  Bump. New daemon, seems a little broken though.
-
-  09 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; synaptics-0.11.8.ebuild,
-  synaptics-0.12.0.ebuild:
-  Pulling 0.11.8. Force >=xfree-4.3.0-r4, so it doesn't overwrite files xfree
-  provides.
-
-*synaptics-0.12.0 (27 Oct 2003)
-
-  27 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>;
-  synaptics-0.12.0.ebuild:
-  Version bump.
-
-*synaptics-0.11.8 (13 Oct 2003)
-
-  13 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml,
-  synaptics-0.11.8.ebuild, files/synaptics-0.11.8-makefile-fixup.patch:
-  Initial commit of standalone Synaptics touchpad driver, to be used in future
-  XFree revisions.
+  14 Jun 2004;  <> 
+  Version bump to 0.13.3.
 
diff --git a/x11-misc/synaptics/Manifest b/x11-misc/synaptics/Manifest
index 953e070b27c8..70ecbf0150ff 100644
--- a/x11-misc/synaptics/Manifest
+++ b/x11-misc/synaptics/Manifest
@@ -1,10 +1,12 @@
-MD5 96359dec0b065b59707540318da6a150 ChangeLog 3340
+MD5 d56a90e0abf708323f42161034580426 ChangeLog 440
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
 MD5 e23dd554dd9b9c528e256a1cc10e46b1 synaptics-0.12.4.ebuild 1433
 MD5 c12ef59e09df896a4e0a1ab8e9403f3b synaptics-0.12.5.ebuild 1450
 MD5 bcb9d492a11cfec17ec5e02811555ed3 synaptics-0.13.2.ebuild 1528
+MD5 0db1610bbe2f18ff1ee2006c87880810 synaptics-0.13.3.ebuild 1528
 MD5 25a7ae3ea74428b36c8dd31f534cb6b9 files/digest-synaptics-0.12.4 69
 MD5 746796f56c85d126597fdb941955bf75 files/digest-synaptics-0.12.5 69
 MD5 8d49e63422d422937e1e5233e699ff91 files/rc.conf 338
 MD5 208044aedda21f4fd8f475de90dcfe9f files/rc.init 439
 MD5 974307d7b549ab336323bab7649826b3 files/digest-synaptics-0.13.2 69
+MD5 5e3c184b3990f57f3fa9ff43775a7a52 files/digest-synaptics-0.13.3 69
diff --git a/x11-misc/synaptics/files/digest-synaptics-0.13.3 b/x11-misc/synaptics/files/digest-synaptics-0.13.3
new file mode 100644
index 000000000000..c1a096d4eca6
--- /dev/null
+++ b/x11-misc/synaptics/files/digest-synaptics-0.13.3
@@ -0,0 +1 @@
+MD5 d2a3c9cfc3147f08a7f67c001fc3e18d synaptics-0.13.3.tar.bz2 113787
diff --git a/x11-misc/synaptics/synaptics-0.13.3.ebuild b/x11-misc/synaptics/synaptics-0.13.3.ebuild
new file mode 100644
index 000000000000..c64d8a22cfcc
--- /dev/null
+++ b/x11-misc/synaptics/synaptics-0.13.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.3.ebuild,v 1.1 2004/06/15 02:26:10 battousai Exp $
+
+# 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"
+IUSE=""
+RDEPEND="|| ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 )"
+
+src_unpack() {
+	unpack ${A}
+
+	# 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: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
+}