arm/s390/sh stable

(Portage version: 2.1.1_rc1-r4)
 (Signed Manifest commit)

3 files changed, 14 insertions, 122 deletions

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 8a5e8aabebd3..4caaa86cf14f 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
@@ -52,18 +55,14 @@ RMD160 c5f343cb4572048c8c1454b1dd972275b22d61d8 files/kbd-1.12-xcompile.patch 61
 SHA256 7e60332adb2d01e9fed335c81bda789444da5a01ca928b759e5a1becde63dbc8 files/kbd-1.12-xcompile.patch 611
 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-r5.ebuild 2920 RMD160 4117c6aeaa0c53a59e71bfd047255ecf72bf806e SHA1 1e22bf4bce5ddb3b1022877e74df60c0a823782d SHA256 adabdcebace465fa6095b1ba986728e5e89e9a311dc4328e3dd1af9d82ec48f2
-MD5 6604688276e7452fd5132a1900e65542 kbd-1.12-r5.ebuild 2920
-RMD160 4117c6aeaa0c53a59e71bfd047255ecf72bf806e kbd-1.12-r5.ebuild 2920
-SHA256 adabdcebace465fa6095b1ba986728e5e89e9a311dc4328e3dd1af9d82ec48f2 kbd-1.12-r5.ebuild 2920
 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 2987 RMD160 9551f48acd8aa9a2e60d5037b894ac4118039c17 SHA1 5954d1adc39c0e5b678b232d08b3ae6f44a9c26c SHA256 75bfabf8b80fdcef9f39ebac369f2e617652e617f5137291c42c0e25b3131fd3
-MD5 cc718d678cde7e0dc0df534262978af4 kbd-1.12-r7.ebuild 2987
-RMD160 9551f48acd8aa9a2e60d5037b894ac4118039c17 kbd-1.12-r7.ebuild 2987
-SHA256 75bfabf8b80fdcef9f39ebac369f2e617652e617f5137291c42c0e25b3131fd3 kbd-1.12-r7.ebuild 2987
+EBUILD kbd-1.12-r7.ebuild 2984 RMD160 bdca70166ba4c64aad57909dacde2f3ed4fc60a3 SHA1 1fd1831ee4806695ab3aa3301994913711ee2f1e SHA256 78cabfdb4d5117d69ed1f09b6ca53ddf717d6683a64520a708c5d0bc4ec3bd4a
+MD5 c142ac6e60f4c5335c71f55442057e1d kbd-1.12-r7.ebuild 2984
+RMD160 bdca70166ba4c64aad57909dacde2f3ed4fc60a3 kbd-1.12-r7.ebuild 2984
+SHA256 78cabfdb4d5117d69ed1f09b6ca53ddf717d6683a64520a708c5d0bc4ec3bd4a kbd-1.12-r7.ebuild 2984
 EBUILD kbd-1.12-r8.ebuild 3079 RMD160 24936269682f315a20e8bd19f8f4ad67ca4e22fb SHA1 fa4cda957a0fa441f7735b8a2b898960feb5810e SHA256 cc2186ab3a1662129c9852bf366519b50af7ebcf0a2f20422a3bc08955251c42
 MD5 ad227577ecf61627325d8e61615041f7 kbd-1.12-r8.ebuild 3079
 RMD160 24936269682f315a20e8bd19f8f4ad67ca4e22fb kbd-1.12-r8.ebuild 3079
@@ -76,9 +75,6 @@ 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-r5 446
-RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r5 446
-SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r5 446
 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
@@ -88,3 +84,10 @@ SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/di
 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.5 (GNU/Linux)
+
+iD8DBQFE/lxGamhnQswr0vIRAiF0AJ90RctlSlyabsEXCliqhoJ/gyrUiACcDYHP
+AcX68rCsYbuYMZNuTD33U6g=
+=p2xT
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r5 b/sys-apps/kbd/files/digest-kbd-1.12-r5
deleted file mode 100644
index 7bbb85a86bcb..000000000000
--- a/sys-apps/kbd/files/digest-kbd-1.12-r5
+++ /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-r5.ebuild b/sys-apps/kbd/kbd-1.12-r5.ebuild
deleted file mode 100644
index 569fda97b90c..000000000000
--- a/sys-apps/kbd/kbd-1.12-r5.ebuild
+++ /dev/null
@@ -1,105 +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-r5.ebuild,v 1.10 2006/02/11 05:43:44 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
-
-	# 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
-
-	# The italian keymap is missing euro support #75970
-	epatch "${FILESDIR}"/${P}-it-euro-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
-}