Fixed AltGr key problem with xorg-x11. Thanks to Matti P. T. Juvonen <gentoo@mpj.iki.fi>; bug #81547.

(Portage version: 2.0.51.16)

6 files changed, 97 insertions, 2 deletions

diff --git a/app-editors/jasspa-microemacs/ChangeLog b/app-editors/jasspa-microemacs/ChangeLog
index d782ef700c6b..3ae9c3dceed7 100644
--- a/app-editors/jasspa-microemacs/ChangeLog
+++ b/app-editors/jasspa-microemacs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/jasspa-microemacs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.7 2005/01/01 13:28:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.8 2005/02/11 12:14:28 usata Exp $
+
+*jasspa-microemacs-20040301-r1 (11 Feb 2005)
+
+  11 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/jasspa-microemacs-xorg.patch, +files/me,
+  +jasspa-microemacs-20040301-r1.ebuild:
+  Fixed AltGr key problem with xorg-x11. Thanks to Matti P. T. Juvonen
+  <gentoo@mpj.iki.fi>; bug #81547.
 
   26 Aug 2004; Mamoru KOMACHI <usata@gentoo.org>
   jasspa-microemacs-20040301.ebuild:
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 6b184e64f7ab..9fa643a95d12 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -1,6 +1,10 @@
 MD5 d4677b811b06ab4ae5aaff838e94dfa7 ChangeLog 1040
 MD5 6ebf3f3bdb835ad9aaf644bda690f81d jasspa-microemacs-20021205.ebuild 1550
-MD5 78fe17a31bc275f29af45a7e72bbd94c jasspa-microemacs-20040301.ebuild 1717
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 78fe17a31bc275f29af45a7e72bbd94c jasspa-microemacs-20040301.ebuild 1717
+MD5 c13a153d95e9b586820491f93809bad0 jasspa-microemacs-20040301-r1.ebuild 1610
 MD5 311c5a9595e89418254035a3e5330f2a files/digest-jasspa-microemacs-20021205 79
 MD5 f2126111b13fb10129895df8aa7b417b files/digest-jasspa-microemacs-20040301 287
+MD5 8a2f8b31aa6eb71c4a995f35ed745226 files/me 187
+MD5 7b5e1eb4627dc2312d5bcb24d55324d8 files/jasspa-microemacs-xorg.patch 456
+MD5 f2126111b13fb10129895df8aa7b417b files/digest-jasspa-microemacs-20040301-r1 287
diff --git a/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20040301-r1 b/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20040301-r1
new file mode 100644
index 000000000000..a82efe365c5e
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20040301-r1
@@ -0,0 +1,4 @@
+MD5 038e097921e773c674542667a9a032dd jasspa-memacros-20040301.tar.gz 869410
+MD5 91178a3327d90b530005473f38f32950 jasspa-mehtml-20040301.tar.gz 515109
+MD5 2860f5596f6b7a46de7b18f31c71304b jasspa-mesrc-20040301.tar.gz 732106
+MD5 2548c06eb31b79f48d5366730c4a07db meicons-extra.tar.gz 43345
diff --git a/app-editors/jasspa-microemacs/files/jasspa-microemacs-xorg.patch b/app-editors/jasspa-microemacs/files/jasspa-microemacs-xorg.patch
new file mode 100644
index 000000000000..f2db2cbfe58d
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/jasspa-microemacs-xorg.patch
@@ -0,0 +1,13 @@
+--- me040301-old/src/unixterm.c 2004-03-27 17:02:05.000000000 +0000
++++ me040301/src/unixterm.c     2005-02-10 23:35:40.265849484 +0000
+@@ -1745,6 +1745,9 @@
+                     /* Mode switch - used on foreign keyboards, always ignore. */
+
+                     /* Character set switch */
++#ifdef XK_ISO_Level3_Shift
++                case XK_ISO_Level3_Shift:
++#endif
+ #ifdef XK_Mode_switch
+                 case XK_Mode_switch:
+ #ifdef XK_script_switch
+
diff --git a/app-editors/jasspa-microemacs/files/me b/app-editors/jasspa-microemacs/files/me
new file mode 100644
index 000000000000..409d6c803c9a
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/me
@@ -0,0 +1,8 @@
+#!/bin/bash
+if [[ -n "$DISPLAY" ]]
+then
+        set +m; /usr/bin/me32 "$@"
+else
+        # ixon allows ctrl S to be used for searching
+        stty -ixon; /usr/bin/me32 "$@"; stty ixon
+fi
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r1.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r1.ebuild
new file mode 100644
index 000000000000..95f112a2cbbe
--- /dev/null
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r1.ebuild,v 1.1 2005/02/11 12:14:28 usata Exp $
+
+inherit eutils
+
+MY_PV=${PV:2}	# 20021205 -> 021205
+
+DESCRIPTION="Jasspa Microemacs"
+HOMEPAGE="http://www.jasspa.com/"
+SRC_URI="http://www.jasspa.com/release_${MY_PV}/jasspa-memacros-${PV}.tar.gz
+	http://www.jasspa.com/release_${MY_PV}/jasspa-mehtml-${PV}.tar.gz
+	http://www.jasspa.com/release_${MY_PV}/jasspa-mesrc-${PV}.tar.gz
+	http://www.jasspa.com/release_${MY_PV}/meicons-extra.tar.gz"
+#	http://www.jasspa.com/release_${MY_PV}/me.ehf.gz
+#	http://www.jasspa.com/release_${MY_PV}/meicons.tar.gz 
+##	http://www.jasspa.com/spelling/ls_enus.tar.gz
+##	http://www.jasspa.com/release_${MY_PV}/readme.jasspa_gnome
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="X"
+
+DEPEND="virtual/libc
+	sys-libs/ncurses
+	X? ( virtual/x11 )"
+
+S="${WORKDIR}/me${MY_PV}/src"
+
+src_unpack() {
+	unpack jasspa-mesrc-${PV}.tar.gz
+	cd ${T}
+	# everything except jasspa-mesrc
+	unpack ${A/jasspa-mesrc-${PV}.tar.gz/}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-xorg.patch
+}
+
+src_compile() {
+	sed -i "/^COPTIMISE/s/.*/COPTIMISE = ${CFLAGS}/" linux2.gmk
+	local loadpath="~/.jasspa:/usr/share/jasspa/site:/usr/share/jasspa"
+	if use X
+	then
+		./build -p "$loadpath"
+	else
+		./build -t c -p "$loadpath"
+	fi
+}
+
+src_install() {
+	dodir /usr/share/jasspa
+	keepdir /usr/share/jasspa/site
+	newbin me me32 || die
+	dobin ${FILESDIR}/me || die
+	dodoc ../*.txt ../change.log
+	cp -r ${T}/* ${D}/usr/share/jasspa
+}