Add Freedesktop.org .desktop file; Resolves Bug #107026; Corrected build system to obey CFLAGS; Port to modular X dependencies; Remove old ebuilds.

Package-Manager: portage-2.1_pre5-r4

12 files changed, 156 insertions, 146 deletions

diff --git a/app-editors/jasspa-microemacs/ChangeLog b/app-editors/jasspa-microemacs/ChangeLog
index 801b5a4f2e8b..cb0ee345981f 100644
--- a/app-editors/jasspa-microemacs/ChangeLog
+++ b/app-editors/jasspa-microemacs/ChangeLog
@@ -1,6 +1,15 @@
 # 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.12 2005/05/21 19:48:33 usata Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.13 2006/03/11 19:26:15 mkennedy Exp $
+
+*jasspa-microemacs-20050505-r1 (11 Mar 2006)
+
+  11 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/jasspa-microemacs.desktop, -jasspa-microemacs-20021205.ebuild,
+  -jasspa-microemacs-20040301.ebuild, jasspa-microemacs-20040301-r2.ebuild,
+  jasspa-microemacs-20050505.ebuild, +jasspa-microemacs-20050505-r1.ebuild:
+  Add Freedesktop.org .desktop file; Resolves Bug #107026; Corrected build
+  system to obey CFLAGS; Port to modular X dependencies; Remove old ebuilds.
 
 *jasspa-microemacs-20050505 (21 May 2005)
 
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 60cda79ea2a8..b6a650d9bd43 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -1,12 +1,43 @@
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 6ebf3f3bdb835ad9aaf644bda690f81d jasspa-microemacs-20021205.ebuild 1550
-MD5 3472a407c9d115d9fc32eabbd59db032 ChangeLog 1996
-MD5 a5079b0e532b9c5bec63618134e324e0 jasspa-microemacs-20050505.ebuild 1673
-MD5 78fe17a31bc275f29af45a7e72bbd94c jasspa-microemacs-20040301.ebuild 1717
-MD5 608fddff5239517630dfc390ab84f187 jasspa-microemacs-20040301-r2.ebuild 1689
-MD5 311c5a9595e89418254035a3e5330f2a files/digest-jasspa-microemacs-20021205 79
-MD5 f2126111b13fb10129895df8aa7b417b files/digest-jasspa-microemacs-20040301 287
-MD5 6bd07eac50b8b848056244f580fa657b files/digest-jasspa-microemacs-20050505 287
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 48825c8c18cfcfc38be8ecd57054279e ChangeLog 2475
+RMD160 148618db49eb95b808a358760083da4e7a1b0b60 ChangeLog 2475
+SHA256 d88ab3e181dd9be87208b0da86e78931294f55cf6003d08984bd5adde677dbe7 ChangeLog 2475
 MD5 f2126111b13fb10129895df8aa7b417b files/digest-jasspa-microemacs-20040301-r2 287
+RMD160 d94961203ff3f7ad0d301ae04ffc52bee7a84619 files/digest-jasspa-microemacs-20040301-r2 287
+SHA256 adc2f5daddec5ec70134f4e59b4e99ff55480f81eec4a20ca63f7fcb6a177d91 files/digest-jasspa-microemacs-20040301-r2 287
+MD5 869b1954ad61d9e54850d128ca274fe6 files/digest-jasspa-microemacs-20050505 1045
+RMD160 0cd79ff9535ccf7cece5fe5d8dcd45e25d71e2c9 files/digest-jasspa-microemacs-20050505 1045
+SHA256 32af4a529ad07f9b1f22183037a33af780e8b83c4e32fd739dbae3886428395a files/digest-jasspa-microemacs-20050505 1045
+MD5 869b1954ad61d9e54850d128ca274fe6 files/digest-jasspa-microemacs-20050505-r1 1045
+RMD160 0cd79ff9535ccf7cece5fe5d8dcd45e25d71e2c9 files/digest-jasspa-microemacs-20050505-r1 1045
+SHA256 32af4a529ad07f9b1f22183037a33af780e8b83c4e32fd739dbae3886428395a files/digest-jasspa-microemacs-20050505-r1 1045
 MD5 7b5e1eb4627dc2312d5bcb24d55324d8 files/jasspa-microemacs-xorg.patch 456
+RMD160 c51863bcc11784853e8fdad650c316aad1f25a6e files/jasspa-microemacs-xorg.patch 456
+SHA256 5518288f802dbde4cd0b72def6e5d6f614200213c56f5c4a7364705ee7175b73 files/jasspa-microemacs-xorg.patch 456
+MD5 f1d7ec4394e1e668f67b0b4a7deaac51 files/jasspa-microemacs.desktop 222
+RMD160 60670f3355dde3429beda63edcc22f286e3262a8 files/jasspa-microemacs.desktop 222
+SHA256 73d09fba91361d239cd9baed98afe760254424c5d9a456e47156cd05af921ec7 files/jasspa-microemacs.desktop 222
 MD5 8a2f8b31aa6eb71c4a995f35ed745226 files/me 187
+RMD160 7e9c240173741c7df21dddd1506e6196e9d35b14 files/me 187
+SHA256 e51e7ac1a6798cc498f19893d890637d039943d17d61bbc94b13f8047a5fe434 files/me 187
+MD5 62604a92b780f92573af8e01be0863be jasspa-microemacs-20040301-r2.ebuild 1713
+RMD160 9c90730ffd5c76fe28ced18d909f0850e521bf38 jasspa-microemacs-20040301-r2.ebuild 1713
+SHA256 0b9e40a0cd9ace8de89070d1456e694d23ec5be9efcdf34332eb00d53780dc67 jasspa-microemacs-20040301-r2.ebuild 1713
+MD5 d674590fc62ca812d55d7b0372e22d69 jasspa-microemacs-20050505-r1.ebuild 1785
+RMD160 5f0d9e6737734904552d38479f1bce628a3b7573 jasspa-microemacs-20050505-r1.ebuild 1785
+SHA256 f09449b2ccef693e7ef8b67cc9f8af93d2f525a60def46ffd593b43888624c5c jasspa-microemacs-20050505-r1.ebuild 1785
+MD5 82fb2fa66f5176d5e81148a55a02511a jasspa-microemacs-20050505.ebuild 1698
+RMD160 66de4c043d488d43c58dcc9ae18171eee0493cd1 jasspa-microemacs-20050505.ebuild 1698
+SHA256 0fe5f5b86a6678e44560e6dad2dbdf1c2026c7eca5ad738aea1f4ecb089dcee7 jasspa-microemacs-20050505.ebuild 1698
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
+SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFEEyRjyiNZaEAZA+ARAh8VAJ9vASrrwlVgm+2FcFP3BGGnrrCvvQCfezVi
+FJ/9NiI9+xVfFdU0X1gCoYU=
+=QOhP
+-----END PGP SIGNATURE-----
diff --git a/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20021205 b/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20021205
deleted file mode 100644
index c7bfbfd105a0..000000000000
--- a/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20021205
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8fc8f992a2c4525a9020f3a0b98513e jasspa-microemacs-20021205.tar.gz 2009495
diff --git a/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20040301 b/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20040301
deleted file mode 100644
index a82efe365c5e..000000000000
--- a/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20040301
+++ /dev/null
@@ -1,4 +0,0 @@
-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/digest-jasspa-microemacs-20050505 b/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20050505
index 82edf9613102..990afe133c30 100644
--- a/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20050505
+++ b/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20050505
@@ -1,4 +1,12 @@
-MD5 1eaab11945f2fab0b1131dcc3f94364d jasspa-memacros-20050505.tar.gz 964556
 MD5 4f401363ea1e602932c28ec78e10a9d7 jasspa-mehtml-20050505.tar.gz 564799
+RMD160 f5b8dbafe1c17aae7966eb927789058f0b8f8a4e jasspa-mehtml-20050505.tar.gz 564799
+SHA256 b2a21e0fca4eb51ab815b01aa2c5d59e85ecf4cf329c0b994cc0c59afb9a3f1e jasspa-mehtml-20050505.tar.gz 564799
+MD5 1eaab11945f2fab0b1131dcc3f94364d jasspa-memacros-20050505.tar.gz 964556
+RMD160 0a45834b68cab711762119c5a81aaa1e3944c507 jasspa-memacros-20050505.tar.gz 964556
+SHA256 ec724ecd1f2ecba91e2ddc86bf1db061d498c1e6aa3e26b178263679744e56c2 jasspa-memacros-20050505.tar.gz 964556
 MD5 67588906a6c5e8a308dd9d40756bd5eb jasspa-mesrc-20050505.tar.gz 767694
+RMD160 7825b3ed6fdea531aea9e1c300e010a7985e8be4 jasspa-mesrc-20050505.tar.gz 767694
+SHA256 316472d2a818b5e138f71df8c3d90c94c6658c605b761233322de341d7897824 jasspa-mesrc-20050505.tar.gz 767694
 MD5 2548c06eb31b79f48d5366730c4a07db meicons-extra.tar.gz 43345
+RMD160 6fab9d24f82bbdce9d043d1c5b483eee42f1e780 meicons-extra.tar.gz 43345
+SHA256 d56864a6abccda2b6f79b8b86c545ae4b2abb40b8761cd97bda986aed454e8ef meicons-extra.tar.gz 43345
diff --git a/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20050505-r1 b/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20050505-r1
new file mode 100644
index 000000000000..990afe133c30
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/digest-jasspa-microemacs-20050505-r1
@@ -0,0 +1,12 @@
+MD5 4f401363ea1e602932c28ec78e10a9d7 jasspa-mehtml-20050505.tar.gz 564799
+RMD160 f5b8dbafe1c17aae7966eb927789058f0b8f8a4e jasspa-mehtml-20050505.tar.gz 564799
+SHA256 b2a21e0fca4eb51ab815b01aa2c5d59e85ecf4cf329c0b994cc0c59afb9a3f1e jasspa-mehtml-20050505.tar.gz 564799
+MD5 1eaab11945f2fab0b1131dcc3f94364d jasspa-memacros-20050505.tar.gz 964556
+RMD160 0a45834b68cab711762119c5a81aaa1e3944c507 jasspa-memacros-20050505.tar.gz 964556
+SHA256 ec724ecd1f2ecba91e2ddc86bf1db061d498c1e6aa3e26b178263679744e56c2 jasspa-memacros-20050505.tar.gz 964556
+MD5 67588906a6c5e8a308dd9d40756bd5eb jasspa-mesrc-20050505.tar.gz 767694
+RMD160 7825b3ed6fdea531aea9e1c300e010a7985e8be4 jasspa-mesrc-20050505.tar.gz 767694
+SHA256 316472d2a818b5e138f71df8c3d90c94c6658c605b761233322de341d7897824 jasspa-mesrc-20050505.tar.gz 767694
+MD5 2548c06eb31b79f48d5366730c4a07db meicons-extra.tar.gz 43345
+RMD160 6fab9d24f82bbdce9d043d1c5b483eee42f1e780 meicons-extra.tar.gz 43345
+SHA256 d56864a6abccda2b6f79b8b86c545ae4b2abb40b8761cd97bda986aed454e8ef meicons-extra.tar.gz 43345
diff --git a/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop b/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop
new file mode 100644
index 000000000000..1f607daf1b93
--- /dev/null
+++ b/app-editors/jasspa-microemacs/files/jasspa-microemacs.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Jasspa MicroEmacs
+GenericName=Text Editor
+Comment=Advanced Text Editor
+Exec=me %F
+Terminal=False
+Icon=/usr/share/jasspa/icons/32x32/me.png
+Type=Application
+Categories=Utility;TextEditor
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20021205.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20021205.ebuild
deleted file mode 100644
index f1567ff2b9a6..000000000000
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20021205.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-20021205.ebuild,v 1.6 2005/01/01 13:28:01 eradicator Exp $
-
-MY_PV=${PV:2}	# 20021205 -> 021205
-
-DESCRIPTION="Jasspa Microemacs"
-HOMEPAGE="http://www.jasspa.com/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-# downloaded from:
-#SRC_URI="http://www.jasspa.com/release_${MY_PV}/memacros.tar.gz 
-#	http://www.jasspa.com/release_${MY_PV}/me.ehf.gz
-#	http://www.jasspa.com/release_${MY_PV}/mehtml.tar.gz
-#	http://www.jasspa.com/release_${MY_PV}/mesrc.tar.gz 
-#	http://www.jasspa.com/release_${MY_PV}/meicons.tar.gz 
-#	http://www.jasspa.com/release_${MY_PV}/meicons-extra.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"
-IUSE="X"
-
-DEPEND="virtual/libc
-	sys-libs/ncurses
-	X? ( virtual/x11 )"
-
-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
-	mv me me32
-	cat >me <<'EOT'
-#!/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
-EOT
-}
-
-src_install() {
-	dodir /usr/share/jasspa
-	keepdir /usr/share/jasspa/site
-	dobin me
-	dobin me32
-	cp -r ${S}/stagging/* ${D}/usr/share/jasspa
-}
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r2.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r2.ebuild
index 01d7b2107ec3..a37ad0a9d805 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r2.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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-r2.ebuild,v 1.3 2005/04/18 16:49:23 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20040301-r2.ebuild,v 1.4 2006/03/11 19:26:15 mkennedy Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jasspa.com/release_${MY_PV}/jasspa-memacros-${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/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
 
@@ -24,7 +24,7 @@ IUSE="X"
 
 DEPEND="virtual/libc
 	sys-libs/ncurses
-	X? ( virtual/x11 )"
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )"
 
 S="${WORKDIR}/me${MY_PV}/src"
 
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20040301.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20040301.ebuild
deleted file mode 100644
index 9e7dd0484beb..000000000000
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20040301.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.ebuild,v 1.7 2005/01/01 13:28:01 eradicator Exp $
-
-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/}
-}
-
-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
-	mv me me32
-	cat >me <<'EOT'
-#!/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
-EOT
-}
-
-src_install() {
-	dodir /usr/share/jasspa
-	keepdir /usr/share/jasspa/site
-	dobin me me32 || die
-	dodoc ../*.txt ../change.log
-	cp -r ${T}/* ${D}/usr/share/jasspa
-}
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20050505-r1.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20050505-r1.ebuild
new file mode 100644
index 000000000000..e5cb9e485907
--- /dev/null
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20050505-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20050505-r1.ebuild,v 1.1 2006/03/11 19:26:15 mkennedy Exp $
+
+inherit eutils
+
+MY_PV=${PV}	# 20021205 -> 021205
+
+DESCRIPTION="Jasspa Microemacs"
+HOMEPAGE="http://www.jasspa.com/"
+SRC_URI="http://www.jasspa.com/release_${PV}/jasspa-memacros-${PV}.tar.gz
+	http://www.jasspa.com/release_${PV}/jasspa-mehtml-${PV}.tar.gz
+	http://www.jasspa.com/release_${PV}/jasspa-mesrc-${PV}.tar.gz
+	http://www.jasspa.com/release_${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? ( || ( x11-libs/libX11 virtual/x11 ) )"
+
+S="${WORKDIR}/me${PV:2}/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}/" linux{2,26}.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
+	if use X; then
+		newbin me me32 || die
+		dobin ${FILESDIR}/me || die
+	else
+		dobin mec || die
+		dosym /usr/bin/mec /usr/bin/me
+	fi
+	dodoc ../*.txt ../change.log
+	cp -r ${T}/* ${D}/usr/share/jasspa
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/jasspa-microemacs.desktop
+}
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20050505.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20050505.ebuild
index e0aa0e87168e..47a050df333e 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20050505.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20050505.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20050505.ebuild,v 1.1 2005/05/21 19:48:33 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20050505.ebuild,v 1.2 2006/03/11 19:26:15 mkennedy Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jasspa.com/release_${PV}/jasspa-memacros-${PV}.tar.gz
 	http://www.jasspa.com/release_${PV}/jasspa-mesrc-${PV}.tar.gz
 	http://www.jasspa.com/release_${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/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
 
@@ -24,7 +24,7 @@ IUSE="X"
 
 DEPEND="virtual/libc
 	sys-libs/ncurses
-	X? ( virtual/x11 )"
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )"
 
 S="${WORKDIR}/me${PV:2}/src"