New ebuild highlighting file thanks to Ed Catmur <ed@catmur.co.uk> in bug 121014, remove old

(Portage version: 2.1_pre7-r2)

9 files changed, 175 insertions, 70 deletions

diff --git a/app-text/enscript/ChangeLog b/app-text/enscript/ChangeLog
index 858b37a79df2..634c4f81d86c 100644
--- a/app-text/enscript/ChangeLog
+++ b/app-text/enscript/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/enscript
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/ChangeLog,v 1.36 2006/04/02 14:55:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/ChangeLog,v 1.37 2006/04/02 21:06:12 genstef Exp $
+
+*enscript-1.6.4-r2 (02 Apr 2006)
+
+  02 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/enscript-1.6.4-ebuild.st.patch, +files/ebuild.st,
+  -enscript-1.6.4.ebuild, -enscript-1.6.4-r1.ebuild,
+  +enscript-1.6.4-r2.ebuild:
+  New ebuild highlighting file thanks to Ed Catmur <ed@catmur.co.uk> in bug
+  121014, remove old
 
   02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   enscript-1.6.4-r1.ebuild:
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 4436ddc07208..988a7d194558 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -1,43 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 001f342fe84747154b55bbe3d1b5e1c7 ChangeLog 4396
-RMD160 78a7344f6ad842a7f6ed14f1c906d3ddf35ca54e ChangeLog 4396
-SHA256 e1421c6c9ff36c01b4d0191e1ca2d38f5cadf036d43c6842320f6cdbda3d2f9f ChangeLog 4396
+MD5 02940a000001e71f6f0efa8f28bf2dc4 ChangeLog 4722
+RMD160 bc96396d33aa67de452bc17ea1179bdde50104ca ChangeLog 4722
+SHA256 1dcf0dda0e2777c17c05530cbbf96d803dc2846837b78484417ecc6ca19deb03 ChangeLog 4722
 MD5 3ecae1143becc2047418f67b38407479 enscript-1.6.3-r3.ebuild 913
 RMD160 8286409f197e6a5ac40835e6717a35947cc70aee enscript-1.6.3-r3.ebuild 913
 SHA256 8f9fe94e894b67daab98b09eaa17b8b5b392c983165b3753e547e1f912c69089 enscript-1.6.3-r3.ebuild 913
-MD5 965b9d97b7a5ffed960c2dc13d302bda enscript-1.6.4-r1.ebuild 1039
-RMD160 c378febbec04429381f9a79ad61ded9d235a2642 enscript-1.6.4-r1.ebuild 1039
-SHA256 89de7a3192707c1b501996c812fe3f79d0221719dbaa04c59c7388d63ad09056 enscript-1.6.4-r1.ebuild 1039
-MD5 f1204f14336bb01477ad8e1721eabee9 enscript-1.6.4.ebuild 978
-RMD160 bfad64bc13b46fffa265003650cb66d7a5bbf4ed enscript-1.6.4.ebuild 978
-SHA256 504eb07edbc8565504a30522b831ce9ced97844f41c5f6838b3cab2a655fd2cc enscript-1.6.4.ebuild 978
+MD5 75da2ec4b28ea2e7809d79ad5ac227fa enscript-1.6.4-r2.ebuild 1150
+RMD160 42676cab87ce4def84bbef91a056651ea3a32d78 enscript-1.6.4-r2.ebuild 1150
+SHA256 cedc4edf5dd287f291b39a07551612042c7d21129e0debdce02cbc00bfcf29f2 enscript-1.6.4-r2.ebuild 1150
 MD5 528d3e39a7e18ff200cccfd037ee0422 files/digest-enscript-1.6.3-r3 66
 RMD160 c52c2515f9ce3e3d10cb80fa1cd701a7ab002311 files/digest-enscript-1.6.3-r3 66
 SHA256 094066740fd5ead29905a49212ecd860f71088a4a7190bbc0e4e5e27a17d9ae2 files/digest-enscript-1.6.3-r3 66
-MD5 96b207f1bc22828660e417ebaab43d03 files/digest-enscript-1.6.4 67
-RMD160 8f3e8822e725681f7ccf15bbc7392836396cd9cc files/digest-enscript-1.6.4 67
-SHA256 31ba27c8d76c5c8964bb9c13b2770d5be9d5ed0d0a36733831ef3d882d747ce6 files/digest-enscript-1.6.4 67
-MD5 96b207f1bc22828660e417ebaab43d03 files/digest-enscript-1.6.4-r1 67
-RMD160 8f3e8822e725681f7ccf15bbc7392836396cd9cc files/digest-enscript-1.6.4-r1 67
-SHA256 31ba27c8d76c5c8964bb9c13b2770d5be9d5ed0d0a36733831ef3d882d747ce6 files/digest-enscript-1.6.4-r1 67
+MD5 f70a39f6291eddbb73355c26d4bbbad7 files/digest-enscript-1.6.4-r2 247
+RMD160 2b4a871cac2752fc37109a71130d72149060bbff files/digest-enscript-1.6.4-r2 247
+SHA256 ba8f7c5272795260040c96a372eb3fd64460a7f6364d3eb7f9d683106519c57d files/digest-enscript-1.6.4-r2 247
+MD5 7a1a122665bbefdc6a1e7df62e28ffb1 files/ebuild.st 6113
+RMD160 9d3aac83d40a3fca3d1cd7707973f6fdb275898a files/ebuild.st 6113
+SHA256 672cade9cfaddc7c21b3fb59952b0dd5f3593d41e958146467f29249f005f5ac files/ebuild.st 6113
 MD5 2982cb4ed62b45684d5e6e015c34a52e files/enscript-1.6.3-language.patch 456
 RMD160 5bc06db3e9d3ff441f2b97e94255d93d7b827e9c files/enscript-1.6.3-language.patch 456
 SHA256 b4830bb18f98749724f1382ef8c47124ae134c707af5303103fead2343710642 files/enscript-1.6.3-language.patch 456
 MD5 e105a37406fc2ff7aa4895780e4b5a66 files/enscript-1.6.3-security.patch 5447
 RMD160 d23a9a4eb478279bf56123d35fc7adc8fd292f30 files/enscript-1.6.3-security.patch 5447
 SHA256 bd9525903b9690f259f0bba8257a96b57681f03a65272d590796c796a8396052 files/enscript-1.6.3-security.patch 5447
+MD5 d87b4ba69c2c5105ffffcb7852c0e873 files/enscript-1.6.4-ebuild.st.patch 332
+RMD160 e4b03bed2014baab7a25b3d1a9cc2a2f1d6e6721 files/enscript-1.6.4-ebuild.st.patch 332
+SHA256 fae2d59559a61a3d2f0fb25695c3dc5eab917e1eb22af61844e85584281728a6 files/enscript-1.6.4-ebuild.st.patch 332
 MD5 854bcc9d4ce6d573dfa5133a55e8ddca files/enscript-catmur.patch 604
 RMD160 74dae25828a36028f877d7cec73f321f5354e4ad files/enscript-catmur.patch 604
 SHA256 23b2359b2ef4e9cf0f6b915fb9f326a0a9ebd3f43f4dcca5f4beb2602201d02c files/enscript-catmur.patch 604
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEL+XXAiZjviIA2XgRAgPYAJ4151V62rBn3FaJ7maEpsnm72MKKQCff8PP
-0gVWfqbkdCkZOqo8S7zp4rs=
-=Udav
------END PGP SIGNATURE-----
diff --git a/app-text/enscript/enscript-1.6.4-r1.ebuild b/app-text/enscript/enscript-1.6.4-r2.ebuild
index 86cbf96fa3ab..d0b75e5e4111 100644
--- a/app-text/enscript/enscript-1.6.4-r1.ebuild
+++ b/app-text/enscript/enscript-1.6.4-r2.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/app-text/enscript/enscript-1.6.4-r1.ebuild,v 1.4 2006/04/02 14:55:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.4-r2.ebuild,v 1.1 2006/04/02 21:06:12 genstef Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	epatch ${FILESDIR}/enscript-1.6.3-security.patch
 	epatch ${FILESDIR}/enscript-1.6.3-language.patch
 	epatch ${FILESDIR}/enscript-catmur.patch
+	epatch ${FILESDIR}/enscript-1.6.4-ebuild.st.patch
 }
 
 src_compile() {
@@ -35,6 +36,8 @@ src_compile() {
 src_install() {
 	einstall || die
 	dodoc AUTHORS ChangeLog FAQ.html NEWS README* THANKS TODO
+	insinto /usr/share/enscript/hl
+	doins ${FILESDIR}/ebuild.st
 }
 
 pkg_postinst() {
diff --git a/app-text/enscript/enscript-1.6.4.ebuild b/app-text/enscript/enscript-1.6.4.ebuild
deleted file mode 100644
index ab009a2f9c15..000000000000
--- a/app-text/enscript/enscript-1.6.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/enscript/enscript-1.6.4.ebuild,v 1.2 2006/01/14 22:39:19 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="powerful text-to-postscript converter"
-SRC_URI="http://www.iki.fi/mtr/genscript/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/enscript/enscript.html"
-
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~mips ~ppc64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="nls"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/enscript-1.6.3-security.patch
-	epatch ${FILESDIR}/enscript-1.6.3-language.patch
-}
-
-src_compile() {
-	unset CC
-	econf `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog FAQ.html NEWS README* THANKS TODO
-}
-
-pkg_postinst() {
-	einfo "Now, customize /etc/enscript.cfg."
-}
diff --git a/app-text/enscript/files/digest-enscript-1.6.4 b/app-text/enscript/files/digest-enscript-1.6.4
deleted file mode 100644
index 55e9e490e932..000000000000
--- a/app-text/enscript/files/digest-enscript-1.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5174b59e4a050fb462af5dbf28ebba3 enscript-1.6.4.tar.gz 1036734
diff --git a/app-text/enscript/files/digest-enscript-1.6.4-r1 b/app-text/enscript/files/digest-enscript-1.6.4-r1
deleted file mode 100644
index 55e9e490e932..000000000000
--- a/app-text/enscript/files/digest-enscript-1.6.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5174b59e4a050fb462af5dbf28ebba3 enscript-1.6.4.tar.gz 1036734
diff --git a/app-text/enscript/files/digest-enscript-1.6.4-r2 b/app-text/enscript/files/digest-enscript-1.6.4-r2
new file mode 100644
index 000000000000..a5e060193cb0
--- /dev/null
+++ b/app-text/enscript/files/digest-enscript-1.6.4-r2
@@ -0,0 +1,3 @@
+MD5 b5174b59e4a050fb462af5dbf28ebba3 enscript-1.6.4.tar.gz 1036734
+RMD160 9050728f14500f0360c5a4e258cba0646694bfeb enscript-1.6.4.tar.gz 1036734
+SHA256 45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b enscript-1.6.4.tar.gz 1036734
diff --git a/app-text/enscript/files/ebuild.st b/app-text/enscript/files/ebuild.st
new file mode 100644
index 000000000000..53d9b93a0bc7
--- /dev/null
+++ b/app-text/enscript/files/ebuild.st
@@ -0,0 +1,133 @@
+/**
+ * Name: ebuild
+ * Description: Gentoo Portage ebuild
+ * Author: Ed Catmur <ed@catmur.co.uk>
+ *
+ * Based on gentoo.vim by Ciaran McCreesh <ciaranm@gentoo.org>
+ */
+
+state ebuild extends bash
+{
+    /* Variables */
+    /^([ \t]*)([0-9a-zA-Z_.-]+)(=)/ {
+		language_print ($1);
+        variable_name_face(true);
+		language_print ($2);
+		variable_name_face(false);
+		language_print ($3);
+	}
+    
+	/* Core keywords */
+	/\b(use|has_version|best_version|use_with|use_enable|check_KV\
+|keepdir|econf|die|einstall|einfo|ewarn|eerror|diropts\
+|dobin|docinto|dodoc|doexe|dohard|dohtml|doinfo|doins\
+|dolib|dolib|a|dolib|so|doman|dosbin|dosym|emake|exeinto\
+|exeopts|fowners|fperms|insinto|insopts|into|libopts|newbin\
+|newexe|newins|newman|newsbin|prepall|prepalldocs|prepallinfo\
+|prepallman|prepallstrip|has|unpack|dopython|dosed|into\
+|doinitd|doconfd|doenvd|dojar|domo|dodir|ebegin|eend\
+|newconfd|newdoc|newenvd|newinitd|newlib\.a|newlib\.so\
+|hasq|hasv|useq|usev\
+|addread|addwrite|adddeny|addpredict\
+|inherit\
+|EXPORT_FUNCTIONS)\b/ {
+		keyword_face(true);
+		language_print ($0);
+		keyword_face (false);
+	}
+
+	/* Recognised functions */
+	/\b(pkg_nofetch|pkg_setup|src_unpack|src_compile|src_test|src_install\
+|pkg_preinst|pkg_postinst|pkg_prerm|pkg_postrm|pkg_config)\b/ {
+		function_name_face(true);
+		language_print ($0);
+		function_name_face(false);
+	}
+
+	/* Other keywords */
+	/\b(gen_usr_ldscript|draw_line|epatch|have_NPTL|get_number_of_jobs|egetent\
+|emktemp|enewuser|enewgroup|edos2unix|make_desktop_entry|unpack_pdv\
+|unpack_makeself|check_license|cdrom_get_cds|cdrom_load_next\
+|cdrom_locate_file_on_cd|strip|linguas|epause|ebeep|built_with_use\
+|make_session_desktop|domenu|doicon|find_unpackable_file|unpack_pdv\
+|set_arch_to_kernel|set_arch_to_portage|preserve_old_lib\
+|preserve_old_lib_notify|built_with_use|epunt_cxx|dopamd|newpamd\
+|make_wrapper\
+|setup-allowed-flags|filter-flags|filter-lfs-flags|append-lfs-flags\
+|append-flags|replace-flags|replace-cpu-flags|is-flag|filter-mfpmath\
+|strip-flags|test_flag|test_version_info|strip-unsupported-flags|get-flag\
+|has_hardened|has_pic|has_pie|has_ssp_all|has_ssp|has_m64|has_m32\
+|replace-sparc64-flags|append-ldflags|filter-ldflags|fstack-flags|gcc2-flags\
+|gcc-getCC|gcc-getCXX|gcc-fullversion|gcc-version|gcc-major-version\
+|gcc-minor-version|gcc-micro-version|gcc-libpath|gcc-libstdcxx-version\
+|gcc-libstdcxx-major-version|gcc2-flags\
+|elibtoolize|uclibctoolize|darwintoolize\
+|ht_fix_file|ht_fix_all\
+|fdo-mime_desktop_database_update|fdo-mime_mime_database_update\
+|webapp_checkfileexists|webapp_import_config|webapp_strip_appdir\
+|webapp_strip_d|webapp_strip_cwd|webapp_configfile|webapp_hook_script\
+|webapp_postinst_txt|webapp_postupgrade_txt|webapp_runbycgibin\
+|webapp_serverowned|webapp_server_configfile|webapp_sqlscript\
+|webapp_src_install|webapp_pkg_postinst|webapp_pkg_setup\
+|webapp_getinstalltype|webapp_src_preinst|webapp_pkg_prerm\
+|get_all_version_components|version_is_at_least\
+|get_version_components|get_major_version\
+|get_version_component_range|get_after_major_version\
+|replace_version_separator|replace_all_version_separators\
+|delete_version_separator|delete_all_version_separators\
+|cvs_fetch|cvs_src_unpack\
+|dobashcompletion|bash-completion_pkg_postinst\
+|vim-plugin_src_install|vim-plugin_pkg_postinst|vim-plugin_pkg_postrm\
+|update_vim_afterscripts|display_vim_plugin_help\
+|update_vim_helptags\
+|has_multilib_profile|get_libdir|get_multilibdir|get_libdir_override\
+|get_abi_var|get_abi_CFLAGS|get_abi_LDFLAGS|get_abi_CHOST\
+|get_abi_FAKE_TARGETS|get_abi_CDEFINE|get_abi_LIBDIR|get_install_abis\
+|get_all_abis|get_all_libdirs|is_final_abi|number_abis|get_ml_incdir\
+|prep_ml_includes|create_ml_includes|create_ml_includes-absolute\
+|create_ml_includes-tidy_path|create_ml_includes-listdirs\
+|create_ml_includes-makedestdirs|create_ml_includes-allfiles\
+|create_ml_includes-sym_for_dir\
+|64-bit\
+|tc-getPROG|tc-getAR|tc-getAS|tc-getCC|tc-getCXX|tc-getLD|tc-getNM\
+|tc-getRANLIB|tc-getF77|tc-getGCJ|tc-getBUILD_CC|tc-export|ninj\
+|tc-is-cross-compiler|tc-ninja_magic_to_arch|tc-arch-kernel|tc-arch\
+|tc-endian|gcc-fullversion|gcc-version|gcc-major-version\
+|gcc-minor-version|gcc-micro-version\
+|docrondir|docron|docrontab|cron_pkg_postinst\
+|egamesconf|egamesinstall|gameswrapper|dogamesbin|dogamessbin|dogameslib\
+|dogameslib.a|dogameslib.so|newgamesbin|newgamessbin|gamesowners|gamesperms\
+|prepgamesdirs|gamesenv|games_pkg_setup|games_src_compile|games_pkg_postinst\
+|games_ut_unpack|games_umod_unpack|games_make_wrapper\
+|subversion_svn_fetch|subversion_bootstrap|subversion_src_unpack\
+|alternatives_auto_makesym|alternatives_makesym|alternatives_pkg_postinst\
+|alternatives_pkg_postrm\
+|rpm_unpack|rpm_src_unpack\
+|python_version|python_tkinter_exists|python_mod_exists|python_mod_compile\
+|python_mod_optimize|python_mod_cleanup|python_makesym|python_disable_pyc\
+|python_enable_pyc\
+|check_version_h|get_KV_info|is_2_4_kernel|is_2_5_kernel|is_2_6_kernel\
+|kernel_supports_modules\
+|perl-module_src_prep|perl-module_src_compile|perl-module_src_test\
+|perl-module_src_install|perl-module_pkg_setup|perl-module_pkg_preinst\
+|perl-module_pkg_postinst|perl-module_pkg_prerm|perl-module_pkg_postrm\
+|perlinfo|fixlocalpod|updatepod\
+|distutils_src_compile|distutils_src_install|distutils_pkg_postrm\
+|distutils_pkg_postinst|distutils_python_version|disutils_python_tkinter\
+|need_apache|need_apache1|need_apache2\
+|apache-module_pkg_setup|apache-module_src_compile\
+|apache-module_src_install|apache-module_pkg_postinst|acache_cd_dir\
+|apache_mod_file|apache_doc_magic|apache1_src_compile|apache1_src_install\
+|apache1_pkg_postinst|apache2_pkg_setup|apache2_src_compile\
+|apache1_src_install|apache2_pkg_postinst\
+|dopamd|newpamd|dopamsecurity|newpamsecurity|getpam_mod_dir\
+|dopammod|newpammod|pamd_mimic_system\
+|virtualmake|Xmake|Xemake|Xeconf\
+|gnome2_src_configure|gnome2_src_compile|gnome2_src_install\
+|gnome2_gconf_install|gnome2_gconf_uninstal|gnome2_omf_fix\
+|gnome2_scrollkeeper_update|gnome2_pkg_postinst|gnome2_pkg_postrm)\b/ {
+		builtin_face(true);
+		language_print ($0);
+		builtin_face(false);
+	}
+}
diff --git a/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
new file mode 100644
index 000000000000..0741576226af
--- /dev/null
+++ b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
@@ -0,0 +1,10 @@
+--- states/hl/enscript.st	2006/01/31 05:37:23	1.1
++++ states/hl/enscript.st	2006/01/31 06:48:32
+@@ -509,6 +509,7 @@ namerules
+   /\b(rfc.*\.txt|draft-.*\.txt)$/		rfc;
+   /\.inf$/i					inf;
+   /\.tex$/					tex;
++  /\.(ebuild|eclass)$/				ebuild;
+   /\.wmlscript$/				wmlscript;
+   /\.wmls$/					wmlscript;
+   /^.*$/					passthrough;