Add dependencies on new enough versions of hal and xorg-server for this to work consistently. Add a post-installation message of how to configure XKB with input-hotplug.

Package-Manager: portage-2.1.4_rc9

3 files changed, 36 insertions, 11 deletions

diff --git a/x11-drivers/xf86-input-evdev/ChangeLog b/x11-drivers/xf86-input-evdev/ChangeLog
index 7744d11ea633..69b5b9224211 100644
--- a/x11-drivers/xf86-input-evdev/ChangeLog
+++ b/x11-drivers/xf86-input-evdev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-input-evdev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.71 2008/01/10 18:11:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/ChangeLog,v 1.72 2008/01/13 09:38:01 dberkholz Exp $
+
+  13 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-input-evdev-1.2.0.ebuild:
+  Add dependencies on new enough versions of hal and xorg-server for this to
+  work consistently. Add a post-installation message of how to configure XKB
+  with input-hotplug.
 
   10 Jan 2008; Jeroen Roovers <jer@gentoo.org>
   xf86-input-evdev-1.2.0.ebuild:
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index 46a88c32db3f..a03fe872a4b6 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.1.2-CVS-20060520.patch 11768 RMD160 73f21e0b767c56c44999fb7453b9ba9b894cbce9 SHA1 ff6aefe0e419a8ba6d445ee86c32972f1a264698 SHA256 9589a75f4608f21a536dd5e15c33ca6eb819db43853bfac58a4665e8f11495bb
 MD5 0686c9788a832d37d4515e149c56300a files/1.1.2-CVS-20060520.patch 11768
 RMD160 73f21e0b767c56c44999fb7453b9ba9b894cbce9 files/1.1.2-CVS-20060520.patch 11768
@@ -39,14 +42,14 @@ EBUILD xf86-input-evdev-1.1.5-r2.ebuild 733 RMD160 b2eb691eded76f463b39cdb10f65b
 MD5 fd3c21bdf4832001cff655cffa56fa20 xf86-input-evdev-1.1.5-r2.ebuild 733
 RMD160 b2eb691eded76f463b39cdb10f65b7367de674ff xf86-input-evdev-1.1.5-r2.ebuild 733
 SHA256 cc25b4653af87a615991e6407c46ee83c4a085ed45581e83e4d3f5f19a5690c9 xf86-input-evdev-1.1.5-r2.ebuild 733
-EBUILD xf86-input-evdev-1.2.0.ebuild 596 RMD160 df7f27bef2ed9a9fdf4598004c7d1c192b23cb3c SHA1 5b9dd660b467d57934fa0a4c0f2353e76802dd70 SHA256 b2787fabea35e6aeb8cc457aeefe8ea8b17245a7c112f181705c8e769587346b
-MD5 57eab980001df72058a10a52875f91d2 xf86-input-evdev-1.2.0.ebuild 596
-RMD160 df7f27bef2ed9a9fdf4598004c7d1c192b23cb3c xf86-input-evdev-1.2.0.ebuild 596
-SHA256 b2787fabea35e6aeb8cc457aeefe8ea8b17245a7c112f181705c8e769587346b xf86-input-evdev-1.2.0.ebuild 596
-MISC ChangeLog 10688 RMD160 aa2476efc92d9e1f509ea0c78871ab235e3af904 SHA1 b1ea9abb78726387735e97bd094c101741593be3 SHA256 b124b365feac8875dea8161e6f147b894b71dffffa02c1026db40f1fb70888a9
-MD5 bf249034d6317afdc9c1d3a2579de8a0 ChangeLog 10688
-RMD160 aa2476efc92d9e1f509ea0c78871ab235e3af904 ChangeLog 10688
-SHA256 b124b365feac8875dea8161e6f147b894b71dffffa02c1026db40f1fb70888a9 ChangeLog 10688
+EBUILD xf86-input-evdev-1.2.0.ebuild 972 RMD160 32e6fbde949a74f1c926ec19643fcf097c613283 SHA1 8fddb9cde4ca94ab32b1f7c53de0ccba1976e033 SHA256 e0dd41d251232c948351b0dab374b3da105b2781a2578af58065fd78c1323992
+MD5 7eb7de96fb340be6f3b4bf02d22e7619 xf86-input-evdev-1.2.0.ebuild 972
+RMD160 32e6fbde949a74f1c926ec19643fcf097c613283 xf86-input-evdev-1.2.0.ebuild 972
+SHA256 e0dd41d251232c948351b0dab374b3da105b2781a2578af58065fd78c1323992 xf86-input-evdev-1.2.0.ebuild 972
+MISC ChangeLog 10959 RMD160 0d4b1e459902943d3b2d7cceb45ae68539279757 SHA1 18d3a27f4b2e67e0813979ef18f0682d67fbe169 SHA256 876f116e844e215b4b4ddd7152f90bb8b53d06d9ee81b36ee537036cbcc29819
+MD5 8327f59b3693fdf54ba36d975e35992f ChangeLog 10959
+RMD160 0d4b1e459902943d3b2d7cceb45ae68539279757 ChangeLog 10959
+SHA256 876f116e844e215b4b4ddd7152f90bb8b53d06d9ee81b36ee537036cbcc29819 ChangeLog 10959
 MISC metadata.xml 254 RMD160 4c78a3f1774bde4ae8506ab4619cd8b3f4ae2dde SHA1 3a5ad14cd125c6473ac6784ff8b64106d2d3f9b2 SHA256 b579362a5f108a6f8ba3ea99fcba0b7fa4fa91838428fba80e8c66ef12530cc8
 MD5 79146a48f239e23db7f46454196125d6 metadata.xml 254
 RMD160 4c78a3f1774bde4ae8506ab4619cd8b3f4ae2dde metadata.xml 254
@@ -66,3 +69,10 @@ SHA256 893ef0d18e3b233b117873e460eceaf308b9c89d21ab055a25dde434ee6f61b6 files/di
 MD5 d09c490d7c3dbd433f2be0692f400390 files/digest-xf86-input-evdev-1.2.0 527
 RMD160 360b00ac67d070f9c0ea7f1edd3b7a1a6f325e02 files/digest-xf86-input-evdev-1.2.0 527
 SHA256 db84db39fdca58c06835d08fcd263729b780fc8357fa5d768438e6f2de8906b8 files/digest-xf86-input-evdev-1.2.0 527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD4DBQFHidwOXVaO67S1rtsRAge9AJYwmpEISqhn+diBI6JUNRZ2Ki9YAKCHOXaW
+egW2ZgKPuQ3g/S+sKzgkCA==
+=Qi+0
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.2.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.2.0.ebuild
index bc7bc8d49ec2..d0f424da01c3 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.2.0.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.2.0.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-evdev/xf86-input-evdev-1.2.0.ebuild,v 1.4 2008/01/10 18:11:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-1.2.0.ebuild,v 1.5 2008/01/13 09:38:01 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -12,9 +12,18 @@ DESCRIPTION="Generic Linux input driver"
 
 KEYWORDS="~amd64 ~hppa ~x86"
 
-RDEPEND=">=x11-base/xorg-server-1.4"
+RDEPEND=">=x11-base/xorg-server-1.4.0.90
+	>=sys-apps/hal-0.5.10"
 DEPEND="${RDEPEND}
 	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
 	>=x11-proto/inputproto-1.4
 	x11-proto/randrproto
 	x11-proto/xproto"
+
+pkg_postinst() {
+	elog "If your XKB (keyboard settings) stopped working,"
+	elog "you may uninstall this driver or move your XKB configuration."
+	elog "Download an example from http://dev.gentoo.org/~compnerd/temp/hal-config-examples/"
+	elog "(these will be installed with sys-apps/hal soon),"
+	elog "and drop it into /etc/hal/fdi/policy/"
+}