Update to fix XkbBinDirectory undefined problem in xorg-server CVS as of Sept. 1.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 43 insertions, 2 deletions

diff --git a/x11-proto/kbproto/ChangeLog b/x11-proto/kbproto/ChangeLog
index 675519dd2aa8..efd630a68518 100644
--- a/x11-proto/kbproto/ChangeLog
+++ b/x11-proto/kbproto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-proto/kbproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/ChangeLog,v 1.5 2005/08/28 15:18:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/ChangeLog,v 1.6 2005/09/08 04:08:26 spyderous Exp $
+
+*kbproto-1.0-r1 (08 Sep 2005)
+
+  08 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/add-xkbbindirectory.patch, +kbproto-1.0-r1.ebuild:
+  Update to fix XkbBinDirectory undefined problem in xorg-server CVS as of
+  Sept. 1.
 
   28 Aug 2005; MATSUU Takuto <matsuu@gentoo.org> kbproto-1.0.ebuild:
   Marked ~sh
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
index b199e03bcf40..5e8e4101da60 100644
--- a/x11-proto/kbproto/Manifest
+++ b/x11-proto/kbproto/Manifest
@@ -1,3 +1,6 @@
+MD5 9a046cc07e9d7a856bd3391411e6213b ChangeLog 956
 MD5 6fbb03eb2aec8c44e4cfaeb543543f8d kbproto-1.0.ebuild 527
-MD5 aa21944ddf259a097c0ddc8ffbd0856b ChangeLog 720
+MD5 7870887687aa1ff3eba063a7a7a040ac kbproto-1.0-r1.ebuild 581
 MD5 d587838cec435aa66a49af0c3512a5a4 files/digest-kbproto-1.0 63
+MD5 d587838cec435aa66a49af0c3512a5a4 files/digest-kbproto-1.0-r1 63
+MD5 e36388005d4b51d4b344f2f02335ec40 files/add-xkbbindirectory.patch 587
diff --git a/x11-proto/kbproto/files/add-xkbbindirectory.patch b/x11-proto/kbproto/files/add-xkbbindirectory.patch
new file mode 100644
index 000000000000..1963ab09971f
--- /dev/null
+++ b/x11-proto/kbproto/files/add-xkbbindirectory.patch
@@ -0,0 +1,11 @@
+diff -urN -x Makefile.in -x Makefile -x configure -x depcomp -x aclocal.m4 -x config.guess -x config.sub -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x compile kbproto-1.0.orig/XKBsrv.h kbproto-1.0/XKBsrv.h
+--- kbproto-1.0.orig/XKBsrv.h	2005-08-01 20:15:42.000000000 +0000
++++ kbproto-1.0/XKBsrv.h	2005-09-01 19:56:14.000000000 +0000
+@@ -279,6 +279,7 @@
+ extern int	XkbKeyboardErrorCode;
+ extern int	XkbDisableLockActions;
+ extern char *	XkbBaseDirectory;
++extern char *	XkbBinDirectory;
+ extern char *	XkbInitialMap;
+ extern int	_XkbClientMajor;
+ extern int	_XkbClientMinor;
diff --git a/x11-proto/kbproto/files/digest-kbproto-1.0-r1 b/x11-proto/kbproto/files/digest-kbproto-1.0-r1
new file mode 100644
index 000000000000..875ee57331a0
--- /dev/null
+++ b/x11-proto/kbproto/files/digest-kbproto-1.0-r1
@@ -0,0 +1 @@
+MD5 45af2e6c1fd9a5d858cdfc827b0d504e kbproto-1.0.tar.bz2 57461
diff --git a/x11-proto/kbproto/kbproto-1.0-r1.ebuild b/x11-proto/kbproto/kbproto-1.0-r1.ebuild
new file mode 100644
index 000000000000..6f5f3a0b6d9d
--- /dev/null
+++ b/x11-proto/kbproto/kbproto-1.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/kbproto-1.0-r1.ebuild,v 1.1 2005/09/08 04:08:26 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+PATCHES="${FILESDIR}/add-xkbbindirectory.patch"
+DESCRIPTION="X.Org KB protocol headers"
+#HOMEPAGE="http://foo.bar.com/"
+#SRC_URI="ftp://foo.bar.com/${P}.tar.bz2"
+#LICENSE=""
+#SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86"
+#IUSE="X gnome"
+#DEPEND=""
+#RDEPEND=""