Version bump for bug 215218, thanks to <timofonic at gmail.com>.

Package-Manager: portage-2.1.6_rc3/cvs/Linux 2.6.27.7 i686

5 files changed, 91 insertions, 2 deletions

diff --git a/x11-misc/xkeycaps/ChangeLog b/x11-misc/xkeycaps/ChangeLog
index 7fb7522eb18c..fd4a0a488915 100644
--- a/x11-misc/xkeycaps/ChangeLog
+++ b/x11-misc/xkeycaps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xkeycaps
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.19 2008/03/23 15:46:43 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.20 2008/12/07 21:09:06 ssuominen Exp $
+
+*xkeycaps-2.47 (07 Dec 2008)
+
+  07 Dec 2008; <ssuominen@gentoo.org> +files/xkeycaps-2.47-Imakefile.patch,
+  +files/xkeycaps-2.47-man.patch, +xkeycaps-2.47.ebuild:
+  Version bump for bug 215218, thanks to <timofonic at gmail.com>.
 
   23 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> xkeycaps-2.46.ebuild:
   amd64 stable
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 44603421e41c..feb315f429d0 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,5 +1,9 @@
 AUX Imakefile.patch 664 RMD160 c7cf1a22e3dec7b9290ee84a8706698c06473763 SHA1 86cf5c126d4c52587edba70808c7efd7882d2f26 SHA256 a4f64f4ec83c755655aac25b5a3d60e3f13bc52b71c261d7880fe5851e9d1935
+AUX xkeycaps-2.47-Imakefile.patch 758 RMD160 f73a937628fb10e769f05151293037679c2a5abc SHA1 8f418e41ad43ef3df0605f8a0b2ea75bcc9ea526 SHA256 6d82c2e6cfcdc12c27a64ea690485ae1b7ab8fbe2d678bbb0fafe2a4d60f38d6
+AUX xkeycaps-2.47-man.patch 639 RMD160 4c96acda11fc1ede4ff0a31bdc0b1d538f31eba4 SHA1 2980a0d0a79466ba1d72dc96a5b189c5fe9744e6 SHA256 c56ceda9483ebf96c040deff495a8c03a2a629c1a32d209817a331bd6182127b
 DIST xkeycaps-2.46.tar.Z 489439 RMD160 ee787ac4970204689ec54d14b6072235c7026acb SHA1 458133a394f63d84efacaf917254074005ce953d SHA256 40da137109e0ef0b687a72b71a1ef0b3d08a10749fdda05fc16c52b4cbed763e
+DIST xkeycaps_2.47.orig.tar.gz 351418 RMD160 52c5b817df837797595253409b25178acd014b3f SHA1 a018f8529f7199c818a7aea5e252b08622f90b7d SHA256 efd92e6179ec4506cbb08db11091185f3bd1567eecb2291f91f70980e175d8f4
 EBUILD xkeycaps-2.46.ebuild 999 RMD160 9fcde8b88d17847c4436aec34cbd6c0f9f8e01d5 SHA1 b3c3962a9291469cf56cebacdf9da8c26b06b9a2 SHA256 96c2ee7cfe70883e43098ff46d2a26abf1501046c9ec13be8592d2f67423e6bf
-MISC ChangeLog 2332 RMD160 26000fae06dafef4be5fbd24d352d7a509849010 SHA1 2b03275a3d5f9f038e3c3cd75c0a78d1639df1b3 SHA256 67b78aad5b3b4cc48f1483be6e03cb58fc370a610bb7d1b95505a6f210509c26
+EBUILD xkeycaps-2.47.ebuild 1081 RMD160 1b24c57d29014302626b6f85016f146901b5b5ce SHA1 500efaa768591158250ed7b215a2db848197f541 SHA256 d7a2f5b3a45a373e87868aab1727ffc23c7995bcdf1daad51b3539711a318130
+MISC ChangeLog 2564 RMD160 989f9227077d62159e82b6abdffac3712586e818 SHA1 f0a7ccfca3a16feeca463030542a816c0f270f41 SHA256 9a329e9cf830a9d6c702ee8d6774267045449fa42e438246d317f21bf134270f
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
new file mode 100644
index 000000000000..42f7ab6e344d
--- /dev/null
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47-Imakefile.patch
@@ -0,0 +1,22 @@
+diff -ur xkeycaps-2.47.orig/Imakefile xkeycaps-2.47/Imakefile
+--- xkeycaps-2.47.orig/Imakefile	2005-02-23 00:33:15.000000000 +0200
++++ xkeycaps-2.47/Imakefile	2008-12-07 22:55:24.000000000 +0200
+@@ -1,5 +1,5 @@
+-/**/# Imakefile for xkeycaps;
+-/**/# Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski.
++/* Imakefile for xkeycaps;
++   Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski. */
+ 
+ /*
+  *  To specify a different default keyboard (for when the vendor display
+@@ -353,8 +353,8 @@
+             TAR = tar
+        COMPRESS = compress
+    COMPRESS_EXT = Z
+-/**/#      COMPRESS = gzip --verbose --best
+-/**/#  COMPRESS_EXT = gz
++/* COMPRESS = gzip --verbose --best */
++/* COMPRESS_EXT = gz */
+ 
+ ComplexProgramTarget(xkeycaps)
+ 
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
new file mode 100644
index 000000000000..f68629ef3eaf
--- /dev/null
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch
@@ -0,0 +1,12 @@
+diff -ur xkeycaps-2.47.orig/xkeycaps.man xkeycaps-2.47/xkeycaps.man
+--- xkeycaps-2.47.orig/xkeycaps.man	2006-01-02 02:22:17.000000000 +0200
++++ xkeycaps-2.47/xkeycaps.man	2008-12-07 22:51:38.000000000 +0200
+@@ -267,7 +267,7 @@
+ the physical keys: it is immutable (unless you repaint your keyboard...)
+ .TP 10
+ .B \fIChord\fP
+-This term refers to a set of two or more keys held down simultaniously (by
++This term refers to a set of two or more keys held down simultaneously (by
+ analogy with piano keyboards.)  All but one of the keys will generally be
+ Modifier Keys.  Sometimes \fIConstellation\fP is used to mean the same thing.
+ .TP 10
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47.ebuild
new file mode 100644
index 000000000000..589e8e3e1acd
--- /dev/null
+++ b/x11-misc/xkeycaps/xkeycaps-2.47.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.47.ebuild,v 1.1 2008/12/07 21:09:06 ssuominen Exp $
+
+inherit eutils
+
+DESCRIPTION="GUI frontend to xmodmap"
+HOMEPAGE="http://packages.qa.debian.org/x/xkeycaps.html"
+SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-misc/xbitmaps
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-misc/imake
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Imakefile.patch \
+		"${FILESDIR}"/${P}-man.patch
+}
+
+src_compile() {
+	xmkmf || die "xmkmf failed."
+	sed -i -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
+		Makefile || die "sed failed."
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	newman ${PN}.man ${PN}.1
+	dodoc README *.txt
+}