fix the build system to not install into /usr/local. I really should not be checking version bumps in with such a hurry (ironic given how long the ebuild languished in bugzilla). Anyway, this fixes the install location of the binaries and the man pages. Closes bug #140388 by Martin Wegner

Package-Manager: portage-2.1.1_pre2-r8

3 files changed, 11 insertions, 69 deletions

diff --git a/x11-drivers/synaptics/Manifest b/x11-drivers/synaptics/Manifest
index 92582c8fabef..42c5d826d0ff 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -42,14 +42,14 @@ EBUILD synaptics-0.14.4-r2.ebuild 2004 RMD160 d14571096ed050e90e0b5fda50841f3fec
 MD5 6616b2f27beaa106520f17c421615de8 synaptics-0.14.4-r2.ebuild 2004
 RMD160 d14571096ed050e90e0b5fda50841f3fec2f2aa6 synaptics-0.14.4-r2.ebuild 2004
 SHA256 2b64412f5d5f07d949fe5425eb0a6dc8a3e6bbcd6f5984b0beca03d6cc51f0f1 synaptics-0.14.4-r2.ebuild 2004
-EBUILD synaptics-0.14.5.ebuild 1472 RMD160 a9ea5041493eb55bd9280087dfa4068d805c076a SHA1 f60404389912ca8f9c439726e5e57e35b861e056 SHA256 5ba2372f89c92bce00ab3623165e53aa7e4eedb77b9d0a7f1562ff711900de27
-MD5 7f1484cdafe30b585bb8893619b63bce synaptics-0.14.5.ebuild 1472
-RMD160 a9ea5041493eb55bd9280087dfa4068d805c076a synaptics-0.14.5.ebuild 1472
-SHA256 5ba2372f89c92bce00ab3623165e53aa7e4eedb77b9d0a7f1562ff711900de27 synaptics-0.14.5.ebuild 1472
-MISC ChangeLog 12113 RMD160 a7f68b9d8700542c6470aaef7769b972b727da37 SHA1 bbda815234d0d3ef4d957f9296b33dcf458a488d SHA256 93f1ae450a8d52275c10199b2dc9b6ea910f67cb23c82db2d4753e195a025d11
-MD5 2f77022e4c40ca6fcdad43359eeda0ec ChangeLog 12113
-RMD160 a7f68b9d8700542c6470aaef7769b972b727da37 ChangeLog 12113
-SHA256 93f1ae450a8d52275c10199b2dc9b6ea910f67cb23c82db2d4753e195a025d11 ChangeLog 12113
+EBUILD synaptics-0.14.5-r1.ebuild 1506 RMD160 9cfc5cd6076b79b6a1abccdc5a2f20378a7321a5 SHA1 607a20eb6bcf8a0fc67890c1238a581a84eb69ee SHA256 a20aeaac034f588fdba65fe2f536aef380bb5aa4103f394c96b69ac62d730d10
+MD5 6b8c3b328fddea2c6c6115b0b6df2a8b synaptics-0.14.5-r1.ebuild 1506
+RMD160 9cfc5cd6076b79b6a1abccdc5a2f20378a7321a5 synaptics-0.14.5-r1.ebuild 1506
+SHA256 a20aeaac034f588fdba65fe2f536aef380bb5aa4103f394c96b69ac62d730d10 synaptics-0.14.5-r1.ebuild 1506
+MISC ChangeLog 12557 RMD160 239a787c2e14ee5d50882bf67259aa1f29812d2d SHA1 27ee27866fa2a764b3e18ca868b5251244b86b16 SHA256 aff9e6cca02f207d0951603442ec8a25c641381af182e21ac9de942547db1fcc
+MD5 8c4ed5f793d0063d1e4c33ce64c94d0c ChangeLog 12557
+RMD160 239a787c2e14ee5d50882bf67259aa1f29812d2d ChangeLog 12557
+SHA256 aff9e6cca02f207d0951603442ec8a25c641381af182e21ac9de942547db1fcc ChangeLog 12557
 MISC metadata.xml 164 RMD160 5373055a0dacd7370f8f01ff476a6b76bceef186 SHA1 7b9c22cf95f8ebf5d6f244335c78af0b1d88e67a SHA256 d955cca268e81931ac6f8178cc167772f3fc4f10a1dea5a094f3c2a246883c58
 MD5 1cb923bfa5e7e99ae6804f147a1c730c metadata.xml 164
 RMD160 5373055a0dacd7370f8f01ff476a6b76bceef186 metadata.xml 164
@@ -63,6 +63,6 @@ SHA256 3dbd4bc49b7ea3d7ad63c6242ef59f83fb7280345c4904f7ad5d76cd5c5ee8d5 files/di
 MD5 de9c19102725341384275dda3c7ca6f1 files/digest-synaptics-0.14.4-r2 253
 RMD160 696a694eeb99a77465dfbc589c52e90904969779 files/digest-synaptics-0.14.4-r2 253
 SHA256 324702a3280a6fc39d42dc05c086ec77bc24646c625a86dc5eb3f2f6ff15e4ff files/digest-synaptics-0.14.4-r2 253
-MD5 d9cc3d22853a47c6e95c32842efe1057 files/digest-synaptics-0.14.5 253
-RMD160 b26b8bd28bb98319c613b3ab0502c92f7425a322 files/digest-synaptics-0.14.5 253
-SHA256 6969eb41c5136248f5548758049db81116899e04b9b15aad3207762cb68f408c files/digest-synaptics-0.14.5 253
+MD5 d9cc3d22853a47c6e95c32842efe1057 files/digest-synaptics-0.14.5-r1 253
+RMD160 b26b8bd28bb98319c613b3ab0502c92f7425a322 files/digest-synaptics-0.14.5-r1 253
+SHA256 6969eb41c5136248f5548758049db81116899e04b9b15aad3207762cb68f408c files/digest-synaptics-0.14.5-r1 253
diff --git a/x11-drivers/synaptics/files/digest-synaptics-0.14.5 b/x11-drivers/synaptics/files/digest-synaptics-0.14.5
deleted file mode 100644
index 9bc140596c4e..000000000000
--- a/x11-drivers/synaptics/files/digest-synaptics-0.14.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aab6dc3f18344cdac7ef16e441cdc2c7 synaptics-0.14.5.tar.bz2 126743
-RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c18893 synaptics-0.14.5.tar.bz2 126743
-SHA256 aaad8ee83d5c6fd1e46be7201086645bd271281843751f850d345c7a9545b796 synaptics-0.14.5.tar.bz2 126743
diff --git a/x11-drivers/synaptics/synaptics-0.14.5.ebuild b/x11-drivers/synaptics/synaptics-0.14.5.ebuild
deleted file mode 100644
index 9135a294ba04..000000000000
--- a/x11-drivers/synaptics/synaptics-0.14.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.5.ebuild,v 1.1 2006/07/12 14:11:44 seemant Exp $
-
-inherit toolchain-funcs eutils
-
-IUSE="dlloader"
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
-DEPEND="${RDEPEND}
-	|| ( x11-base/xorg-server virtual/x11 )
-	>=sys-apps/sed-4"
-
-PREFIX="${D}/usr"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || has_version ">=x11-base/xorg-server-0.99"
-	then
-		epatch ${FILESDIR}/${PF}-makefile-fpic.patch
-	fi
-
-	# Compilation fix for xorg-7.1
-	epatch ${FILESDIR}/${P}-xorg-7.1-compile-fix.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
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc script/usbmouse script/usbhid alps.patch trouble-shooting.txt
-	dodoc COMPATIBILITY FILES INSTALL* LICENSE NEWS TODO README*
-
-	# Stupid new daemon, didn't work for me because of shm issues
-	newinitd ${FILESDIR}/rc.init syndaemon
-	newconfd ${FILESDIR}/rc.conf syndaemon
-}