Add missing LSGT symbol to evdev symbols. (Dennis Schridde, Bug #145097)

This should fix the availability of <, > and | for users of this symbol list.
Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 99 insertions, 5 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index a579fabba6a6..8a70bd352a22 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.21 2006/08/16 18:06:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.22 2006/09/03 14:31:39 joshuabaergen Exp $
+
+*xkeyboard-config-0.8-r1 (03 Sep 2006)
+
+  03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/add_missing_lsgt.patch, +xkeyboard-config-0.8-r1.ebuild:
+  Add missing LSGT symbol to evdev symbols.  (Dennis Schridde, Bug #145097)
+  This should fix the availability of <, > and | for users of this symbol list.
 
   16 Aug 2006; Brent Baude <ranger@gentoo.org> xkeyboard-config-0.8.ebuild:
   Keywording ppc64 stable per MrBones request
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 0dd05c5fa324..73e7d99934b7 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,12 +1,20 @@
+AUX add_missing_lsgt.patch 270 RMD160 2984483a8d8f7b8d7731b8afdabf4fb0019d2dec SHA1 b59f558232d6cc56718e05bb5f34e9db4ccb32e7 SHA256 5d4d0df3b209900f3357b5953be51c6c5ae2e017829a4b081d95d0637dfa92ad
+MD5 514bf9ef9dd33fa911cdfb9af018ad59 files/add_missing_lsgt.patch 270
+RMD160 2984483a8d8f7b8d7731b8afdabf4fb0019d2dec files/add_missing_lsgt.patch 270
+SHA256 5d4d0df3b209900f3357b5953be51c6c5ae2e017829a4b081d95d0637dfa92ad files/add_missing_lsgt.patch 270
 DIST xkeyboard-config-0.8.tar.bz2 410194 RMD160 f870d34f97c677a542fd953e3767b9516d10347c SHA1 5309e5e68343e6e6949c954bdbd9b54cb1c1d628 SHA256 55994318727ecdb61a7937862a87262b32c3655e2a39fb50cff514fb92793abb
+EBUILD xkeyboard-config-0.8-r1.ebuild 1765 RMD160 ded137d14286ca32ab516a6370683ffb81cc7809 SHA1 9e9456810d35bceb49d298765fba2157f8abb84d SHA256 a5dffe6cf01497d85676cab77e5bcf047b845d64a3aaf8c82b15afd56dccd0a7
+MD5 47aaac58270f2afb3f04a2e75a06a237 xkeyboard-config-0.8-r1.ebuild 1765
+RMD160 ded137d14286ca32ab516a6370683ffb81cc7809 xkeyboard-config-0.8-r1.ebuild 1765
+SHA256 a5dffe6cf01497d85676cab77e5bcf047b845d64a3aaf8c82b15afd56dccd0a7 xkeyboard-config-0.8-r1.ebuild 1765
 EBUILD xkeyboard-config-0.8.ebuild 1642 RMD160 a321c22d4d81a4ef305527ff8a1d261deb67fe67 SHA1 c9583ae07946295c19b8c3d9151fa0782fd7af15 SHA256 fcfe177528f92a84598e5b2f782fef057f3faece30ef0eb313df6d796323c85b
 MD5 cd569728b716e5e04393e566dacf6171 xkeyboard-config-0.8.ebuild 1642
 RMD160 a321c22d4d81a4ef305527ff8a1d261deb67fe67 xkeyboard-config-0.8.ebuild 1642
 SHA256 fcfe177528f92a84598e5b2f782fef057f3faece30ef0eb313df6d796323c85b xkeyboard-config-0.8.ebuild 1642
-MISC ChangeLog 3628 RMD160 4a8cc6cc8cdbefdb0db7bb711da28a223952fe14 SHA1 ef3ffa5671d003acf14c6f3fc9005afe1aaf6276 SHA256 5dd194316e61352b70b1f789569239e7382cbab9b12f3af7e8426a3833299193
-MD5 02c3592f7310bc277dc0e39ca1ba53ab ChangeLog 3628
-RMD160 4a8cc6cc8cdbefdb0db7bb711da28a223952fe14 ChangeLog 3628
-SHA256 5dd194316e61352b70b1f789569239e7382cbab9b12f3af7e8426a3833299193 ChangeLog 3628
+MISC ChangeLog 3955 RMD160 2e3ca72cfae2d8eabfb32e3fb8f9593dfb9b01a3 SHA1 a4cca1ec226673034749ee5a1c4774911598cdd9 SHA256 939257bab5cf0df929882a5edda73a4e4376ccd26f49020f96111e5a45449513
+MD5 0c27db95d01251404f0fd7b0d444e56c ChangeLog 3955
+RMD160 2e3ca72cfae2d8eabfb32e3fb8f9593dfb9b01a3 ChangeLog 3955
+SHA256 939257bab5cf0df929882a5edda73a4e4376ccd26f49020f96111e5a45449513 ChangeLog 3955
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -14,3 +22,6 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 7abfaa44cecc68ea1068815755996365 files/digest-xkeyboard-config-0.8 265
 RMD160 f03f40dd363d369ecf4458b513f046a3dda03eb0 files/digest-xkeyboard-config-0.8 265
 SHA256 438b8fc9a828dafd69ef4899da66a338901f68494585afabd12db241b28f3d1f files/digest-xkeyboard-config-0.8 265
+MD5 7abfaa44cecc68ea1068815755996365 files/digest-xkeyboard-config-0.8-r1 265
+RMD160 f03f40dd363d369ecf4458b513f046a3dda03eb0 files/digest-xkeyboard-config-0.8-r1 265
+SHA256 438b8fc9a828dafd69ef4899da66a338901f68494585afabd12db241b28f3d1f files/digest-xkeyboard-config-0.8-r1 265
diff --git a/x11-misc/xkeyboard-config/files/add_missing_lsgt.patch b/x11-misc/xkeyboard-config/files/add_missing_lsgt.patch
new file mode 100644
index 000000000000..0f1f3752acbd
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/add_missing_lsgt.patch
@@ -0,0 +1,10 @@
+--- keycodes/evdev	2006/02/21 23:55:01	1.1
++++ keycodes/evdev	2006/04/19 23:56:39	1.2
+@@ -346,6 +346,7 @@
+ 	// <META> =   156; // <I1C>
+ 	// <SUPR> =   127; // <U7F>
+ 	// <HYPR> =   128; // <U80>
++	<LSGT> = 94;
+ 
+ 	indicator 1 = "Caps Lock";
+ 	indicator 2 = "Num Lock";
diff --git a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.8-r1 b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.8-r1
new file mode 100644
index 000000000000..5e692d8ed9bc
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.8-r1
@@ -0,0 +1,3 @@
+MD5 48e694ebe816065670dda2a36f0581a2 xkeyboard-config-0.8.tar.bz2 410194
+RMD160 f870d34f97c677a542fd953e3767b9516d10347c xkeyboard-config-0.8.tar.bz2 410194
+SHA256 55994318727ecdb61a7937862a87262b32c3655e2a39fb50cff514fb92793abb xkeyboard-config-0.8.tar.bz2 410194
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-0.8-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-0.8-r1.ebuild
new file mode 100644
index 000000000000..1adec65f7d07
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-0.8-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-0.8-r1.ebuild,v 1.1 2006/09/03 14:31:39 joshuabaergen Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="X keyboard configuration database"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
+~sparc ~x86 ~x86-fbsd"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+SRC_URI="http://xlibs.freedesktop.org/xkbdesc/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="x11-apps/xkbcomp
+	!x11-misc/xkbdata"
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser"
+
+pkg_setup() {
+	# (#130590) The old XKB directory can screw stuff up
+	local DIR="${ROOT}usr/$(get_libdir)/X11/xkb"
+	if [[ -d ${DIR} ]] ; then
+		eerror "Directory ${DIR} should be"
+		eerror "manually deleted/renamed/relocated before installing!"
+		die "Manually remove ${DIR}"
+	fi
+
+	# The old xkbdata 'pc' directory can screw stuff up, because portage won't
+	# let us overwrite a directory with a file
+	local PC="${ROOT}usr/share/X11/xkb/symbols/pc"
+	if [[ -d ${PC} ]] ; then
+		eerror "Directory ${PC} should be"
+		eerror "manually deleted/renamed/relocated before installing!"
+		die "Manually remove ${PC}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# bug #145097
+	epatch "${FILESDIR}/add_missing_lsgt.patch"
+}
+
+src_compile() {
+	econf \
+		--with-xkb-base=/usr/share/X11/xkb \
+		--enable-compat-rules \
+		--disable-xkbcomp-symlink \
+		--with-xkb-rules-symlink=xorg \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	echo "CONFIG_PROTECT=\"/usr/share/X11/xkb\"" > "${T}"/10xkeyboard-config
+	doenvd "${T}"/10xkeyboard-config
+}