Fix bug #126939: "AltGr does not work in x2x with different keymaps".

(Portage version: 2.1_pre7-r5)

5 files changed, 87 insertions, 3 deletions

diff --git a/x11-misc/x2x/ChangeLog b/x11-misc/x2x/ChangeLog
index 3ed2e3d820ea..76a489a234aa 100644
--- a/x11-misc/x2x/ChangeLog
+++ b/x11-misc/x2x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/x2x
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.17 2006/04/13 11:13:55 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/ChangeLog,v 1.18 2006/04/14 18:55:08 nelchael Exp $
+
+*x2x-1.27-r2 (14 Apr 2006)
+
+  14 Apr 2006; Krzysiek Pawlik <nelchael@gentoo.org> x2x-1.27.ebuild,
+  x2x-1.27-r1.ebuild, +x2x-1.27-r2.ebuild:
+  Fix bug #126939: "AltGr does not work in x2x with different keymaps".
 
   13 Apr 2006; Ferris McCormick <fmccor@gentoo.org> x2x-1.27-r1.ebuild:
   Stable for sparc (X-modular compliance).
diff --git a/x11-misc/x2x/files/digest-x2x-1.27-r2 b/x11-misc/x2x/files/digest-x2x-1.27-r2
new file mode 100644
index 000000000000..a918ddd65ef6
--- /dev/null
+++ b/x11-misc/x2x/files/digest-x2x-1.27-r2
@@ -0,0 +1,15 @@
+MD5 216fde4de41f1137111dc9c861e879a6 x2x-1.27-keymap.diff.gz 1145
+RMD160 661ab187b1c947a7f2aa3a9c6ae02a34ee6eeb13 x2x-1.27-keymap.diff.gz 1145
+SHA256 7a18a9729868325b133fc62f5aaf759db9ebf20192e2d6d16b0dcf32927c7dc1 x2x-1.27-keymap.diff.gz 1145
+MD5 31458c78fb5ded7e92a3cccb39b77143 x2x-1.27-license.patch.gz 1001
+RMD160 3ef946a86975e1ccb594968f70614197abd85a33 x2x-1.27-license.patch.gz 1001
+SHA256 1b78a9de556622c72fd66bbf23245cd62cefe3c4e5ba37971f37c43eab2c9964 x2x-1.27-license.patch.gz 1001
+MD5 3d1bc863f3209ec37caf7f57bde7e8f0 x2x-1.27.tar.gz 16776
+RMD160 d26dad258aa785d1257f5d0fb6d4b45a322b5693 x2x-1.27.tar.gz 16776
+SHA256 d27ffc37d801934e79a91aa8f413d9d6466297995bf7c88156842d1aec040a36 x2x-1.27.tar.gz 16776
+MD5 041153ed2bb2dd807c9b7ee7c533bd00 x2x_1.27-8-initvars.patch.gz 494
+RMD160 33c15b42d387298b6d32f19203d9cc8a94989a39 x2x_1.27-8-initvars.patch.gz 494
+SHA256 b34173edeae1a5dd06ead2f9712ac4f28018b2723921054286d851366cdf9920 x2x_1.27-8-initvars.patch.gz 494
+MD5 8b194387b2712fb9c1b02c166e8e47c6 x2x_1.27-8.diff.gz 13291
+RMD160 a3832676ad8a7858dfc65fbb398cd7b4b038140f x2x_1.27-8.diff.gz 13291
+SHA256 d20fcc3e81ef60ef4720737883642739bb744a1d690c74b33d9086118e8b10ab x2x_1.27-8.diff.gz 13291
diff --git a/x11-misc/x2x/x2x-1.27-r1.ebuild b/x11-misc/x2x/x2x-1.27-r1.ebuild
index 74350edcf87c..6a1f7362de2e 100644
--- a/x11-misc/x2x/x2x-1.27-r1.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r1.ebuild,v 1.7 2006/04/13 11:13:55 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r1.ebuild,v 1.8 2006/04/14 18:55:08 nelchael Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ RDEPEND="|| ( (
 DEPEND="${RDEPEND}
 	|| ( (
 		app-text/rman
+		x11-misc/imake
 		x11-proto/xproto )
 	virtual/x11 )"
 
diff --git a/x11-misc/x2x/x2x-1.27-r2.ebuild b/x11-misc/x2x/x2x-1.27-r2.ebuild
new file mode 100644
index 000000000000..3ccd42ecb064
--- /dev/null
+++ b/x11-misc/x2x/x2x-1.27-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27-r2.ebuild,v 1.1 2006/04/14 18:55:08 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="An utility to connect the Mouse and KeyBoard to another X"
+HOMEPAGE="http://www.the-labs.com/X11/#x2x"
+LICENSE="as-is"
+SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
+	mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz
+	mirror://gentoo/x2x_1.27-8-initvars.patch.gz
+	mirror://gentoo/${P}-license.patch.gz
+	mirror://gentoo/${P}-keymap.diff.gz"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXtst
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		app-text/rman
+		x11-misc/imake
+		x11-proto/xproto )
+	virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch from Debian to add -north and -south, among other fixes
+	epatch ${DISTDIR}/x2x_1.27-8.diff.gz
+
+	# Fix variable initialization in Debian patch
+	epatch ${DISTDIR}/x2x_1.27-8-initvars.patch.gz
+
+	# Patch to add LICENSE
+	epatch ${DISTDIR}/${P}-license.patch.gz
+
+	# Patch to fix bug #126939
+	# AltGr does not work in x2x with different keymaps:
+	epatch ${DISTDIR}/${P}-keymap.diff.gz
+
+	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
+	mv x2x.1 x2x.man || die
+}
+
+src_compile() {
+	xmkmf || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	newman x2x.man x2x.1 || die
+	dodoc LICENSE || die
+}
diff --git a/x11-misc/x2x/x2x-1.27.ebuild b/x11-misc/x2x/x2x-1.27.ebuild
index 50bdd3a5976f..a22ea1e5bf14 100644
--- a/x11-misc/x2x/x2x-1.27.ebuild
+++ b/x11-misc/x2x/x2x-1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27.ebuild,v 1.13 2006/03/18 16:57:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x2x/x2x-1.27.ebuild,v 1.14 2006/04/14 18:55:08 nelchael Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ RDEPEND="|| ( (
 DEPEND="${RDEPEND}
 	|| ( (
 		app-text/rman
+		x11-misc/imake
 		x11-proto/xproto )
 	virtual/x11 )"