mips stabilize & cleanup

(Portage version: 2.1.2_rc4-r2)
 (Signed Manifest commit)

5 files changed, 14 insertions, 241 deletions

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index bbce2b1af393..038fab7917a9 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kbd-1.08-terminal.patch 925 RMD160 0f622bcf874c01ee6533cfbdc6137e4f8949299b SHA1 e4a473ce98292a77403a9d79b8cdc083542113ec SHA256 466ac92951695017498c640547af9aeb6351b2da75b6b787c7d0f17f409e9134
 MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925
 RMD160 0f622bcf874c01ee6533cfbdc6137e4f8949299b files/kbd-1.08-terminal.patch 925
@@ -56,18 +59,10 @@ RMD160 a2db9ef656d9a09aec4ebd5d02726efa7e3d4818 files/kbd-1.12-xcompile.patch 68
 SHA256 78d29c76075cf5ee347461e28ae0ac25a06ce446151d91ec661c3a2d33da4191 files/kbd-1.12-xcompile.patch 680
 DIST kbd-1.12.tar.gz 884827 RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd SHA1 d4917da308e01e74d67d7b814bf527063b3919fc SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803
 DIST svorakln.tar.gz 3030 RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e SHA1 a529a5fa4968b135996aefc7c2e4f38e8dc7d827 SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3
-EBUILD kbd-1.12-r6.ebuild 2877 RMD160 4e0c0a6cb7b7141e2fd2959a9edda56bb9d83148 SHA1 19781a31b35c6468ba3b12e6125731f5859ffae8 SHA256 ca3e7330bad4932999b105abbe46c0fe3a7791002ecd9745e8fd595fda1ae0d3
-MD5 d69e4bec27cfe95b1c542dff5644305f kbd-1.12-r6.ebuild 2877
-RMD160 4e0c0a6cb7b7141e2fd2959a9edda56bb9d83148 kbd-1.12-r6.ebuild 2877
-SHA256 ca3e7330bad4932999b105abbe46c0fe3a7791002ecd9745e8fd595fda1ae0d3 kbd-1.12-r6.ebuild 2877
-EBUILD kbd-1.12-r7.ebuild 2979 RMD160 5c5aab9957f05774211acdd7870c6c49d831c705 SHA1 16ec666f6b8ca5173953d05b3a0bef434182c92a SHA256 337662a09e0a1dd406310fb2aad2743d9a5a83536d418e4e5ca486b756936c4b
-MD5 0266d70addedd8311353c40139e8b8db kbd-1.12-r7.ebuild 2979
-RMD160 5c5aab9957f05774211acdd7870c6c49d831c705 kbd-1.12-r7.ebuild 2979
-SHA256 337662a09e0a1dd406310fb2aad2743d9a5a83536d418e4e5ca486b756936c4b kbd-1.12-r7.ebuild 2979
-EBUILD kbd-1.12-r8.ebuild 3145 RMD160 c69ed93b06eac5a7cbbc5ebf3c881faf8c7f7a90 SHA1 3553dcab55df5e1c1437ea9a7daaa03d6352ba12 SHA256 de6e5a6059b611402929d3ca90d9b65ec94a4335c125e38698047c9ec6205ad7
-MD5 f27ef06ca435814f1e17a2d6ec9116a5 kbd-1.12-r8.ebuild 3145
-RMD160 c69ed93b06eac5a7cbbc5ebf3c881faf8c7f7a90 kbd-1.12-r8.ebuild 3145
-SHA256 de6e5a6059b611402929d3ca90d9b65ec94a4335c125e38698047c9ec6205ad7 kbd-1.12-r8.ebuild 3145
+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
@@ -76,12 +71,13 @@ MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r6 446
-RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r6 446
-SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r6 446
-MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r7 446
-RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r7 446
-SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r7 446
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFlg9N8bi6rjpTunYRAhuqAJ4uRseB03y6uxa70yJmph3Uu09r0ACgmgqE
+3oohf9KtaWVaYmTsPt0ZzdI=
+=YZzV
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r6 b/sys-apps/kbd/files/digest-kbd-1.12-r6
deleted file mode 100644
index 7bbb85a86bcb..000000000000
--- a/sys-apps/kbd/files/digest-kbd-1.12-r6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
-RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd kbd-1.12.tar.gz 884827
-SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803 kbd-1.12.tar.gz 884827
-MD5 c3bc810b784880c9bb5a6fe80d95a696 svorakln.tar.gz 3030
-RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e svorakln.tar.gz 3030
-SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3 svorakln.tar.gz 3030
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r7 b/sys-apps/kbd/files/digest-kbd-1.12-r7
deleted file mode 100644
index 7bbb85a86bcb..000000000000
--- a/sys-apps/kbd/files/digest-kbd-1.12-r7
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
-RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd kbd-1.12.tar.gz 884827
-SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803 kbd-1.12.tar.gz 884827
-MD5 c3bc810b784880c9bb5a6fe80d95a696 svorakln.tar.gz 3030
-RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e svorakln.tar.gz 3030
-SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3 svorakln.tar.gz 3030
diff --git a/sys-apps/kbd/kbd-1.12-r6.ebuild b/sys-apps/kbd/kbd-1.12-r6.ebuild
deleted file mode 100644
index d7fada4a8714..000000000000
--- a/sys-apps/kbd/kbd-1.12-r6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r6.ebuild,v 1.2 2006/06/10 19:47:24 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://freshmeat.net/projects/kbd/"
-SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.tar.gz
-	ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/${P}.tar.gz
-	nls? ( http://www.users.one.se/liket/svorak/svorakln.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() {
-	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 -
-		assert
-	done
-
-	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
-
-	# Other patches from RH
-	epatch "${FILESDIR}"/${PN}-1.08-terminal.patch
-
-	epatch "${FILESDIR}"/${P}-configure-LANG.patch #128253
-
-	# Fixes a problem where loadkeys matches dvorak the dir, and not the
-	# .map inside
-	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
-
-	# misc fixes from debian
-	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
-
-	# Fix jp map to recognize Ctrl-[ as Escape #71870
-	epatch "${FILESDIR}"/${P}-jp-escape.patch
-
-	# Patches from Fedora
-	epatch "${FILESDIR}"/${P}-Meta_utf8.patch
-	## Fix runtime with gcc4 (setfont: Input file: trailing garbage)
-	epatch "${FILESDIR}"/${P}-alias.patch
-	epatch "${FILESDIR}"/${P}-setfont-man.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/
-
-	if use nls ; then
-		cd ${WORKDIR}/mnt/e/SvorakLN
-		insinto /usr/share/keymaps/i386/dvorak/
-		doins .svorakmap svorak.map.gz
-		dodoc Svorak.txt
-	fi
-}
diff --git a/sys-apps/kbd/kbd-1.12-r7.ebuild b/sys-apps/kbd/kbd-1.12-r7.ebuild
deleted file mode 100644
index 8172236a4c13..000000000000
--- a/sys-apps/kbd/kbd-1.12-r7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r7.ebuild,v 1.9 2006/10/14 20:29:47 agriffis Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://freshmeat.net/projects/kbd/"
-SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.tar.gz
-	ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/${P}.tar.gz
-	nls? ( http://www.users.one.se/liket/svorak/svorakln.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() {
-	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 -
-		assert
-	done
-
-	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
-
-	# Other patches from RH
-	epatch "${FILESDIR}"/${PN}-1.08-terminal.patch
-
-	epatch "${FILESDIR}"/${P}-configure-LANG.patch #128253
-
-	# Fixes a problem where loadkeys matches dvorak the dir, and not the
-	# .map inside
-	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
-
-	# misc fixes from debian
-	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
-
-	# Fix jp map to recognize Ctrl-[ as Escape #71870
-	epatch "${FILESDIR}"/${P}-jp-escape.patch
-
-	# Patches from Fedora
-	epatch "${FILESDIR}"/${P}-Meta_utf8.patch
-	## Fix runtime with gcc4 (setfont: Input file: trailing garbage)
-	epatch "${FILESDIR}"/${P}-alias.patch
-	epatch "${FILESDIR}"/${P}-setfont-man.patch
-
-	# cross-compile fails for powerpc targets bug #133856
-	epatch "${FILESDIR}"/${P}-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/
-
-	if use nls ; then
-		cd ${WORKDIR}/mnt/e/SvorakLN
-		insinto /usr/share/keymaps/i386/dvorak/
-		doins .svorakmap svorak.map.gz
-		dodoc Svorak.txt
-	fi
-}