We're installing to /usr/share, not /usr/lib. Change symlink origins, and install...

Package-Manager: portage-2.0.53_rc6

diff --git a/x11-misc/xkbdata/ChangeLog b/x11-misc/xkbdata/ChangeLog
index e9534c54843d1e3af46ff567b5a5756a70634089..8aec3deb521bba2f64134416f1c3c2d1d69563da 100644 (file)
--- a/x11-misc/xkbdata/ChangeLog
+++ b/x11-misc/xkbdata/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xkbdata
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/ChangeLog,v 1.9 2005/10/20 06:20:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/ChangeLog,v 1.10 2005/10/20 21:51:00 spyderous Exp $
+
+*xkbdata-0.99.1-r1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xkbdata-0.99.1-r1.ebuild:
+  We're installing to /usr/share, not /usr/lib. Change symlink origins, and
+  install an env.d file to CONFIG_PROTECT it.
 
 *xkbdata-0.99.1 (20 Oct 2005)
 

diff --git a/x11-misc/xkbdata/Manifest b/x11-misc/xkbdata/Manifest
index 2a152d7d92b36740157018fe629450a2e1cc7ee4..963546713926f891d75ae23ebad4cdbb29e14914 100644 (file)
--- a/x11-misc/xkbdata/Manifest
+++ b/x11-misc/xkbdata/Manifest
@@ -1,6 +1,8 @@
-MD5 11489bdc06e0172d26e365584b9b45f6 ChangeLog 1270
+MD5 ca20bc5390f48c58327f03da2d6fe16d ChangeLog 1508
+MD5 f0ef739d70033be02f2be2bf9509d032 files/digest-xkbdata-0.99.0 67
+MD5 68e33885db7307ec4b72a49293cc7e98 files/digest-xkbdata-0.99.1 67
+MD5 68e33885db7307ec4b72a49293cc7e98 files/digest-xkbdata-0.99.1-r1 67
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 e8d96809eb5009246c9e0ca1fdf87bfd xkbdata-0.99.0.ebuild 581
+MD5 68510dee580cd07740ef9b5a317f2249 xkbdata-0.99.1-r1.ebuild 664
 MD5 ad24f3ab0cdcb2208c54726097b1bab5 xkbdata-0.99.1.ebuild 587
-MD5 f0ef739d70033be02f2be2bf9509d032 files/digest-xkbdata-0.99.0 67
-MD5 68e33885db7307ec4b72a49293cc7e98 files/digest-xkbdata-0.99.1 67

diff --git a/x11-misc/xkbdata/files/digest-xkbdata-0.99.1-r1 b/x11-misc/xkbdata/files/digest-xkbdata-0.99.1-r1
new file mode 100644 (file)
index 0000000..dad556b
--- /dev/null
+++ b/x11-misc/xkbdata/files/digest-xkbdata-0.99.1-r1
@@ -0,0 +1 @@
+MD5 ea8b66b888f15f7f0feea994c867558b xkbdata-0.99.1.tar.bz2 279120

diff --git a/x11-misc/xkbdata/xkbdata-0.99.1-r1.ebuild b/x11-misc/xkbdata/xkbdata-0.99.1-r1.ebuild
new file mode 100644 (file)
index 0000000..f3d6ded
--- /dev/null
+++ b/x11-misc/xkbdata/xkbdata-0.99.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkbdata/xkbdata-0.99.1-r1.ebuild,v 1.1 2005/10/20 21:51:00 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular multilib
+
+DESCRIPTION="X.Org xkbdata data"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+RDEPEND="x11-apps/xkbcomp"
+DEPEND="${RDEPEND}"
+
+src_install() {
+       x-modular_src_install
+       keepdir /var/lib/xkb
+       dosym ../../../../var/lib/xkb /usr/share/X11/xkb/compiled
+       echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > ${T}/10xkbdata
+       doenvd ${T}/10xkbdata
+}