stabilize

Package-Manager: portage-2.0.51.20

2 files changed, 21 insertions, 23 deletions

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index bcc20bdea404..a8ba9904cef8 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,14 +1,12 @@
-MD5 63c7eb210ae073232511598003383e51 kbd-1.12-r3.ebuild 2200
 MD5 fe04a9a95dd007b3dc5924e2caa0c800 ChangeLog 6373
+MD5 c97b4f642915a0eeaf8ca16bbadd33fa kbd-1.12-r4.ebuild 2343
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 380ea52f3a0ff1e56ef2fe427d40416c kbd-1.12-r4.ebuild 2329
-MD5 9b0d39e8aadcbc2852faf9f5d35cd9fc kbd-1.12-r2.ebuild 1892
+MD5 63c7eb210ae073232511598003383e51 kbd-1.12-r3.ebuild 2200
+MD5 2fff8da17e566c258df2888fbc599c23 files/kbd-1.12-cz-qwerty-map.patch 5821
+MD5 590a77d26b0b25a4217435ffa8bcd18a files/kbd-1.12-debian.patch 2628
+MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r4 118
+MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r3 118
+MD5 3e2652f1b8451784488b743b6e0dd556 files/kbd-1.12-find-map-fix.patch 957
 MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925
 MD5 58617e4171ee3357153c9793be062524 files/kbd-1.12-it-euro-map.patch 501
-MD5 7c826f293d2f1ae5c4de4031c19cd47d files/digest-kbd-1.12-r2 60
-MD5 3e2652f1b8451784488b743b6e0dd556 files/kbd-1.12-find-map-fix.patch 957
-MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r3 118
 MD5 5f28051ad309ee4e481ef3b2b9cc9714 files/kbd-1.12-kbd_repeat-v2.patch 809
-MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r4 118
-MD5 590a77d26b0b25a4217435ffa8bcd18a files/kbd-1.12-debian.patch 2628
-MD5 2fff8da17e566c258df2888fbc599c23 files/kbd-1.12-cz-qwerty-map.patch 5821
diff --git a/sys-apps/kbd/kbd-1.12-r4.ebuild b/sys-apps/kbd/kbd-1.12-r4.ebuild
index 6e4180bf0ae3..4419214b7e3f 100644
--- a/sys-apps/kbd/kbd-1.12-r4.ebuild
+++ b/sys-apps/kbd/kbd-1.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r4.ebuild,v 1.2 2005/01/02 23:25:09 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r4.ebuild,v 1.3 2005/04/24 10:20:04 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,47 +12,47 @@ SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	local a
-
 	# Workaround problem on JFS filesystems, see bug 42859
 	for a in ${A} ; do
 		echo ">>> Unpacking ${a} to ${WORKDIR}"
-		gzip -dc ${DISTDIR}/${a} | tar xf -
+		gzip -dc "${DISTDIR}"/${a} | tar xf -
+		assert
 	done
 
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "s:-O2:${CFLAGS}:g" \
 		-e 's:install -s:install:' \
 		src/Makefile.in
 
 	# Other patches from RH
-	epatch ${FILESDIR}/${PN}-1.08-terminal.patch
+	epatch "${FILESDIR}"/${PN}-1.08-terminal.patch
 
 	# Fixes a problem where loadkeys matches dvorak the dir, and not the
 	# .map inside
-	epatch ${FILESDIR}/${P}-find-map-fix.patch
+	epatch "${FILESDIR}"/${P}-find-map-fix.patch
 
 	# Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'
-	epatch ${FILESDIR}/${P}-kbd_repeat-v2.patch
+	epatch "${FILESDIR}"/${P}-kbd_repeat-v2.patch
 
 	# misc fixes from debian
-	epatch ${FILESDIR}/${P}-debian.patch
+	epatch "${FILESDIR}"/${P}-debian.patch
 
 	# Provide a QWERTZ and QWERTY cz map #19010
 	cp data/keymaps/i386/{qwerty,qwertz}/cz.map || die "cz qwerty"
-	epatch ${FILESDIR}/${P}-cz-qwerty-map.patch
+	epatch "${FILESDIR}"/${P}-cz-qwerty-map.patch
 
 	# The italian keymap is missing euro support #75970
-	epatch ${FILESDIR}/${P}-it-euro-map.patch
+	epatch "${FILESDIR}"/${P}-it-euro-map.patch
 }
 
 src_compile() {
@@ -71,12 +71,12 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	mv ${D}/usr/bin/setfont ${D}/bin/
+	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/
+	cp -dR doc/* "${D}"/usr/share/doc/${PF}/html/
 
 	if use nls ; then
 		cd ${WORKDIR}/mnt/e/SvorakLN