Add 'keepdir /var/lib/xkb'. (Bug #154287, Chuck Wegrzyn for the report and

Jakub Moc for diagnosing.)  While this should only affect people who emerge
xkbcomp twice before emerging xorg-server, this could change in the future.
(Portage version: 2.1.2_rc1-r4)

3 files changed, 39 insertions, 1 deletions

diff --git a/x11-apps/xkbcomp/ChangeLog b/x11-apps/xkbcomp/ChangeLog
index e8625e48ac7b..735cef45c9b3 100644
--- a/x11-apps/xkbcomp/ChangeLog
+++ b/x11-apps/xkbcomp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-apps/xkbcomp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.31 2006/10/10 23:55:19 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.32 2006/11/07 03:07:06 joshuabaergen Exp $
+
+*xkbcomp-1.0.2-r1 (07 Nov 2006)
+
+  07 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbcomp-1.0.2-r1.ebuild:
+  Add 'keepdir /var/lib/xkb'.  (Bug #154287, Chuck Wegrzyn for the report and
+  Jakub Moc for diagnosing.)  While this should only affect people who emerge
+  xkbcomp twice before emerging xorg-server, this could change in the future.
 
   10 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; xkbcomp-1.0.2.ebuild:
   Update description to be less generic.
diff --git a/x11-apps/xkbcomp/files/digest-xkbcomp-1.0.2-r1 b/x11-apps/xkbcomp/files/digest-xkbcomp-1.0.2-r1
new file mode 100644
index 000000000000..b73dd25edb84
--- /dev/null
+++ b/x11-apps/xkbcomp/files/digest-xkbcomp-1.0.2-r1
@@ -0,0 +1,3 @@
+MD5 8b22a5e6d780ec70bf98d31cdbd65658 xkbcomp-1.0.2.tar.bz2 185124
+RMD160 9d20df260ab15711b5c3ceb8c75019b5fbb5149f xkbcomp-1.0.2.tar.bz2 185124
+SHA256 45723b0c81473cdd58702c640bf0946d1aa664636fa0e86ec78c3716e5a5c2f7 xkbcomp-1.0.2.tar.bz2 185124
diff --git a/x11-apps/xkbcomp/xkbcomp-1.0.2-r1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..c44eae21bc34
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.0.2-r1.ebuild,v 1.1 2006/11/07 03:07:06 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+DESCRIPTION="compile XKB keyboard description"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	x-modular_src_install
+
+	dodir usr/share/X11/xkb
+	dosym ../../../bin/xkbcomp /usr/share/X11/xkb/xkbcomp
+
+	# (#122214) We should create this directory here, since xkeyboard-config
+	# and any other set of layouts will symlink to it.
+	dodir /var/lib/xkb
+	keepdir /var/lib/xkb
+}