Pulling 0.11.8. Force >=xfree-4.3.0-r4, so it doesn't overwrite files xfree provides.

5 files changed, 12 insertions, 48 deletions

diff --git a/x11-misc/synaptics/ChangeLog b/x11-misc/synaptics/ChangeLog
index 199ca68d3292..0cd34a3d4ca6 100644
--- a/x11-misc/synaptics/ChangeLog
+++ b/x11-misc/synaptics/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/synaptics
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.2 2003/10/27 18:44:27 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.3 2003/11/10 04:15:57 spyderous Exp $
+
+  09 Nov 2003; root <root@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)
 
diff --git a/x11-misc/synaptics/Manifest b/x11-misc/synaptics/Manifest
index 72dbf977a1c5..262a8b8f40c7 100644
--- a/x11-misc/synaptics/Manifest
+++ b/x11-misc/synaptics/Manifest
@@ -1,7 +1,5 @@
-MD5 47130fb20be16c52688c5178180cae69 ChangeLog 626
+MD5 4b88e27d3f75a9cf866576417e74511e ChangeLog 807
 MD5 6d74d543e3f641839881cda58499b797 metadata.xml 250
-MD5 1de9a2828ab43efaa2aa8fc353066d77 synaptics-0.11.8.ebuild 1188
-MD5 9924c650ee44c935288a811d47d12dcd synaptics-0.12.0.ebuild 1194
-MD5 c3238ddaf0b0d3f560cb54e5c113bfef files/digest-synaptics-0.11.8 69
-MD5 3f3218b104c0f1e2a64462e08e8e3651 files/synaptics-0.11.8-makefile-fixup.patch 457
+MD5 b76a0f50f8ef2727cbb6ecc2db038465 synaptics-0.12.0.ebuild 1222
 MD5 849a8f1a03c90c03b638548cc99f131f files/digest-synaptics-0.12.0 69
+MD5 3f3218b104c0f1e2a64462e08e8e3651 files/synaptics-0.11.8-makefile-fixup.patch 457
diff --git a/x11-misc/synaptics/files/digest-synaptics-0.11.8 b/x11-misc/synaptics/files/digest-synaptics-0.11.8
deleted file mode 100644
index 594c6ee7a78f..000000000000
--- a/x11-misc/synaptics/files/digest-synaptics-0.11.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48c6e9abc68672d5167f1b699b89005e synaptics-0.11.8.tar.bz2 129459
diff --git a/x11-misc/synaptics/synaptics-0.11.8.ebuild b/x11-misc/synaptics/synaptics-0.11.8.ebuild
deleted file mode 100644
index a15eeeb8df03..000000000000
--- a/x11-misc/synaptics/synaptics-0.11.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.11.8.ebuild,v 1.1 2003/10/13 21:36:01 spyderous Exp $
-
-# This ebuild overwrites synaptics files installed by <= xfree-4.3.0-r3
-# 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="nls"
-DEPEND="virtual/x11"
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-
-	# This Makefile sucks. no prefix, no DESTDIR, nothing useful.
-	# At some point I'd like to fix that and submit upstream.
-	# It still doesn't respect CFLAGS.
-	epatch ${FILESDIR}/${PF}-makefile-fixup.patch
-
-	# If we don't do this, it won't compile anything and use binaries instead.
-	rm ${PN}/{*.o,synclient}
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/X11R6/{bin,lib/modules/input}
-	make install || die
-	dodoc {COMPATIBILITY,FEATURES,FILES,INSTALL,LICENSE,NEWS,PARAMETER,TODO,VERSION}
-	use nls && dodoc INSTALL.DE
-}
diff --git a/x11-misc/synaptics/synaptics-0.12.0.ebuild b/x11-misc/synaptics/synaptics-0.12.0.ebuild
index 0410a97c885b..20dca1c7f5de 100644
--- a/x11-misc/synaptics/synaptics-0.12.0.ebuild
+++ b/x11-misc/synaptics/synaptics-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.12.0.ebuild,v 1.1 2003/10/27 18:44:27 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.12.0.ebuild,v 1.2 2003/11/10 04:15:57 spyderous Exp $
 
 # This ebuild overwrites synaptics files installed by <= xfree-4.3.0-r3
 # and xfree-4.3.99.14 >= X >= xfree-4.3.99.8.
@@ -12,7 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="nls"
-DEPEND="virtual/x11"
+RDEPEND="virtual/x11
+	>=x11-base/xfree-4.3.0-r4"
 S=${WORKDIR}/${PN}
 
 src_unpack() {