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

Package-Manager: portage-2.1_pre7-r5

6 files changed, 108 insertions, 28 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/Manifest b/x11-misc/x2x/Manifest
index 0a548b396f49..dd0d9376034b 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -1,28 +1,24 @@
-DIST x2x-1.27-license.patch.gz 1001
-DIST x2x-1.27.tar.gz 16776
-DIST x2x_1.27-8-initvars.patch.gz 494
-DIST x2x_1.27-8.diff.gz 13291
-EBUILD x2x-1.27-r1.ebuild 1358 RMD160 6382e7e69ff3ac8da55309182a677c8c8d1f1ee7 SHA1 aa9d18ad1df6ebd65de57919c9852437950ae6ec SHA256 f3910273fe5c4e0e3376e93dee815ceaa632eeed474f1d7403f2f98cb7165336
-MD5 064c275a9620f2b3c662018706a524ea x2x-1.27-r1.ebuild 1358
-RMD160 6382e7e69ff3ac8da55309182a677c8c8d1f1ee7 x2x-1.27-r1.ebuild 1358
-SHA256 f3910273fe5c4e0e3376e93dee815ceaa632eeed474f1d7403f2f98cb7165336 x2x-1.27-r1.ebuild 1358
-EBUILD x2x-1.27.ebuild 1055 RMD160 13827b7d776fd8a8f4a4cb2c8a657d86ee47b32f SHA1 ca4a1deb2fd615639b9ffd3943f3cc70c534451c SHA256 4ad904b031525f89dc44a5a7b41aa0161e7a64b802e53d004f086cbdb25d1f92
-MD5 c7df4eb39020b52a9135e0adc5f32db3 x2x-1.27.ebuild 1055
-RMD160 13827b7d776fd8a8f4a4cb2c8a657d86ee47b32f x2x-1.27.ebuild 1055
-SHA256 4ad904b031525f89dc44a5a7b41aa0161e7a64b802e53d004f086cbdb25d1f92 x2x-1.27.ebuild 1055
-MISC ChangeLog 2106 RMD160 5e0f5136c46feee1b05ae3c01d8c6d265e9719c9 SHA1 86bf3dc900c9f9df5993ecf57e581b402adc3000 SHA256 4d61495dc3f5c4bbc0a24895768acd9f91505d34dbd225a4981c499912cf8c1f
-MD5 a873f0df2daa9b9c0ed3c24c40cd9e99 ChangeLog 2106
-RMD160 5e0f5136c46feee1b05ae3c01d8c6d265e9719c9 ChangeLog 2106
-SHA256 4d61495dc3f5c4bbc0a24895768acd9f91505d34dbd225a4981c499912cf8c1f ChangeLog 2106
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+MD5 5b931d3a743e4cfde6ef9a7a87062770 ChangeLog 2322
+RMD160 7a83734f5150d8dff15e3b903c8541f5617bc40f ChangeLog 2322
+SHA256 0ce976aa1d948437142d4e59c8f8d512a880b158c49f58e7d679104f9ddcbee1 ChangeLog 2322
+MD5 01ab50adb860c966822f21ead4e230ab files/digest-x2x-1.27 127
+RMD160 82f418d214621bc6fd781de508304648ef458d95 files/digest-x2x-1.27 127
+SHA256 5e5da27a2cf31071a823533e16bf75b743659a72d42da653c3a9b6480c66070d files/digest-x2x-1.27 127
+MD5 b5a6a3d1860be9a5feee96a538f9d5cb files/digest-x2x-1.27-r1 259
+RMD160 769104c51ab8cd55a98ae747c4a5e4c716456b15 files/digest-x2x-1.27-r1 259
+SHA256 e3fce038bb8b12046096bc3b01ece35f5b1d4448f8c749607cf01f25ad57e5ba files/digest-x2x-1.27-r1 259
+MD5 e3307bf6b91bf06ab2dbaece3b8fb8bc files/digest-x2x-1.27-r2 1205
+RMD160 b8155aa0ff92ae980475571576f146370982b864 files/digest-x2x-1.27-r2 1205
+SHA256 42362edb8d83935f50385d5bd8a2b8aaae58a8f48c8e6a1097f691e74d6d7e53 files/digest-x2x-1.27-r2 1205
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata.xml 166
-size 259 files/digest-x2x-1.27-r1 259
-RMD160 769104c51ab8cd55a98ae747c4a5e4c716456b15 files/digest-x2x-1.27-r1 259
-SHA256 e3fce038bb8b12046096bc3b01ece35f5b1d4448f8c749607cf01f25ad57e5ba files/digest-x2x-1.27-r1 259
-MD5 b5a6a3d1860be9a5feee96a538f9d5cb files/digest-x2x-1.27-r1 259
-size 127 files/digest-x2x-1.27 127
-RMD160 82f418d214621bc6fd781de508304648ef458d95 files/digest-x2x-1.27 127
-SHA256 5e5da27a2cf31071a823533e16bf75b743659a72d42da653c3a9b6480c66070d files/digest-x2x-1.27 127
-MD5 01ab50adb860c966822f21ead4e230ab files/digest-x2x-1.27 127
+MD5 5512404ba97bbf9f7043d3f9c5b57bb9 x2x-1.27-r1.ebuild 1377
+RMD160 e03fd25a4475abf792467b36c88ebe85d735cb36 x2x-1.27-r1.ebuild 1377
+SHA256 a8a3e2a4569830a8b78f0a6fd90f39958bd13608b6080444fe00799af3cf0609 x2x-1.27-r1.ebuild 1377
+MD5 49768ffbca53fcf60b43ee3a88f852d6 x2x-1.27-r2.ebuild 1532
+RMD160 f80c24dd0c9f5a4ae78902c315a899def6694c7c x2x-1.27-r2.ebuild 1532
+SHA256 5b7a1a92fb3bf0bfd8b6d64f4dad2c4e2f23804e27bd23f4f23e52141368a0d1 x2x-1.27-r2.ebuild 1532
+MD5 c871249a28039789cfcf2be0c05c35f5 x2x-1.27.ebuild 1072
+RMD160 30964212998be2e32c95999014a5a64bb20c6557 x2x-1.27.ebuild 1072
+SHA256 bb68df391714f6ee937dee371f397270f20a18031b695c103ef4948e2fcb6caa x2x-1.27.ebuild 1072
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 )"