Fix from Alexey Gladkov so our patch doesnt break things #184037.

Package-Manager: portage-2.1.3.7

5 files changed, 110 insertions, 22 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index f68a03b1bea4..e4aed2d0fccd 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kbd
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.63 2007/08/26 21:14:12 vapier Exp $
+
+*kbd-1.13-r1 (26 Aug 2007)
+
+  26 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+  files/kbd-1.13-dont-use-error.patch, +kbd-1.13-r1.ebuild:
+  Fix from Alexey Gladkov so our patch doesnt break things #184037.
 
 *kbd-1.13 (28 Jun 2007)
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 78e2fbb13e93..4014871b8937 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -57,10 +57,10 @@ 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
+AUX kbd-1.13-dont-use-error.patch 414 RMD160 76e822064fedc9f5b36daf10c06c83f13afc1f13 SHA1 543874d0f36ace327af79815004b1cd017ce9357 SHA256 9f9e7e860362b7e5402c1c0af55ff301e0542e34aacc71167f9252f50a4f74ca
+MD5 f3f10fcb60e141065230b52baefd1833 files/kbd-1.13-dont-use-error.patch 414
+RMD160 76e822064fedc9f5b36daf10c06c83f13afc1f13 files/kbd-1.13-dont-use-error.patch 414
+SHA256 9f9e7e860362b7e5402c1c0af55ff301e0542e34aacc71167f9252f50a4f74ca files/kbd-1.13-dont-use-error.patch 414
 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
@@ -68,14 +68,14 @@ EBUILD kbd-1.12-r8.ebuild 3143 RMD160 ad03c088614ea20e931e9162abf9facc75d05b31 S
 MD5 087cff7a4ba45bf71914bddeb04822f3 kbd-1.12-r8.ebuild 3143
 RMD160 ad03c088614ea20e931e9162abf9facc75d05b31 kbd-1.12-r8.ebuild 3143
 SHA256 5d156358c645cdfee4b7671f52ce5da7fd15da2c2a65284e6a43d68b40b0a839 kbd-1.12-r8.ebuild 3143
-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
+EBUILD kbd-1.13-r1.ebuild 2106 RMD160 1463bd8553e869abefe0b891eccd41f5ff7c3518 SHA1 4679b67e6e5b51ad72bd5808d9b2990e4253216d SHA256 fe2e79a5d61894bb4e8a766c7efc2b1561e4b54359fbb0b658d72570651b962b
+MD5 705624bb6b8cc7afcb0e8cc174861f8f kbd-1.13-r1.ebuild 2106
+RMD160 1463bd8553e869abefe0b891eccd41f5ff7c3518 kbd-1.13-r1.ebuild 2106
+SHA256 fe2e79a5d61894bb4e8a766c7efc2b1561e4b54359fbb0b658d72570651b962b kbd-1.13-r1.ebuild 2106
+MISC ChangeLog 9964 RMD160 8cce4c9f39e9ff441a0040b2e432edd17d090da1 SHA1 5900238700f1abf765d17dd91c76933a23ecf367 SHA256 43f97e1d73c76288cd10030430e2374255ba3cce4e4bc1166350e154b7b1dd6b
+MD5 3cca0f56ef551430156abaf30798a4d2 ChangeLog 9964
+RMD160 8cce4c9f39e9ff441a0040b2e432edd17d090da1 ChangeLog 9964
+SHA256 43f97e1d73c76288cd10030430e2374255ba3cce4e4bc1166350e154b7b1dd6b ChangeLog 9964
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -83,13 +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
+MD5 ee1d204c2e03b876fe47c3fb300c4bb5 files/digest-kbd-1.13-r1 229
+RMD160 01a99e8ac3cfd62e1af75e86f05206c52ea841b1 files/digest-kbd-1.13-r1 229
+SHA256 161dceb4659a5d700e4d001b4573bba08211eabec2d7d3a94c3ac29cbb960280 files/digest-kbd-1.13-r1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGg/qkp/wUKkr7RBoRAs2JAJ9ndF9jnXQK2/oaR39JJxVbR3DGKACfW63j
-Gh//COc90lbMnkYMwU9lELI=
-=cDat
+iD8DBQFG0e2Dp/wUKkr7RBoRAq6UAKCTUGDlYoK79v62RTXTeva3lFfDqQCg1zRN
+o4lrrp2KYBAA693LqcHoKsY=
+=XTLS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/files/digest-kbd-1.13-r1 b/sys-apps/kbd/files/digest-kbd-1.13-r1
new file mode 100644
index 000000000000..de1d94db3669
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.13-r1
@@ -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
index eb8cba069da0..d8e0bb1c0e00 100644
--- a/sys-apps/kbd/files/kbd-1.13-dont-use-error.patch
+++ b/sys-apps/kbd/files/kbd-1.13-dont-use-error.patch
@@ -2,13 +2,16 @@ dont use GNU-specific function error()
 
 --- openvt/openvt.c
 +++ openvt/openvt.c
-@@ -108,7 +108,8 @@
+@@ -107,8 +107,10 @@
+ 
      for (i=0; i<3; i++) {
  	struct stat st;
- 	if (fstat(i, &st) == -1 && open("/dev/null", O_RDWR) == -1)
+-	if (fstat(i, &st) == -1 && open("/dev/null", O_RDWR) == -1)
 -		error(EXIT_FAILURE, errno, "open");
++	if (fstat(i, &st) == -1 && open("/dev/null", O_RDWR) == -1) {
 +		perror("open(/dev/null/) failed");
 +		return EXIT_FAILURE;
++	}
      }
  
     consfd = getfd(NULL);
diff --git a/sys-apps/kbd/kbd-1.13-r1.ebuild b/sys-apps/kbd/kbd-1.13-r1.ebuild
new file mode 100644
index 000000000000..bfa51359d90c
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.13-r1.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-r1.ebuild,v 1.1 2007/08/26 21:14:12 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/
+}