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.
Package-Manager: portage-2.1.2_rc1-r4

4 files changed, 50 insertions, 5 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/Manifest b/x11-apps/xkbcomp/Manifest
index d675dbb08187..b4bc3339f169 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,12 +1,16 @@
 DIST xkbcomp-1.0.2.tar.bz2 185124 RMD160 9d20df260ab15711b5c3ceb8c75019b5fbb5149f SHA1 2e01ea15e85a815a40d028df794bdc41aed1a25c SHA256 45723b0c81473cdd58702c640bf0946d1aa664636fa0e86ec78c3716e5a5c2f7
+EBUILD xkbcomp-1.0.2-r1.ebuild 827 RMD160 12568319ca0a1fd608ec72f1670c2592bc97400d SHA1 fcd19abe8aa9865105336499fa69ea7c2157df51 SHA256 fcd0ad052c6917c90f2a7d7a23282a49b650bc504e4e5d2db8b2250a85ab62c2
+MD5 06a27763f607b3615aca3331f6c9f929 xkbcomp-1.0.2-r1.ebuild 827
+RMD160 12568319ca0a1fd608ec72f1670c2592bc97400d xkbcomp-1.0.2-r1.ebuild 827
+SHA256 fcd0ad052c6917c90f2a7d7a23282a49b650bc504e4e5d2db8b2250a85ab62c2 xkbcomp-1.0.2-r1.ebuild 827
 EBUILD xkbcomp-1.0.2.ebuild 785 RMD160 59abd490ed8bad9e15f92e1180a6fe97ce4813f8 SHA1 c1ae9475711c39bb7d35018fe79d5dec6acf4108 SHA256 c7febf7a2a7241b6f864a1c8e1af7cf1e0c83e4f0354b3c7c535f4bfedfee34b
 MD5 d75840876e6ce9d95c2c312a32cbd604 xkbcomp-1.0.2.ebuild 785
 RMD160 59abd490ed8bad9e15f92e1180a6fe97ce4813f8 xkbcomp-1.0.2.ebuild 785
 SHA256 c7febf7a2a7241b6f864a1c8e1af7cf1e0c83e4f0354b3c7c535f4bfedfee34b xkbcomp-1.0.2.ebuild 785
-MISC ChangeLog 3795 RMD160 7074a0ef88b2acf2ff17ddb22e8600073434d02e SHA1 35ad7635bbeb132d3a1d64dcc81f7e023c56b0a5 SHA256 8257f5b6e221d05ddac585d1e68e61b47bd2a23b21c6383af9b78dfaaa95c03d
-MD5 ae70c7bd2a4818349a3883a89d6c1c6c ChangeLog 3795
-RMD160 7074a0ef88b2acf2ff17ddb22e8600073434d02e ChangeLog 3795
-SHA256 8257f5b6e221d05ddac585d1e68e61b47bd2a23b21c6383af9b78dfaaa95c03d ChangeLog 3795
+MISC ChangeLog 4152 RMD160 0b8a529deaac98e9f59d770c76f0c5051792ef8e SHA1 2548e76a29a25decb45a7e651c0e9db543be0f7f SHA256 872bf617c10377fe417895ab9ba64de3e1e9172aa690f018da405e15a9ffeb2e
+MD5 0cfcaafafb802313683c7605ac8fc32d ChangeLog 4152
+RMD160 0b8a529deaac98e9f59d770c76f0c5051792ef8e ChangeLog 4152
+SHA256 872bf617c10377fe417895ab9ba64de3e1e9172aa690f018da405e15a9ffeb2e ChangeLog 4152
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -14,3 +18,6 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 f728baec0cf9c19b2533263270a77438 files/digest-xkbcomp-1.0.2 244
 RMD160 70c522ba2240a50453f23c3f7a068a05106a2729 files/digest-xkbcomp-1.0.2 244
 SHA256 bb55dd3c5db84fa3b905df117f4533dbc9cce7c283db72d5352128aa34fb1db3 files/digest-xkbcomp-1.0.2 244
+MD5 f728baec0cf9c19b2533263270a77438 files/digest-xkbcomp-1.0.2-r1 244
+RMD160 70c522ba2240a50453f23c3f7a068a05106a2729 files/digest-xkbcomp-1.0.2-r1 244
+SHA256 bb55dd3c5db84fa3b905df117f4533dbc9cce7c283db72d5352128aa34fb1db3 files/digest-xkbcomp-1.0.2-r1 244
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
+}