summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2008-09-12 09:58:06 +0000
committerTony Vroon <chainsaw@gentoo.org>2008-09-12 09:58:06 +0000
commit02b527ec5ee9471abad7bfddf08111d48cabbf87 (patch)
treee8f0418b5e59263b48b4628f4fdcb8e68e51572a /x11-drivers
parentadd x11-libs/libnotify to dependencies as reported on bug 226119 by Marek Mil... (diff)
downloadhistorical-02b527ec5ee9471abad7bfddf08111d48cabbf87.tar.gz
historical-02b527ec5ee9471abad7bfddf08111d48cabbf87.tar.bz2
historical-02b527ec5ee9471abad7bfddf08111d48cabbf87.zip
Install upstream FDI file instead of trying to overwrite it with our own. Upstream has added more data to the file then our copy ever had. Delete older ebuilds.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5-00131-g5f17cfc-dirty x86_64
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/xf86-input-synaptics/ChangeLog13
-rw-r--r--x11-drivers/xf86-input-synaptics/Manifest14
-rw-r--r--x11-drivers/xf86-input-synaptics/files/synaptics-fix-explosion.patch13
-rw-r--r--x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch14
-rw-r--r--x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild69
-rw-r--r--x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r1.ebuild (renamed from x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2.ebuild)13
6 files changed, 20 insertions, 116 deletions
diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index da410088e1d7..517ac1fbe738 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for x11-drivers/xf86-input-synaptics
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.10 2008/09/11 14:14:19 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.11 2008/09/12 09:58:06 chainsaw Exp $
+
+*xf86-input-synaptics-0.15.2-r1 (12 Sep 2008)
+
+ 12 Sep 2008; <chainsaw@gentoo.org> -files/synaptics-fix-explosion.patch,
+ -files/synaptics-xorg-version.patch,
+ -xf86-input-synaptics-0.15.1-r1.ebuild,
+ -xf86-input-synaptics-0.15.2.ebuild,
+ +xf86-input-synaptics-0.15.2-r1.ebuild:
+ Install upstream FDI file instead of trying to overwrite it with our own.
+ Upstream has added more data to the file then our copy ever had. Delete
+ older ebuilds.
*xf86-input-synaptics-0.15.2 (11 Sep 2008)
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 26c200b08401..36ebac15083d 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -4,19 +4,15 @@ Hash: SHA1
AUX 11-x11-synaptics.fdi 593 RMD160 5b2d387e22b2dfd340e6e5e508f5b07bd916f5fc SHA1 f8985d0324efceb86ca18418df16222b773bf798 SHA256 f904632ce695305ec6384a615c1ebb317ed40249a34c57149a06f9da0f775fdc
AUX rc.conf 342 RMD160 65e507598001c497dec7b05ab5bb8e06ff1aac7a SHA1 cc76b983b33f8eb5c3624ba78db206781eab81bb SHA256 3334b80cd39226fafd948e16114ab094fffe9455625f608c80f8287a006d0716
AUX rc.init 452 RMD160 202287feac6c79276fac32987cb1d75158bacfee SHA1 db38171e0c8e1d777ae8af2ce81e43950137892f SHA256 0d735340a0adb2e5e6c902253d4ef68fd80c3001b0ed31ea70d2a2690d738a1a
-AUX synaptics-fix-explosion.patch 657 RMD160 44c4b8230aeafab0264ab4ec1a2def4131b881eb SHA1 d452e5cc55fa047c36c5ad4c1a8e0e3cbdffd4bc SHA256 59587c82f10279b032d29c12ba07bd251b60fa463a2f0d082606dbe9b52c6c63
AUX synaptics-fix-xinerama.patch 752 RMD160 5017471df5c4f47382938ccff9bbd66033c06a6f SHA1 14b53a0c4090739ddc4cff9e9ad94cb9e2499c87 SHA256 7bdec4ef00a520d52e00b8a1d0b6d61e89fde910e28baa306b8be23dd7aadd64
-AUX synaptics-xorg-version.patch 581 RMD160 eab8463f1fe5e78d6da033fcecdbd5714fce1287 SHA1 fd4e7e691b30f5571bc8905780dd16db1790f689 SHA256 39445b88a5ec8e82da69c3b93003af26e14c964fbf63710ae56e1204dc8e29e2
-DIST xf86-input-synaptics-0.15.1.tar.bz2 287827 RMD160 561971ec7cb144fdd3e246ac902b092d3171aa46 SHA1 74a986265570e0a25eb1e9a880a04653d48d7bd1 SHA256 9053f4bede4fbb5a27bf013445dd2a8389b039bc7fab208688db1afbc89aa47a
DIST xf86-input-synaptics-0.15.2.tar.bz2 288531 RMD160 621cd40df0d22173bb7c4896fbff0ec9338c7853 SHA1 35c29129cfd529d185b28a8137b0541cabc00ed4 SHA256 d61f13acc20063665b79a639bf761f8efafde30598a9c400da877548d1a6e7bb
-EBUILD xf86-input-synaptics-0.15.1-r1.ebuild 2049 RMD160 1c0e2527a8eedd5a8682e7466b191f05502b232c SHA1 bf04620877188cff6ef1788ed66ab549658c7792 SHA256 9d64498100837e2580a514a0a1b503f8d1484098a9df68e37d8c4c120cc15909
-EBUILD xf86-input-synaptics-0.15.2.ebuild 1919 RMD160 20b8e95a19570d362693f757b8629bde7e261224 SHA1 c5ac9687a123facc8cc8aea3bb6fdc66e5cd937c SHA256 3059fde4f98e717b12ff4c9857b5bb21b5607befc2d01ff8b488c498c54d90f3
-MISC ChangeLog 2739 RMD160 2bfb0cab92c32234a5c923a03d288373978c4d0b SHA1 901ba602a57bd9c1a64e167db88974f835eff72a SHA256 7979035ce63b774b294ac53f09e57661cbb66f8bc7b75be68fb5104cc0f576cc
+EBUILD xf86-input-synaptics-0.15.2-r1.ebuild 1725 RMD160 e60dae98a87cc46b3a572518c899ef5b986f5734 SHA1 56ee50177121bc04cb1996c15278b0c0b3fc89ad SHA256 af81d286569fa4da4057bc7955fd2d43dd28cc54f592c3ba62dbac08bdf6bae4
+MISC ChangeLog 3191 RMD160 c9d7057584d068111095dce920f9f7ad76108f5d SHA1 6315fc29de99432a101eae9bba6ea5a56d67bfb3 SHA256 8f9777fb367243c6a0fe806c83ab527ae1c6d42c4fd7d40152de1c0bfbc60515
MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkjJJ8QACgkQp5vW4rUFj5o58gCgmGUf9kKQdYXsEHXmwnMv2lBF
-8QcAn1efbBdjYQsTD4dGxb/W1dxkAppp
-=xjAq
+iEYEARECAAYFAkjKPTUACgkQp5vW4rUFj5oa4ACfXxY8/P4VNM7cSSPmGSqD1mnP
+pQQAoL2Yc+Z8WrkroVew6rGsKKLrl71P
+=If+l
-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-synaptics/files/synaptics-fix-explosion.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-fix-explosion.patch
deleted file mode 100644
index 90d8729d3d51..000000000000
--- a/x11-drivers/xf86-input-synaptics/files/synaptics-fix-explosion.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr xf86-input-synaptics-0.15.1.ORIG/src/synaptics.c xf86-input-synaptics-0.15.1/src/synaptics.c
---- xf86-input-synaptics-0.15.1.ORIG/src/synaptics.c 2008-09-10 13:54:55.000000000 +0100
-+++ xf86-input-synaptics-0.15.1/src/synaptics.c 2008-09-10 13:56:19.000000000 +0100
-@@ -176,7 +176,8 @@
- device = xf86FindOptionValue(local->options, "Device");
- if (!device) {
- device = xf86FindOptionValue(local->options, "Path");
-- xf86ReplaceStrOption(local->options, "Device", device);
-+ if (device)
-+ xf86ReplaceStrOption(local->options, "Device", device);
- }
- if (device && strstr(device, "/dev/input/event")) {
- #ifdef BUILD_EVENTCOMM
diff --git a/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch
deleted file mode 100644
index 6580385568d9..000000000000
--- a/x11-drivers/xf86-input-synaptics/files/synaptics-xorg-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c xf86-input-synaptics-0.15.0/src/synaptics.c
---- xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c 2008-08-23 22:19:55.000000000 +0100
-+++ xf86-input-synaptics-0.15.0/src/synaptics.c 2008-08-23 22:21:16.000000000 +0100
-@@ -136,8 +136,8 @@
- MODULEVENDORSTRING,
- MODINFOSTRING1,
- MODINFOSTRING2,
-- XF86_VERSION_CURRENT,
-- 1, 0, 0,
-+ XORG_VERSION_CURRENT,
-+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
- ABI_CLASS_XINPUT,
- ABI_XINPUT_VERSION,
- MOD_CLASS_XINPUT,
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild
deleted file mode 100644
index 940f19801951..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.1-r1.ebuild,v 1.1 2008/09/10 13:08:46 chainsaw Exp $
-
-inherit toolchain-funcs eutils linux-info x-modular
-
-DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-LICENSE="MIT"
-IUSE="hal"
-RDEPEND="x11-libs/libXext
- hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
- !x11-drivers/synaptics
- x11-base/xorg-server
- x11-proto/inputproto
- >=sys-apps/sed-4"
-
-evdev-input_check() {
- # Check kernel config for required event interface support (either
- # built-in or as a module. Bug #134309.
-
- ebegin "Checking kernel config for event device support"
- linux_chkconfig_present INPUT_EVDEV
- eend $?
-
- if [[ $? -ne 0 ]] ; then
- ewarn "Synaptics driver requires event interface support."
- ewarn "Please enable the event interface in your kernel config."
- ewarn "The option can be found at:"
- ewarn
- ewarn " Device Drivers"
- ewarn " Input device support"
- ewarn " -*- Generic input layer"
- ewarn " <*> Event interface"
- ewarn
- ewarn "Then rebuild the kernel or install the module."
- epause 5
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
- evdev-input_check
-}
-
-src_unpack() {
- x-modular_unpack_source
- # Fix to handle multiple screens through Xinerama properly. Bug #206614.
- epatch "${FILESDIR}"/synaptics-fix-xinerama.patch
- # Fix to not explode if no device and/or path are specified. Bug #237074.
- epatch "${FILESDIR}"/synaptics-fix-explosion.patch
-}
-
-src_install() {
- DOCS="INSTALL NEWS TODO README"
- x-modular_src_install
-
- # Stupid new daemon, didn't work for me because of shm issues
- newinitd "${FILESDIR}"/rc.init syndaemon
- newconfd "${FILESDIR}"/rc.conf syndaemon
-
- if use hal ; then
- # Have HAL assign this driver to supported touchpads.
- insinto /usr/share/hal/fdi/policy/10osvendor
- doins "${FILESDIR}"/11-x11-synaptics.fdi
- fi
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r1.ebuild
index 37f5c58f5f51..bc960a5ee5fa 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2.ebuild,v 1.1 2008/09/11 14:14:19 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r1.ebuild,v 1.1 2008/09/12 09:58:06 chainsaw Exp $
inherit toolchain-funcs eutils linux-info x-modular
@@ -8,9 +8,8 @@ DESCRIPTION="Driver for Synaptics touchpads"
HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
LICENSE="MIT"
-IUSE="hal"
-RDEPEND="x11-libs/libXext
- hal? ( sys-apps/hal )"
+IUSE=""
+RDEPEND="x11-libs/libXext"
DEPEND="${RDEPEND}
!x11-drivers/synaptics
x11-base/xorg-server
@@ -58,10 +57,4 @@ src_install() {
# Stupid new daemon, didn't work for me because of shm issues
newinitd "${FILESDIR}"/rc.init syndaemon
newconfd "${FILESDIR}"/rc.conf syndaemon
-
- if use hal ; then
- # Have HAL assign this driver to supported touchpads.
- insinto /usr/share/hal/fdi/policy/10osvendor
- doins "${FILESDIR}"/11-x11-synaptics.fdi
- fi
}