From 0da0fe135bf558568b30c0eeb0aede1a08adb2ad Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 1 Apr 2008 15:16:07 +0000 Subject: Fix from Charles Clément for missing binaries #215610 by Massimo Maggi. Package-Manager: portage-2.2_pre5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/kbd/ChangeLog | 9 ++++- sys-apps/kbd/Manifest | 11 ++--- .../kbd/files/kbd-1.14.1-missing-configure.patch | 15 +++++++ sys-apps/kbd/kbd-1.14.1-r1.ebuild | 47 ++++++++++++++++++++++ sys-apps/kbd/kbd-1.14.1.ebuild | 45 --------------------- 5 files changed, 76 insertions(+), 51 deletions(-) create mode 100644 sys-apps/kbd/files/kbd-1.14.1-missing-configure.patch create mode 100644 sys-apps/kbd/kbd-1.14.1-r1.ebuild delete mode 100644 sys-apps/kbd/kbd-1.14.1.ebuild (limited to 'sys-apps') diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog index 2eab34a761f8..253a83f13c60 100644 --- a/sys-apps/kbd/ChangeLog +++ b/sys-apps/kbd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/kbd # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.71 2008/03/30 17:09:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.72 2008/04/01 15:16:06 vapier Exp $ + +*kbd-1.14.1-r1 (01 Apr 2008) + + 01 Apr 2008; Mike Frysinger + +files/kbd-1.14.1-missing-configure.patch, -kbd-1.14.1.ebuild, + +kbd-1.14.1-r1.ebuild: + Fix from Charles Clément for missing binaries #215610 by Massimo Maggi. *kbd-1.14.1 (30 Mar 2008) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index ac445d594a8e..c1964689e142 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -16,19 +16,20 @@ AUX kbd-1.12-setfont-man.patch 629 RMD160 dba23dfb4a9d263da6bc094a56366371bfc1b9 AUX kbd-1.12-unimap.patch 642 RMD160 a8ae481be1e2ca64a2ddc73f03fda644436f76a2 SHA1 9cf44c9ed07da02f5ba9a0dce9df4278e8a4beaa SHA256 f1364a306636661ebcca73d91ca179be811b6b4ccd08b1b761a0847f579623a0 AUX kbd-1.12-xcompile.patch 680 RMD160 a2db9ef656d9a09aec4ebd5d02726efa7e3d4818 SHA1 7c4c6b08f0f0c443a309a86055b01c11d8e80c21 SHA256 78d29c76075cf5ee347461e28ae0ac25a06ce446151d91ec661c3a2d33da4191 AUX kbd-1.13-dont-use-error.patch 414 RMD160 76e822064fedc9f5b36daf10c06c83f13afc1f13 SHA1 543874d0f36ace327af79815004b1cd017ce9357 SHA256 9f9e7e860362b7e5402c1c0af55ff301e0542e34aacc71167f9252f50a4f74ca +AUX kbd-1.14.1-missing-configure.patch 444 RMD160 d1d4f185e8d761d865a3f64fb717446505e08c30 SHA1 ea03ca92b21c0d5a87db2e31f1fd27c1c2e4394b SHA256 0a2a530ac1d2baa03c7cc12e10a242bbc9d128304136f5dba4909d3df2b16eb1 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 kbd-1.14.1.tar.gz 1010836 RMD160 5206423c9950c8beb2467e7b761d2a0f827ebbe2 SHA1 12d91613096d1a724fc780e2d7974a0a1b308dce SHA256 e97ed7ec4ec937a27ac2e72789e76db4b661f7ce2c2b7b68524f55ee69dce491 DIST svorakln.tar.gz 3030 RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e SHA1 a529a5fa4968b135996aefc7c2e4f38e8dc7d827 SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3 EBUILD kbd-1.12-r8.ebuild 3143 RMD160 ad03c088614ea20e931e9162abf9facc75d05b31 SHA1 3317d7e4edcbf7292222a0b3c035d2d53a547afd SHA256 5d156358c645cdfee4b7671f52ce5da7fd15da2c2a65284e6a43d68b40b0a839 EBUILD kbd-1.13-r1.ebuild 2093 RMD160 2151b5917afcfa8c1460bf7256b49c8019e94e47 SHA1 0fce10d63fc9cfb5012cd648854b3571e1d1a368 SHA256 c5004380976335b07e9a0b5948814b58e29cad32a18778b7ebff8ba30b760faf -EBUILD kbd-1.14.1.ebuild 1191 RMD160 cc19a2a4c29f874f241db5904d9fb39dfad3a27c SHA1 ecbd08985b6b39c909d7ef064639ae8ef0ac791b SHA256 33a55cf0325fc4d0866d9b1c250e91e7dc629021cad8c8b868820bfcf2fbd628 -MISC ChangeLog 10811 RMD160 e53da7e03466cf642f2c0803e1d6836953dfb4c9 SHA1 e734d7e22b0b072964d2d6715837b09e70eca866 SHA256 14f665edb882285baafce38ff577013e28ca8092392f1d85adcec491f9644aff +EBUILD kbd-1.14.1-r1.ebuild 1254 RMD160 4b036e9aee73090f11c344c3391161610230a2f7 SHA1 b05d2ef974eac944d5cd9ff1bf44fc0fab912b6e SHA256 d7687eb32f45543d803a3595a35bd280b08533424c93f79c77a49754c2c8bd70 +MISC ChangeLog 11057 RMD160 f045ef3976ed9245a23b0b09312ae58bf0413121 SHA1 791343d08cc98ac470bd303ca2f9290e6fd4b35e SHA256 d925ba9bfa1c51dfb5ec58c8690600034bd8338176bc6cb82f8d7e7bf2da6788 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH78oij9hvisErhMIRAiY1AJ9DdFd9xXZzb1gClD8mbkZ5bWveqACgjMuU -sOT7mU15ucMIQCvh9yINomg= -=md+L +iD8DBQFH8lKmj9hvisErhMIRAlU8AKCS7lvUvkwqv3fdVgXmP731cd7qBQCeJ3qI +HwRp9q8ksobW6vEivJFV4bw= +=FgO5 -----END PGP SIGNATURE----- diff --git a/sys-apps/kbd/files/kbd-1.14.1-missing-configure.patch b/sys-apps/kbd/files/kbd-1.14.1-missing-configure.patch new file mode 100644 index 000000000000..b9fe9614785c --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.14.1-missing-configure.patch @@ -0,0 +1,15 @@ +fix from Charles Clément for missing binaries + +http://bugs.gentoo.org/215610 + +--- kbd-1.14.1/src/Makefile.in ++++ kbd-1.14.1/src/Makefile.in +@@ -2,6 +2,8 @@ prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = $(DESTDIR)@bindir@ + datarootdir = @datarootdir@ ++KEYCODES_PROGS = @KEYCODES_PROGS@ ++RESIZECONS_PROGS = @RESIZECONS_PROGS@ + OPTIONAL_PROGS = @OPTIONAL_PROGS@ + + # Something like /usr/lib/kbd or /usr/share/kbd diff --git a/sys-apps/kbd/kbd-1.14.1-r1.ebuild b/sys-apps/kbd/kbd-1.14.1-r1.ebuild new file mode 100644 index 000000000000..7cdc00f291ff --- /dev/null +++ b/sys-apps/kbd/kbd-1.14.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.14.1-r1.ebuild,v 1.1 2008/04/01 15:16:06 vapier Exp $ + +inherit eutils + +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} + cd "${S}" + sed -i 's:install -s:install:' src/Makefile.in + + # 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/{qwertz,qwerty}/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 + + epatch "${FILESDIR}"/${P}-missing-configure.patch #215610 +} + +src_compile() { + econf $(use_enable nls) || die + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc CHANGES CREDITS README + dohtml doc/*.html +} diff --git a/sys-apps/kbd/kbd-1.14.1.ebuild b/sys-apps/kbd/kbd-1.14.1.ebuild deleted file mode 100644 index 53a1f0264f49..000000000000 --- a/sys-apps/kbd/kbd-1.14.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.14.1.ebuild,v 1.1 2008/03/30 17:09:26 vapier Exp $ - -inherit eutils - -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} - cd "${S}" - sed -i 's:install -s:install:' src/Makefile.in - - # 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/{qwertz,qwerty}/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 -} - -src_compile() { - econf $(use_enable nls) || die - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc CHANGES CREDITS README - dohtml doc/*.html -} -- cgit v1.2.3-65-gdbad