Version bump.

Package-Manager: portage-2.1.3_rc5

5 files changed, 121 insertions, 10 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 84e889494d99..f68a03b1bea4 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kbd
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.61 2006/11/15 13:01:53 corsair Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.62 2007/06/28 18:14:11 vapier Exp $
+
+*kbd-1.13 (28 Jun 2007)
+
+  28 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/kbd-1.13-dont-use-error.patch, +kbd-1.13.ebuild:
+  Version bump.
 
   15 Nov 2006; Markus Rothe <corsair@gentoo.org> kbd-1.12-r8.ebuild:
   Stable on ppc64; bug #153556
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 038fab7917a9..78e2fbb13e93 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -57,16 +57,25 @@ AUX kbd-1.12-xcompile.patch 680 RMD160 a2db9ef656d9a09aec4ebd5d02726efa7e3d4818
 MD5 69c417dbaaa8146cbbc4048667a2fe2c files/kbd-1.12-xcompile.patch 680
 RMD160 a2db9ef656d9a09aec4ebd5d02726efa7e3d4818 files/kbd-1.12-xcompile.patch 680
 SHA256 78d29c76075cf5ee347461e28ae0ac25a06ce446151d91ec661c3a2d33da4191 files/kbd-1.12-xcompile.patch 680
+AUX kbd-1.13-dont-use-error.patch 343 RMD160 1926a8245521ebd0d9963c057b5f5a5b998a23b2 SHA1 3c1258c3fd9b515b9559b87a521a82bbd7ef0b05 SHA256 88e14b425cc3b4406f592c2194187798dad0edb6ce512ffacacd416f73c4620a
+MD5 2e08e68c4c7d5988d54d6a83810d5177 files/kbd-1.13-dont-use-error.patch 343
+RMD160 1926a8245521ebd0d9963c057b5f5a5b998a23b2 files/kbd-1.13-dont-use-error.patch 343
+SHA256 88e14b425cc3b4406f592c2194187798dad0edb6ce512ffacacd416f73c4620a files/kbd-1.13-dont-use-error.patch 343
 DIST kbd-1.12.tar.gz 884827 RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd SHA1 d4917da308e01e74d67d7b814bf527063b3919fc SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803
+DIST kbd-1.13.tar.bz2 667373 RMD160 a3d34185d86b532f2cdc8d0834ad5459625b8538 SHA1 76ef90c65d5bb7b401e1f657eb443b9b1d4def5d SHA256 c8a5be1a606d925c3229fa91d3e9dde4e0b61b2c755aff8e699b855f1a402bf6
 DIST svorakln.tar.gz 3030 RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e SHA1 a529a5fa4968b135996aefc7c2e4f38e8dc7d827 SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3
 EBUILD kbd-1.12-r8.ebuild 3143 RMD160 ad03c088614ea20e931e9162abf9facc75d05b31 SHA1 3317d7e4edcbf7292222a0b3c035d2d53a547afd SHA256 5d156358c645cdfee4b7671f52ce5da7fd15da2c2a65284e6a43d68b40b0a839
 MD5 087cff7a4ba45bf71914bddeb04822f3 kbd-1.12-r8.ebuild 3143
 RMD160 ad03c088614ea20e931e9162abf9facc75d05b31 kbd-1.12-r8.ebuild 3143
 SHA256 5d156358c645cdfee4b7671f52ce5da7fd15da2c2a65284e6a43d68b40b0a839 kbd-1.12-r8.ebuild 3143
-MISC ChangeLog 9608 RMD160 d40c659b98d670577c088314694bb19bd1ece84b SHA1 c5fea3ca67cc5f510876efb1f262c1ae0f51c72f SHA256 dc54f544e57db22b2a70fdcc9c6c108b9d185efd2622e37c871765c4469b2274
-MD5 ebe20c930b0e3f01bb03721446d64993 ChangeLog 9608
-RMD160 d40c659b98d670577c088314694bb19bd1ece84b ChangeLog 9608
-SHA256 dc54f544e57db22b2a70fdcc9c6c108b9d185efd2622e37c871765c4469b2274 ChangeLog 9608
+EBUILD kbd-1.13.ebuild 2103 RMD160 b8c1239584cd95bda94b2124c3f9c34446ab59ae SHA1 35154a3141fd8d5c698b24c6d048b3c24759a481 SHA256 1f180901855379c2545106980959dd7f7f4cf9a2ed9478c9a4c925cc0453c046
+MD5 e476f3acebc820c88237d89119a5782d kbd-1.13.ebuild 2103
+RMD160 b8c1239584cd95bda94b2124c3f9c34446ab59ae kbd-1.13.ebuild 2103
+SHA256 1f180901855379c2545106980959dd7f7f4cf9a2ed9478c9a4c925cc0453c046 kbd-1.13.ebuild 2103
+MISC ChangeLog 9757 RMD160 c8bea284faa7f27b1a28f3191712ca780b30c6ae SHA1 042a08ae9962732de0b322e57d069946ab94c862 SHA256 37ce092d0da0820fab0cb721c2eae16425232ec440d420098ea54f3318189b4c
+MD5 bb96b2a1c45c34ca79c92c5be03ea4dd ChangeLog 9757
+RMD160 c8bea284faa7f27b1a28f3191712ca780b30c6ae ChangeLog 9757
+SHA256 37ce092d0da0820fab0cb721c2eae16425232ec440d420098ea54f3318189b4c ChangeLog 9757
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -74,10 +83,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r8 446
 RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r8 446
 SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r8 446
+MD5 ee1d204c2e03b876fe47c3fb300c4bb5 files/digest-kbd-1.13 229
+RMD160 01a99e8ac3cfd62e1af75e86f05206c52ea841b1 files/digest-kbd-1.13 229
+SHA256 161dceb4659a5d700e4d001b4573bba08211eabec2d7d3a94c3ac29cbb960280 files/digest-kbd-1.13 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFlg9N8bi6rjpTunYRAhuqAJ4uRseB03y6uxa70yJmph3Uu09r0ACgmgqE
-3oohf9KtaWVaYmTsPt0ZzdI=
-=YZzV
+iD8DBQFGg/qkp/wUKkr7RBoRAs2JAJ9ndF9jnXQK2/oaR39JJxVbR3DGKACfW63j
+Gh//COc90lbMnkYMwU9lELI=
+=cDat
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/files/digest-kbd-1.13 b/sys-apps/kbd/files/digest-kbd-1.13
new file mode 100644
index 000000000000..de1d94db3669
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.13
@@ -0,0 +1,3 @@
+MD5 2639fdfe2412b29cbf6936d7db91cee3 kbd-1.13.tar.bz2 667373
+RMD160 a3d34185d86b532f2cdc8d0834ad5459625b8538 kbd-1.13.tar.bz2 667373
+SHA256 c8a5be1a606d925c3229fa91d3e9dde4e0b61b2c755aff8e699b855f1a402bf6 kbd-1.13.tar.bz2 667373
diff --git a/sys-apps/kbd/files/kbd-1.13-dont-use-error.patch b/sys-apps/kbd/files/kbd-1.13-dont-use-error.patch
new file mode 100644
index 000000000000..eb8cba069da0
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.13-dont-use-error.patch
@@ -0,0 +1,14 @@
+dont use GNU-specific function error()
+
+--- openvt/openvt.c
++++ openvt/openvt.c
+@@ -108,7 +108,8 @@
+     for (i=0; i<3; i++) {
+ 	struct stat st;
+ 	if (fstat(i, &st) == -1 && open("/dev/null", O_RDWR) == -1)
+-		error(EXIT_FAILURE, errno, "open");
++		perror("open(/dev/null/) failed");
++		return EXIT_FAILURE;
+     }
+ 
+    consfd = getfd(NULL);
diff --git a/sys-apps/kbd/kbd-1.13.ebuild b/sys-apps/kbd/kbd-1.13.ebuild
new file mode 100644
index 000000000000..bb7a65fc8ebb
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.13.ebuild,v 1.1 2007/06/28 18:14:11 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="http://freshmeat.net/projects/kbd/"
+SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.bz2"
+
+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}
+	cd "${S}"
+	sed -i \
+		-e "/^CFLAGS/s:-O2:${CFLAGS}:g" \
+		-e "/^LDFLAGS/s:-s:${LDFLAGS}:" \
+		-e "s:install -s:install:" \
+		src/Makefile.in \
+		openvt/Makefile
+
+	if tc-is-cross-compiler; then
+		tc-export CC
+		# Cross-compiling: don't run test programs
+		sed -i -e "s:&& ./conftest::" configure || \
+			die "Could not do sed configure for cross-compile"
+	fi
+
+	epatch "${FILESDIR}"/${P}-dont-use-error.patch
+	epatch "${FILESDIR}"/${PN}-1.12-configure-LANG.patch #128253
+
+	# fix unimap path issue caused by Debian patch
+	epatch "${FILESDIR}"/${PN}-1.12-unimap.patch
+
+	# Provide a QWERTZ and QWERTY cz map #19010
+	cp data/keymaps/i386/{qwerty,qwertz}/cz.map || die "cz qwerty"
+	epatch "${FILESDIR}"/${PN}-1.12-cz-qwerty-map.patch
+
+	# Fix jp map to recognize Ctrl-[ as Escape #71870
+	epatch "${FILESDIR}"/${PN}-1.12-jp-escape.patch
+
+	# cross-compile fails for powerpc targets bug #133856
+	epatch "${FILESDIR}"/${PN}-1.12-xcompile.patch
+}
+
+src_compile() {
+	local myconf=
+	# Non-standard configure script; --disable-nls to
+	# disable NLS, nothing to enable it.
+	use nls || myconf="--disable-nls"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share \
+		${myconf} || die
+
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	mv "${D}"/usr/bin/setfont "${D}"/bin/
+	dosym /bin/setfont /usr/bin/setfont
+
+	dodoc CHANGES CREDITS README
+	dodir /usr/share/doc/${PF}/html
+	cp -dR doc/* "${D}"/usr/share/doc/${PF}/html/
+}