make X optional even in the presense of "truetype"

4 files changed, 75 insertions, 8 deletions

diff --git a/app-editors/jed/ChangeLog b/app-editors/jed/ChangeLog
index 8d9cb3793d18..2a2c19bc8944 100644
--- a/app-editors/jed/ChangeLog
+++ b/app-editors/jed/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for app-editors/jed
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.11 2003/06/04 21:21:08 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.12 2003/06/05 13:42:06 liquidx Exp $
 
   04 Jun 2003; Christian Birchinger <joker@gentoo.org> jed-0.99.16-r1.ebuild:
   Added sparc stable keyword
 
+  05 Jun 2003; Alastair Tse <liquidx@gentoo.org> jed-0.99.16-r1.ebuild:
+  make X optional again even if use has +truetype
+
   04 Jun 2003; Alastair Tse <liquidx@gentoo.org> jed-0.99.16-r1.ebuild:
   changed default keybindings to emacs. #17717.
 
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index 450a3cb2ac53..5c3ea4428bbb 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,8 +1,9 @@
-MD5 2f0e9ce613ed4e035f64d115fe9abe97 ChangeLog 1519
-MD5 72ecf9920b840195615d1f3218fab4ea jed-0.99.14-r1.ebuild 1531
+MD5 86ee240a687483e016ba5daf5fd68acc ChangeLog 1644
 MD5 dcfe5d0fb95f3393b49ed3eaebddf9e6 jed-0.99.16.ebuild 1531
-MD5 256c1d897dec6b38aa0d0fa4137b3693 jed-0.99.16-r1.ebuild 2155
+MD5 a9071179dadc46bf9a514fe41c58c73a jed-0.99.16-r1.ebuild 2180
+MD5 72ecf9920b840195615d1f3218fab4ea jed-0.99.14-r1.ebuild 1531
 MD5 51be96423b1d381dae0e2f3adbd6baa9 files/digest-jed-0.99.14-r1 65
 MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16 64
 MD5 57236ca58f912a25d88e6c9520df83a2 files/jed.info.diff 333
 MD5 6ecd48789e4a99f0f3725102b42f4297 files/digest-jed-0.99.16-r1 64
+MD5 9ddff99ca56880f5128ffcc4336460fe files/jed-0.99.16-gentoo-shmode.sl 2434
diff --git a/app-editors/jed/files/jed-0.99.16-gentoo-shmode.sl b/app-editors/jed/files/jed-0.99.16-gentoo-shmode.sl
new file mode 100644
index 000000000000..edeeb2c8f523
--- /dev/null
+++ b/app-editors/jed/files/jed-0.99.16-gentoo-shmode.sl
@@ -0,0 +1,63 @@
+% This is a simple shell mode.  It does not defined any form of indentation
+% style.  Rather, it simply implements a highlighting scheme.
+
+$1 = "SH";
+
+create_syntax_table ($1);
+define_syntax ("#", "", '%', $1);
+define_syntax ("([{", ")]}", '(', $1);
+
+% Unfortunately, the editor cannot currently correctly deal with multiple 
+% string characters.  So, inorder to handle something like:
+%    echo "I'd rather be home"
+% make the '"' character the actual string character but also give '\'' 
+% a string syntax.  However, this will cause '"' to give problems but 
+% usually, '"' characters will be paired.
+define_syntax ('\'', '"', $1);
+define_syntax ('"', '"', $1);
+
+define_syntax ('\\', '\\', $1);
+define_syntax ("-0-9a-zA-Z_", 'w', $1);        % words
+define_syntax ("-+0-9", '0', $1);   % Numbers
+define_syntax (",;:", ',', $1);
+define_syntax ("%-+/&*=<>|!~^", '+', $1);
+
+#ifdef HAS_DFA_SYNTAX
+%%% DFA_CACHE_BEGIN %%%
+static define setup_dfa_callback (name)
+{
+   dfa_enable_highlight_cache ("shmode.dfa", name);
+   dfa_define_highlight_rule ("\\\\.", "normal", name);
+   dfa_define_highlight_rule ("#.*$", "comment", name);
+   dfa_define_highlight_rule ("\"([^\\\\\"]|\\\\.)*\"", "string", name);
+   dfa_define_highlight_rule ("\"([^\\\\\"]|\\\\.)*$", "string", name);
+   dfa_define_highlight_rule ("'[^']*'", "string", name);
+   dfa_define_highlight_rule ("'[^']*$", "string", name);
+   dfa_define_highlight_rule ("[\\|&;\\(\\)<>]", "Qdelimiter", name);
+   dfa_define_highlight_rule ("[\\[\\]\\*\\?]", "Qoperator", name);
+   dfa_define_highlight_rule ("[^ \t\"'\\\\\\|&;\\(\\)<>\\[\\]\\*\\?]+",
+			  "Knormal", name);
+   dfa_define_highlight_rule (".", "normal", name);
+   dfa_build_highlight_table (name);
+}
+dfa_set_init_callback (&setup_dfa_callback, "SH");
+%%% DFA_CACHE_END %%%
+#endif
+
+() = define_keywords ($1, "cddofiifin", 2);
+() = define_keywords ($1, "forletpwdset", 3);
+() = define_keywords ($1, "casedoneechoelifelseesacevalexitifeqreadtestthentype", 4);
+() = define_keywords ($1, "aliasbreakendifendswifdefifneqlocalshiftumaskunsetuntilwhile", 5);
+() = define_keywords ($1, "exportifndefreturnsetenvsourceswitch", 6);
+() = define_keywords ($1, "breaksw", 7);
+() = define_keywords ($1, "continuefunction", 8);
+
+define sh_mode ()
+{
+   set_mode("SH", 0);
+   use_syntax_table ("SH");
+   mode_set_mode_info ("SH", "fold_info", "#{{{\r#}}}\r\r");
+   run_mode_hooks("sh_mode_hook");
+   setkey("self_insert_cmd",  "^I");    
+}
+
diff --git a/app-editors/jed/jed-0.99.16-r1.ebuild b/app-editors/jed/jed-0.99.16-r1.ebuild
index eb3e6d0347e2..7cba694616fd 100644
--- a/app-editors/jed/jed-0.99.16-r1.ebuild
+++ b/app-editors/jed/jed-0.99.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r1.ebuild,v 1.5 2003/06/04 21:21:08 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r1.ebuild,v 1.6 2003/06/05 13:42:06 liquidx Exp $
 
 IUSE="X gpm truetype"
 
@@ -13,8 +13,8 @@ HOMEPAGE="http://space.mit.edu/~davis/jed/"
 DEPEND=">=sys-libs/slang-1.4.5
 	X? ( virtual/x11 )
 	gpm? ( sys-libs/gpm )
-	truetype? ( virtual/xft
-                >=media-libs/freetype-2.0 )"
+	X? ( truetype? ( virtual/xft
+                >=media-libs/freetype-2.0 ) )"
 
 PROVIDE="virtual/editor"
 
@@ -41,7 +41,7 @@ src_compile() {
 		cd ${S}
 	fi
 
-	if [ -n "`use truetype`" ]; then
+	if [ -n "`use X`" -a -n "`use truetype`" ]; then
 	   cd src
 	   mv Makefile Makefile.orig
 	   sed -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile.orig > Makefile.new