From: Pacho Ramos <pacho@gentoo.org>
Date: Fri, 11 Jun 2010 16:56:45 +0000 (+0000)
Subject: Revision bump to rename conflicting keymaps to have unique names, bug #293228 (with... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=750d6147c06014b65839d2050537891e84405c42;p=gentoo.git

Revision bump to rename conflicting keymaps to have unique names, bug #293228 (with Chainsaw permission).
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 99a31572c0c5..fa0bd0875a49 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.96 2010/04/11 20:50:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.97 2010/06/11 16:56:45 pacho Exp $
+
+*kbd-1.15.2-r1 (11 Jun 2010)
+
+  11 Jun 2010; Pacho Ramos <pacho@gentoo.org> +kbd-1.15.2-r1.ebuild:
+  Revision bump to rename conflicting keymaps to have unique names, bug
+  #293228 (with Chainsaw permission).
 
 *kbd-1.15.2 (11 Apr 2010)
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 54f15a836297..67c853ccad6d 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX kbd-1.08-terminal.patch 925 RMD160 0f622bcf874c01ee6533cfbdc6137e4f8949299b SHA1 e4a473ce98292a77403a9d79b8cdc083542113ec SHA256 466ac92951695017498c640547af9aeb6351b2da75b6b787c7d0f17f409e9134
 AUX kbd-1.12-Meta_utf8.patch 344 RMD160 a1a1326716716305767f297817519d1cd6f5670d SHA1 a3de75ef80288597d2a134dcc6f7a8b7ce81ca7e SHA256 9cb114acb7704fe14ae99d77ffc1f6fc586101fc541eadce5efbfd36f9d8b8c0
@@ -28,14 +28,15 @@ EBUILD kbd-1.12-r8.ebuild 3143 RMD160 ad03c088614ea20e931e9162abf9facc75d05b31 S
 EBUILD kbd-1.13-r1.ebuild 2093 RMD160 2151b5917afcfa8c1460bf7256b49c8019e94e47 SHA1 0fce10d63fc9cfb5012cd648854b3571e1d1a368 SHA256 c5004380976335b07e9a0b5948814b58e29cad32a18778b7ebff8ba30b760faf
 EBUILD kbd-1.14.1-r1.ebuild 1297 RMD160 ce04ae38ac3dba76b99eb3c50555705f3ed56d6c SHA1 09e7fd72ed6180ec7adb3b6d37bbf92a08206a7a SHA256 4e82e54e7bc4e8711cb6456e5b3ed70a1360af59606751933092de9c85a441ec
 EBUILD kbd-1.15.1.ebuild 896 RMD160 a0c005f47aa22bb0cca465882bdd15a16f4e65fe SHA1 a08cf823cbdad5af976ad6f6d011534a1806978f SHA256 9207a54d60233fad4c56ae1084390c5cde391b242923d99976732aa87b18083f
+EBUILD kbd-1.15.2-r1.ebuild 1053 RMD160 707a88e2596f023655c5c20bb851e828d10b6155 SHA1 ea01df71b7c984c081b08f5ab8f496373fb82b77 SHA256 5d84fd24ef7a28d30e8f4d8bfc4d1070b0961889c4292ce85d96e4ca725245d8
 EBUILD kbd-1.15.2.ebuild 741 RMD160 de5304bf79d77578bdcf6f66515718b7e92bba5a SHA1 905cb5cb4ae1a5955d855907c97a0a6103f99947 SHA256 e2bf3e2adf94dbc883210370e26c7ac1dc142319577feb5273bf5d71fc2c070a
 EBUILD kbd-1.15.ebuild 832 RMD160 ce6ffcbf05e6fe2ec2c0412ee59c2bec92514148 SHA1 c813379fba3241a6462a75aa8d21f90af32aa01e SHA256 2376f968fe6add3c593c7c4b1cecc4c72e02f900c7d1361b921851676c8c6992
-MISC ChangeLog 13521 RMD160 b10d32a555164eeb86b6d3c4afe8b8a9f37570c7 SHA1 1df6edd07f8475c096410b823a1e107517cc5e72 SHA256 75bddd827f211679192c253df4707250e5584fb01ca5fcb0c61c4e5c81c123b1
+MISC ChangeLog 13730 RMD160 434beeae8511e7e3a520f0b228938b33fce3025f SHA1 c9f4b5a78c88c63c406a7d727bb60ea71fd3bc0f SHA256 0731d1875d5fb0f768a24e34192e783107bbb5afe77feacc0a8442e99562c34a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkvCNhIACgkQTwhj9JtAlp6tbQEAx1Z1xLGqqH8F0nyStPqPc4oF
-qXbfiYJ7O7VWrrwJERwA/R5pozya64hJZsTSkfUo3TPXzZZ9F9L3Q+sj7eGsuWkZ
-=erC3
+iEYEARECAAYFAkwSatkACgkQCaWpQKGI+9SlCwCeOjTMHrdTK0hyetfre+3Vaf7o
+dz8AnjTdD3J1cCoyGTovC/8Paoz4hdMT
+=0tr1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/kbd-1.15.2-r1.ebuild b/sys-apps/kbd/kbd-1.15.2-r1.ebuild
new file mode 100644
index 000000000000..b4eae537cf40
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.15.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.2-r1.ebuild,v 1.1 2010/06/11 16:56:45 pacho Exp $
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="http://freshmeat.net/projects/kbd/"
+SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	cd "${S}"/data/keymaps/i386
+	mv dvorak/no.map dvorak/no-dvorak.map
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map
+	mv olpc/es.map olpc/es-olpc.map
+	mv olpc/pt.map olpc/pt-olpc.map
+	mv qwerty/cz.map qwerty/cz-qwerty.map
+}
+
+src_compile() {
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	dohtml doc/*.html
+}