Hardcore 0.13.4 bumpage. Now with spring cleaning.

6 files changed, 25 insertions, 46 deletions

diff --git a/x11-misc/synaptics/ChangeLog b/x11-misc/synaptics/ChangeLog
index fc014201d055..2ad280843fd9 100644
--- a/x11-misc/synaptics/ChangeLog
+++ b/x11-misc/synaptics/ChangeLog
@@ -1,6 +1,15 @@
 # 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.24 2004/07/18 22:25:57 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.25 2004/08/05 03:47:15 battousai Exp $
+
+  18 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> files/rc.init:
+  Added full path to syndaemon in initscript, closing #56827.
+
+*synaptics-0.13.4 (04 Aug 2004)
+
+  04 Aug 2004; Bryan Stine <battousai@gentoo.org>; -synaptics-0.12.4.ebuild,
+  -synaptics-0.12.5.ebuild, +synaptics-0.13.4.ebuild:
+  Version bump to 0.13.4. Cleaned out pre 0.13 ebuilds.
 
   18 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> files/rc.init:
   Added full path to syndaemon in initscript, closing #56827.
diff --git a/x11-misc/synaptics/files/digest-synaptics-0.12.4 b/x11-misc/synaptics/files/digest-synaptics-0.12.4
deleted file mode 100644
index dd6f1e18e51d..000000000000
--- a/x11-misc/synaptics/files/digest-synaptics-0.12.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d9dbbd3cc17e39515b254da8e28a40ec synaptics-0.12.4.tar.bz2 104342
diff --git a/x11-misc/synaptics/files/digest-synaptics-0.12.5 b/x11-misc/synaptics/files/digest-synaptics-0.12.5
deleted file mode 100644
index 695d4b8cd3ef..000000000000
--- a/x11-misc/synaptics/files/digest-synaptics-0.12.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52e2a6436f7e6d7ebb0c8068027c7c3f synaptics-0.12.5.tar.bz2 105847
diff --git a/x11-misc/synaptics/files/digest-synaptics-0.13.4 b/x11-misc/synaptics/files/digest-synaptics-0.13.4
new file mode 100644
index 000000000000..6a9bb52e91cf
--- /dev/null
+++ b/x11-misc/synaptics/files/digest-synaptics-0.13.4
@@ -0,0 +1 @@
+MD5 4a593cd3476c2c8a2d664043f5ac466d synaptics-0.13.4.tar.bz2 116044
diff --git a/x11-misc/synaptics/synaptics-0.12.4.ebuild b/x11-misc/synaptics/synaptics-0.12.4.ebuild
deleted file mode 100644
index f7c38ec0113c..000000000000
--- a/x11-misc/synaptics/synaptics-0.12.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.12.4.ebuild,v 1.7 2004/06/28 20:14:38 agriffis 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/xfree-4.3.0-r6"
-DEPEND=">=sys-apps/sed-4"
-
-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
-}
-
-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,VERSION,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
-}
diff --git a/x11-misc/synaptics/synaptics-0.12.5.ebuild b/x11-misc/synaptics/synaptics-0.13.4.ebuild
index 1e9478c399da..5bbbd1f7bd32 100644
--- a/x11-misc/synaptics/synaptics-0.12.5.ebuild
+++ b/x11-misc/synaptics/synaptics-0.13.4.ebuild
@@ -1,6 +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.12.5.ebuild,v 1.7 2004/06/28 20:14:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.4.ebuild,v 1.1 2004/08/05 03:47:15 battousai Exp $
+
+inherit 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.
@@ -10,18 +12,27 @@ 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"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
-RDEPEND="|| ( >=x11-base/xfree-4.3.0-r6 x11-base/xorg-x11 )"
+RDEPEND="|| ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 )"
 DEPEND=">=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+	# Fixes runtime brokenness with amd64 (bug 50384)
+	if [ "${ARCH}" == "amd64" ]
+	then
+		einfo "Patching for amd64 arch..."
+		epatch ${FILESDIR}/${P}-amd64.patch
+	fi
+
 	# 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() {