Bugfixes, some new layouts.

Package-Manager: portage-2.1.3.9

4 files changed, 86 insertions, 5 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index b1884c04e493..9346b2a386eb 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.36 2007/09/10 03:30:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.37 2007/09/26 08:49:03 dberkholz Exp $
+
+*xkeyboard-config-1.1 (26 Sep 2007)
+
+  26 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.1.ebuild:
+  Bugfixes, some new layouts.
 
   10 Sep 2007; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-0.9.ebuild:
   Stable for HPPA (bug #191615).
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 1932beadc978..521f8b6de474 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 DIST xkeyboard-config-0.9.tar.bz2 471807 RMD160 2b6e127e0e4728c4c0ea4014bed0f383f80b88a2 SHA1 05139163da656001fd837c6678254665c0d8ca00 SHA256 bb84c40036c4eab0f88bf09951bf36c867d0196988636edfd6efa14d61be777d
+DIST xkeyboard-config-1.1.tar.bz2 538464 RMD160 65ada216daf84c2952f98104731890bce10f3b32 SHA1 9c5356b2cc70a6366b54455cf1ab98fe2c086089 SHA256 d487ff7eb2ab21bf743ced5e1c027920d35de2f398c315120c927c7898ab44bd
 EBUILD xkeyboard-config-0.8-r1.ebuild 1748 RMD160 a75aca947e0eb784de3821a77663a4f759cd9cb5 SHA1 e80222f16f72d017861fcdcca15a360bd33e2a75 SHA256 75f7fd331d517938f21a1eec861430539afac8a050fd92bcf8f2c87d7c7fc0bd
 MD5 6102f3bf52997fef36606ce1ce90beea xkeyboard-config-0.8-r1.ebuild 1748
 RMD160 a75aca947e0eb784de3821a77663a4f759cd9cb5 xkeyboard-config-0.8-r1.ebuild 1748
@@ -16,10 +20,14 @@ EBUILD xkeyboard-config-0.9.ebuild 1646 RMD160 5df2fb2bd88881a675e0c628508f4c054
 MD5 5046340dcff9e471a592408b0c63a6e8 xkeyboard-config-0.9.ebuild 1646
 RMD160 5df2fb2bd88881a675e0c628508f4c054d50b55b xkeyboard-config-0.9.ebuild 1646
 SHA256 dca0d9a4e7c0a236a8c540bad11631f83df01e9f82063a1b8bc10b86214c74f7 xkeyboard-config-0.9.ebuild 1646
-MISC ChangeLog 5539 RMD160 14be55fc6153c2b92b24c49b7f4a6aa4314d4698 SHA1 da4606edb4a2b88163dfa7aa1fe1b945b08e65d7 SHA256 16da2a271de1474e2fc78cd030f0b938bfd0ca727e26a82d220e7e187bf5b9fd
-MD5 53bf85dfee8b268b675dd09612185b14 ChangeLog 5539
-RMD160 14be55fc6153c2b92b24c49b7f4a6aa4314d4698 ChangeLog 5539
-SHA256 16da2a271de1474e2fc78cd030f0b938bfd0ca727e26a82d220e7e187bf5b9fd ChangeLog 5539
+EBUILD xkeyboard-config-1.1.ebuild 1657 RMD160 962c96d01d1c40d633d0d1685367fe0112efbb01 SHA1 5ab8833826897a926416d593570642d858852d30 SHA256 6219974590dad75471ac661c17e3cff0196d5695d26362b38770fdf77cfde05c
+MD5 3a9fefae8090735f5d6d2252bbd998b6 xkeyboard-config-1.1.ebuild 1657
+RMD160 962c96d01d1c40d633d0d1685367fe0112efbb01 xkeyboard-config-1.1.ebuild 1657
+SHA256 6219974590dad75471ac661c17e3cff0196d5695d26362b38770fdf77cfde05c xkeyboard-config-1.1.ebuild 1657
+MISC ChangeLog 5700 RMD160 b756972b02a718ca21e115b79c381f523bf514f3 SHA1 b2b6c581f82af980ab0b504fca576d3f1dda2bdf SHA256 8729bffb5c01ff37a09cb6c426aa18055266a630e22bcf01db2bca7c4364614c
+MD5 ff06143c175779d702a95c8ad46e85e6 ChangeLog 5700
+RMD160 b756972b02a718ca21e115b79c381f523bf514f3 ChangeLog 5700
+SHA256 8729bffb5c01ff37a09cb6c426aa18055266a630e22bcf01db2bca7c4364614c ChangeLog 5700
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -33,3 +41,13 @@ SHA256 438b8fc9a828dafd69ef4899da66a338901f68494585afabd12db241b28f3d1f files/di
 MD5 90ab62d37bc4e724a19da864619b52d1 files/digest-xkeyboard-config-0.9 265
 RMD160 1a8f5b5b5fae2cb18bcf29e1143fbf78de2ae9c2 files/digest-xkeyboard-config-0.9 265
 SHA256 75dc4a4b7b901772c89fc8fe0fc7933fdead3dacbe67541fab448acc8aca30d2 files/digest-xkeyboard-config-0.9 265
+MD5 9e48424d853e3fcf4c8b953519b8205c files/digest-xkeyboard-config-1.1 265
+RMD160 026b642a817383c8a749992f6384bbd9a4af071e files/digest-xkeyboard-config-1.1 265
+SHA256 a433696bfd58075ec8c5defb51765b5db772412e1656055ab74012835a21e6ca files/digest-xkeyboard-config-1.1 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG+h1xXVaO67S1rtsRApeZAJ0VYj0Oz3dZlQwCw7ntN7OSKNSlCQCg3xKb
+b0DrrGWzl8WudZPTv1bEGwM=
+=Nro1
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.1 b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.1
new file mode 100644
index 000000000000..3a48613b9b1b
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-1.1
@@ -0,0 +1,3 @@
+MD5 deef7884b9d9cc280f0d2ef4b60e4d98 xkeyboard-config-1.1.tar.bz2 538464
+RMD160 65ada216daf84c2952f98104731890bce10f3b32 xkeyboard-config-1.1.tar.bz2 538464
+SHA256 d487ff7eb2ab21bf743ced5e1c027920d35de2f398c315120c927c7898ab44bd xkeyboard-config-1.1.tar.bz2 538464
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-1.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-1.1.ebuild
new file mode 100644
index 000000000000..4b48ccbcc1c4
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-1.1.ebuild,v 1.1 2007/09/26 08:49:03 dberkholz 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_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
+}