commit: b10473f2ab307c10e5496278617899cca98c1568 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat Jun 25 14:53:18 2016 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat Jun 25 14:53:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b10473f2
dev-util/ctags: migrated to gx86 dev-util/ctags/Manifest | 2 - dev-util/ctags/ctags-5.8-r1.ebuild | 66 ---- dev-util/ctags/ctags-5.8.ebuild | 66 ---- dev-util/ctags/files/ctags-5.5.4-ebuilds.patch | 23 -- dev-util/ctags/files/ctags-5.5.4-haskell.patch | 71 ----- dev-util/ctags/files/ctags-5.5.4-objc.patch | 68 ----- .../ctags/files/ctags-5.5.4-ruby-classes.patch | 20 -- dev-util/ctags/files/ctags-5.5.4-vim-c.patch | 340 --------------------- dev-util/ctags/files/ctags-5.6-ebuilds.patch | 22 -- dev-util/ctags/files/ctags-5.6-php5.patch | 91 ------ dev-util/ctags/files/ctags-5.7-f95-pointers.patch | 15 - dev-util/ctags/files/ctags-5.7-netbsd.patch | 15 - .../ctags-5.7-python-vars-starting-with-def.patch | 11 - dev-util/ctags/files/ctags-5.8-ada.patch | 28 -- dev-util/ctags/files/ctags-5.8-f95-pointers.patch | 12 - .../ctags-5.8-python-vars-starting-with-def.patch | 13 - dev-util/ctags/files/ctags-ada.patch | 30 -- dev-util/ctags/metadata.xml | 8 - 18 files changed, 901 deletions(-) diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest deleted file mode 100644 index 92c8948..0000000 --- a/dev-util/ctags/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ctags-5.8.tar.gz 479927 SHA256 0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7 SHA512 981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15 WHIRLPOOL 04506a4495025907ee5fe41b9c4ff104dd234fc9ef39bd594158b36c550bf511b6ab5980a98736f9857dc47b99f1718a7ae2928fd4a1d1c0b57dfd3d79fce2ea -DIST ctags-ada-mode-4.3.11.tar.bz2 14060 SHA256 d25a3fd26b356adbd068f10a0b68691d36c154c04b96304b96386e169e4b6b57 SHA512 51c71e13ef658cd6682f04c94485315c4a702080ef2c7786fc9881b03c86f1c1d43aa1a69c452e4b0b2f7a78383804b66b159542cb4eae0cd309bc1ddbe2eb6e WHIRLPOOL 7e0ded8c97d3651e1afe48ec836697a4a19264baf3b203f6e98c134b88e3ab0eee7ac660789f5b955f0f827128996988694aa6c4bc78f18adf52724c5230da5d diff --git a/dev-util/ctags/ctags-5.8-r1.ebuild b/dev-util/ctags/ctags-5.8-r1.ebuild deleted file mode 100644 index 96b1a1a..0000000 --- a/dev-util/ctags/ctags-5.8-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ctags-5.8-r1.ebuild,v 1.2 2015/03/31 17:44:26 ulm Exp $ - -EAPI="5" - -inherit eutils - -DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors" -HOMEPAGE="http://ctags.sourceforge.net"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - ada? ( mirror://sourceforge/gnuada/ctags-ada-mode-4.3.11.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ada" - -RDEPEND="app-eselect/eselect-ctags" - -src_prepare() { - epatch "${FILESDIR}/${PN}-5.6-ebuilds.patch" - # Upstream fix for python variables starting with def - epatch "${FILESDIR}/${P}-python-vars-starting-with-def.patch" - - epatch "${FILESDIR}"/ctags-5.7-netbsd.patch - - # Bug #273697 - epatch "${FILESDIR}/${P}-f95-pointers.patch" - - # enabling Ada support - if use ada ; then - cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}" || die - epatch "${FILESDIR}/${P}-ada.patch" - fi -} - -src_configure() { - econf \ - --with-posix-regex \ - --without-readlib \ - --disable-etags \ - --enable-tmpdir="${EPREFIX}"/tmp -} - -src_install() { - emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install - - # namepace collision with X/Emacs-provided /usr/bin/ctags -- we - # rename ctags to exuberant-ctags (Mandrake does this also). - mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die - mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die - - dodoc FAQ NEWS README - dohtml EXTENDING.html ctags.html -} - -pkg_postinst() { - eselect ctags update - elog "You can set the version to be started by /usr/bin/ctags through" - elog "the ctags eselect module. \"man ctags.eselect\" for details." -} - -pkg_postrm() { - eselect ctags update -} diff --git a/dev-util/ctags/ctags-5.8.ebuild b/dev-util/ctags/ctags-5.8.ebuild deleted file mode 100644 index 2fce083..0000000 --- a/dev-util/ctags/ctags-5.8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ctags-5.8.ebuild,v 1.12 2015/03/31 17:44:26 ulm Exp $ - -EAPI="4" - -inherit eutils - -DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors" -HOMEPAGE="http://ctags.sourceforge.net"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - ada? ( mirror://sourceforge/gnuada/ctags-ada-mode-4.3.11.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="ada" - -DEPEND="app-eselect/eselect-ctags" - -src_prepare() { - epatch "${FILESDIR}/${PN}-5.6-ebuilds.patch" - # Upstream fix for python variables starting with def - epatch "${FILESDIR}/${P}-python-vars-starting-with-def.patch" - - epatch "${FILESDIR}"/ctags-5.7-netbsd.patch - - # Bug #273697 - epatch "${FILESDIR}/${P}-f95-pointers.patch" - - # enabling Ada support - if use ada ; then - cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}" || die - epatch "${FILESDIR}/${P}-ada.patch" - fi -} - -src_configure() { - econf \ - --with-posix-regex \ - --without-readlib \ - --disable-etags \ - --enable-tmpdir="${EPREFIX}"/tmp -} - -src_install() { - emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install - - # namepace collision with X/Emacs-provided /usr/bin/ctags -- we - # rename ctags to exuberant-ctags (Mandrake does this also). - mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die - mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die - - dodoc FAQ NEWS README - dohtml EXTENDING.html ctags.html -} - -pkg_postinst() { - eselect ctags update - elog "You can set the version to be started by /usr/bin/ctags through" - elog "the ctags eselect module. \"man ctags.eselect\" for details." -} - -pkg_postrm() { - eselect ctags update -} diff --git a/dev-util/ctags/files/ctags-5.5.4-ebuilds.patch b/dev-util/ctags/files/ctags-5.5.4-ebuilds.patch deleted file mode 100644 index aaebb7e..0000000 --- a/dev-util/ctags/files/ctags-5.5.4-ebuilds.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: ebuild-branch/sh.c -=================================================================== ---- ebuild-branch/sh.c (revision 2) -+++ ebuild-branch/sh.c (revision 3) -@@ -7,7 +7,8 @@ - * GNU General Public License. - * - * This module contains functions for generating tags for scripts for the --* Bourne shell (and its derivatives, the Korn and Z shells). -+* Bourne shell (and its derivatives, the Korn and Z shells), along with some -+* specialised kinds of shell scripts (Gentoo ebuilds and eclasses). - */ - - /* -@@ -101,7 +102,7 @@ - extern parserDefinition* ShParser (void) - { - static const char *const extensions [] = { -- "sh", "SH", "bsh", "bash", "ksh", "zsh", NULL -+ "sh", "SH", "bsh", "bash", "ksh", "zsh", "ebuild", "eclass", NULL - }; - parserDefinition* def = parserNew ("Sh"); - def->kinds = ShKinds; diff --git a/dev-util/ctags/files/ctags-5.5.4-haskell.patch b/dev-util/ctags/files/ctags-5.5.4-haskell.patch deleted file mode 100644 index de87b45..0000000 --- a/dev-util/ctags/files/ctags-5.5.4-haskell.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -NubB ctags-5.5.4.orig/haskell.c ctags-5.5.4/haskell.c ---- ctags-5.5.4.orig/haskell.c 1970-01-01 01:00:00.000000000 +0100 -+++ ctags-5.5.4/haskell.c 2005-11-13 16:11:17.000000000 +0100 -@@ -0,0 +1,37 @@ -+/*************************************************************************** -+ * haskell.c -+ * Regex-based parser for Haskell -+ * -+ * Copyright (c) 2005 Fernando J. Pereda <fe...@gentoo.org> -+ * -+ * Slightly based on haskell.c by Gaal Yahas <g...@forum2.org> -+ * -+ **************************************************************************/ -+/* INCLUDE FILES */ -+#include "general.h" /* always include first */ -+#include "parse.h" /* always include */ -+ -+/* FUNCTION DEFINITIONS */ -+static void installHaskellRegex (const langType language) -+{ -+ addTagRegex(language,"^([^,:-]*)[[:blank:]]*::[[:blank:]]*(.*)$","\\1","f,function",NULL); -+ addTagRegex(language,"^main[[:blank:]]*=.*$","main","f,function",NULL); -+ addTagRegex(language, -+ "^type[[:blank:]]*([^=]*)[[:blank:]]*=[[:blank:]]*(.*)$","\\1","t,type",NULL); -+ addTagRegex(language, -+ "^class[[:blank:]]*(\\([^)]*\\)[[:blank:]]*=>)?[[:blank:]]*(.*)[[:blank:]]*where.*$", -+ "\\2","c,class",NULL); -+ addTagRegex(language,"^module[[:blank:]]*([^[:blank:]]*).*$","\\1","m,module",NULL); -+ addTagRegex(language,"^data[[:blank:]]*([^[:blank:]]*).*$","\\1","d,data",NULL); -+} -+ -+/* Create parser definition stucture */ -+extern parserDefinition* HaskellParser (void) -+{ -+ static const char *const extensions [] = { "hs", "lhs", NULL }; -+ parserDefinition* const def = parserNew ("Haskell"); -+ def->extensions = extensions; -+ def->initialize = installHaskellRegex; -+ def->regex = TRUE; -+ return def; -+} -diff -NubB ctags-5.5.4.orig/parsers.h ctags-5.5.4/parsers.h ---- ctags-5.5.4.orig/parsers.h 2003-07-18 04:58:22.000000000 +0200 -+++ ctags-5.5.4/parsers.h 2005-11-13 16:01:14.000000000 +0100 -@@ -27,6 +27,7 @@ - EiffelParser, \ - ErlangParser, \ - FortranParser, \ -+ HaskellParser, \ - HtmlParser, \ - JavaParser, \ - JavaScriptParser, \ -diff -NubB ctags-5.5.4.orig/source.mak ctags-5.5.4/source.mak ---- ctags-5.5.4.orig/source.mak 2003-04-01 07:02:13.000000000 +0200 -+++ ctags-5.5.4/source.mak 2005-11-13 16:01:45.000000000 +0100 -@@ -20,6 +20,7 @@ - erlang.c \ - fortran.c \ - get.c \ -+ haskell.c \ - html.c \ - jscript.c \ - keyword.c \ -@@ -70,6 +71,7 @@ - erlang.$(OBJEXT) \ - fortran.$(OBJEXT) \ - get.$(OBJEXT) \ -+ haskell.$(OBJEXT) \ - html.$(OBJEXT) \ - jscript.$(OBJEXT) \ - keyword.$(OBJEXT) \ diff --git a/dev-util/ctags/files/ctags-5.5.4-objc.patch b/dev-util/ctags/files/ctags-5.5.4-objc.patch deleted file mode 100644 index 433a20f..0000000 --- a/dev-util/ctags/files/ctags-5.5.4-objc.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -NubB ctags-5.5.4.orig/objc.c ctags-5.5.4/objc.c ---- ctags-5.5.4.orig/objc.c 1970-01-01 01:00:00.000000000 +0100 -+++ ctags-5.5.4/objc.c 2005-11-13 18:36:50.000000000 +0100 -@@ -0,0 +1,34 @@ -+/*************************************************************************** -+ * objc.c -+ * Regex-based parser for Objective-C -+ * -+ * Copyright (c) 2005 Fernando J. Pereda <fe...@gentoo.org> -+ * -+ **************************************************************************/ -+/* INCLUDE FILES */ -+#include "general.h" /* always include first */ -+#include "parse.h" /* always include */ -+ -+/* FUNCTION DEFINITIONS */ -+static void installObjCRegex (const langType language) -+{ -+ addTagRegex(language, -+ "^[[:blank:]]*(-|\\+)[[:blank:]]*\\([^\\)]+\\)[[:blank:]]*([[:alnum:]_]+)", -+ "\\1\\2","f,method",NULL); -+ addTagRegex(language,"^@implementation[[:blank:]]*([[:alnum:]_]+)","\\1","c,class",NULL); -+ addTagRegex(language,"^#define[[:blank:]]*([^[:blank:]]*)[[:blank:]].*","\\1","d,define",NULL); -+ addTagRegex(language, -+ "^@interface[[:blank:]]*([^:[:blank:]]*)[[:blank:]]*:[[:blank:]]*([[:alnum:]_]+)", -+ "\\1:\\2","c,class",NULL); -+} -+ -+/* Create parser definition stucture */ -+extern parserDefinition* ObjCParser (void) -+{ -+ static const char *const extensions [] = { "m", "h", NULL }; -+ parserDefinition* const def = parserNew ("ObjC"); -+ def->extensions = extensions; -+ def->initialize = installObjCRegex; -+ def->regex = TRUE; -+ return def; -+} -diff -NubB ctags-5.5.4.orig/parsers.h ctags-5.5.4/parsers.h ---- ctags-5.5.4.orig/parsers.h 2003-07-18 04:58:22.000000000 +0200 -+++ ctags-5.5.4/parsers.h 2005-11-13 17:43:18.000000000 +0100 -@@ -33,6 +33,7 @@ - LispParser, \ - LuaParser, \ - MakefileParser, \ -+ ObjCParser, \ - PascalParser, \ - PerlParser, \ - PhpParser, \ -diff -NubB ctags-5.5.4.orig/source.mak ctags-5.5.4/source.mak ---- ctags-5.5.4.orig/source.mak 2003-04-01 07:02:13.000000000 +0200 -+++ ctags-5.5.4/source.mak 2005-11-13 18:33:04.000000000 +0100 -@@ -28,6 +28,7 @@ - lua.c \ - main.c \ - make.c \ -+ objc.c \ - options.c \ - parse.c \ - pascal.c \ -@@ -79,6 +80,7 @@ - main.$(OBJEXT) \ - make.$(OBJEXT) \ - options.$(OBJEXT) \ -+ objc.$(OBJEXT) \ - parse.$(OBJEXT) \ - pascal.$(OBJEXT) \ - perl.$(OBJEXT) \ diff --git a/dev-util/ctags/files/ctags-5.5.4-ruby-classes.patch b/dev-util/ctags/files/ctags-5.5.4-ruby-classes.patch deleted file mode 100644 index 2c4ef18..0000000 --- a/dev-util/ctags/files/ctags-5.5.4-ruby-classes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ctags-5.5.4/ruby.c.orig 2005-06-02 14:30:12.813161384 +0100 -+++ ctags-5.5.4/ruby.c 2005-06-02 14:30:56.947451952 +0100 -@@ -82,7 +82,7 @@ - { - while (isspace ((int) *cp)) - ++cp; -- while (isalnum ((int) *cp) || *cp == '_') -+ while (isalnum ((int) *cp) || *cp == '_' || *cp == ':') - { - vStringPut (name, (int) *cp); - ++cp; -@@ -99,7 +99,7 @@ - { - while (isspace ((int) *cp)) - ++cp; -- while (isalnum ((int) *cp) || *cp == '_') -+ while (isalnum ((int) *cp) || *cp == '_' || *cp == ':') - { - vStringPut (name, (int) *cp); - ++cp; diff --git a/dev-util/ctags/files/ctags-5.5.4-vim-c.patch b/dev-util/ctags/files/ctags-5.5.4-vim-c.patch deleted file mode 100644 index f4a9ab6..0000000 --- a/dev-util/ctags/files/ctags-5.5.4-vim-c.patch +++ /dev/null @@ -1,340 +0,0 @@ -diff -cr ../ctags-5.5.4.orig/c.c ./c.c -*** ../ctags-5.5.4.orig/c.c Sat Feb 28 16:37:52 2004 ---- ./c.c Sun Sep 11 13:02:59 2005 -*************** -*** 455,460 **** ---- 455,463 ---- - { "while", KEYWORD_WHILE, { 1, 1, 1, 1, 0 } } - }; - -+ /* Added by Bram: number for nameless structs and unions. */ -+ static int numberForName = 0; -+ - /* - * FUNCTION PROTOTYPES - */ -*************** -*** 762,768 **** - initToken (st->token [i]); - - initToken (st->context); -! initToken (st->blockName); - vStringClear (st->parentClasses); - - /* Init member info. ---- 765,775 ---- - initToken (st->token [i]); - - initToken (st->context); -! -! /* Keep the block name, so that a variable following after a comma will -! * still have the structure name. (Bram) */ -! if (! partial) -! initToken (st->blockName); - vStringClear (st->parentClasses); - - /* Init member info. -*************** -*** 943,950 **** - return result; - } - - static void addOtherFields (tagEntryInfo* const tag, const tagType type, -! const statementInfo *const st, vString *const scope) - { - /* For selected tag types, append an extension flag designating the - * parent object in which the tag is defined. ---- 950,966 ---- - return result; - } - -+ static void addContextSeparator (vString *const scope) -+ { -+ if (isLanguage (Lang_c) || isLanguage (Lang_cpp)) -+ vStringCatS (scope, "::"); -+ else if (isLanguage (Lang_java) || isLanguage (Lang_csharp)) -+ vStringCatS (scope, "."); -+ } -+ - static void addOtherFields (tagEntryInfo* const tag, const tagType type, -! const statementInfo *const st, -! vString *const scope, vString *const typeName) - { - /* For selected tag types, append an extension flag designating the - * parent object in which the tag is defined. -*************** -*** 1001,1014 **** - } - break; - } -- } - -! static void addContextSeparator (vString *const scope) -! { -! if (isLanguage (Lang_c) || isLanguage (Lang_cpp)) -! vStringCatS (scope, "::"); -! else if (isLanguage (Lang_java) || isLanguage (Lang_csharp)) -! vStringCatS (scope, "."); - } - - static void findScopeHierarchy (vString *const string, ---- 1017,1054 ---- - } - break; - } - -! /* Added by Bram: typename info, type of the tag and name of -! * struct/union/etc. */ -! if ((type == TAG_TYPEDEF || type == TAG_VARIABLE || type == TAG_MEMBER) -! && isContextualStatement(st)) -! { -! char *p; -! -! tag->extensionFields.typeName [0] = -! tagName (declToTagType (st->declaration)); -! p = vStringValue (st->blockName->name); -! -! /* If there was no {} block get the name from the token before the -! * name (current token is ';' or ',', previous token is the name). */ -! if (p == NULL || *p == '\0') -! { -! tokenInfo *const prev2 = prevToken (st, 2); -! -! if (isType (prev2, TOKEN_NAME)) -! p = vStringValue (prev2->name); -! } -! -! /* Prepend the scope name if there is one. */ -! if (vStringLength (scope) > 0) -! { -! vStringCopy(typeName, scope); -! addContextSeparator (typeName); -! vStringCatS(typeName, p); -! p = vStringValue (typeName); -! } -! tag->extensionFields.typeName [1] = p; -! } - } - - static void findScopeHierarchy (vString *const string, -*************** -*** 1106,1111 **** ---- 1146,1154 ---- - includeTag (type, isFileScope)) - { - vString *scope = vStringNew (); -+ /* Added "typeName" to store the typename from addOtherFields() until -+ * it's used in makeTagEntry(). (Bram) */ -+ vString *typeName = vStringNew (); - tagEntryInfo e; - - initTagEntry (&e, vStringValue (token->name)); -*************** -*** 1117,1127 **** - e.kind = tagLetter (type); - - findScopeHierarchy (scope, st); -! addOtherFields (&e, type, st, scope); - - makeTagEntry (&e); - makeExtraTagEntry (type, &e, scope); - vStringDelete (scope); - } - } - ---- 1160,1171 ---- - e.kind = tagLetter (type); - - findScopeHierarchy (scope, st); -! addOtherFields (&e, type, st, scope, typeName); - - makeTagEntry (&e); - makeExtraTagEntry (type, &e, scope); - vStringDelete (scope); -+ vStringDelete (typeName); - } - } - -*************** -*** 2566,2571 **** ---- 2610,2627 ---- - { - if (isType (prev, TOKEN_NAME)) - copyToken (st->blockName, prev); -+ else -+ { -+ char buf[30]; -+ -+ /* Added by Bram: for a nameless struct or union we use a -+ * number, so that the members can be found. */ -+ vStringClear (st->blockName->name); -+ sprintf(buf, "%d", ++numberForName); -+ vStringCatS (st->blockName->name, buf); -+ st->blockName->type = TOKEN_NAME; -+ st->blockName->keyword = KEYWORD_NONE; -+ } - qualifyBlockTag (st, prev); - } - else if (isLanguage (Lang_csharp)) -diff -cr ../ctags-5.5.4.orig/ctags.1 ./ctags.1 -*** ../ctags-5.5.4.orig/ctags.1 Tue Mar 30 06:18:13 2004 ---- ./ctags.1 Sun Sep 11 12:53:14 2005 -*************** -*** 453,458 **** ---- 453,461 ---- - .TP 4 - .I z - Include the "kind:" key in kind field -+ .TP 4 -+ .I t -+ Type and name of a variable or typedef as "typename:" field [enabled] - .PD 1 - .RE - -diff -cr ../ctags-5.5.4.orig/ctags.html ./ctags.html -*** ../ctags-5.5.4.orig/ctags.html Tue Mar 30 06:18:20 2004 ---- ./ctags.html Sun Sep 11 12:54:26 2005 -*************** -*** 516,521 **** ---- 516,527 ---- - <DD> - Include the "kind:" key in kind field - -+ <DT><I>t</I> -+ -+ <DD> -+ Include the type and name of a variable or typedef, using the "typename:" field -+ [enabled] -+ - </DL> - </DL> - -diff -cr ../ctags-5.5.4.orig/debug.c ./debug.c -*** ../ctags-5.5.4.orig/debug.c Tue Apr 1 06:52:44 2003 ---- ./debug.c Sun Sep 11 13:05:03 2005 -*************** -*** 105,110 **** ---- 105,117 ---- - tag->extensionFields.implementation != NULL) - printf (" [imp:%s]", tag->extensionFields.implementation); - -+ /* Added by Bram */ -+ if (Option.extensionFields.typeName && -+ tag->extensionFields.typeName [0] != NULL && -+ tag->extensionFields.typeName [1] != NULL) -+ printf (" [%s:%s]", tag->extensionFields.typeName [0], -+ tag->extensionFields.typeName [1]); -+ - printf ("#>"); - fflush (stdout); - } -diff -cr ../ctags-5.5.4.orig/entry.c ./entry.c -*** ../ctags-5.5.4.orig/entry.c Wed Mar 24 03:28:52 2004 ---- ./entry.c Sun Sep 11 13:05:13 2005 -*************** -*** 729,734 **** ---- 729,742 ---- - tag->extensionFields.scope [0], - tag->extensionFields.scope [1]); - -+ /* Added by Bram. TODO: use separate option? */ -+ if (Option.extensionFields.typeName && -+ tag->extensionFields.typeName [0] != NULL && -+ tag->extensionFields.typeName [1] != NULL) -+ length += fprintf (TagFile.fp, "%s\ttypename:%s:%s", sep, -+ tag->extensionFields.typeName [0], -+ tag->extensionFields.typeName [1]); -+ - if (Option.extensionFields.fileScope && tag->isFileScope) - length += fprintf (TagFile.fp, "%s\tfile:", sep); - -diff -cr ../ctags-5.5.4.orig/entry.h ./entry.h -*** ../ctags-5.5.4.orig/entry.h Mon Sep 30 06:30:47 2002 ---- ./entry.h Sun Sep 11 13:05:36 2005 -*************** -*** 72,77 **** ---- 72,82 ---- - const char* inheritance; - const char* scope [2]; /* value and key */ - const char* signature; -+ -+ /* Added by Bram: type (union/struct/etc.) and name for a variable or -+ * typedef. */ -+ const char* typeName [2]; /* e.g., "struct" and struct name */ -+ - } extensionFields; /* list of extension fields*/ - } tagEntryInfo; - -diff -cr ../ctags-5.5.4.orig/options.c ./options.c -*** ../ctags-5.5.4.orig/options.c Sat Feb 28 16:19:45 2004 ---- ./options.c Sun Sep 11 12:50:56 2005 -*************** -*** 118,124 **** - FALSE, /* -fields=l */ - FALSE, /* -fields=n */ - TRUE, /* -fields=s */ -! FALSE /* -fields=S */ - }, - NULL, /* -I */ - FALSE, /* -a */ ---- 118,125 ---- - FALSE, /* -fields=l */ - FALSE, /* -fields=n */ - TRUE, /* -fields=s */ -! FALSE, /* -fields=S */ -! TRUE /* -fields=t */ - }, - NULL, /* -I */ - FALSE, /* -a */ -*************** -*** 207,213 **** - {1," --extra=[+|-]flags"}, - {1," Include extra tag entries for selected information (flags: \"fq\")."}, - {1," --fields=[+|-]flags"}, -! {1," Include selected extension fields (flags: \"afmikKlnsSz\") [fks]."}, - {1," --file-scope=[yes|no]"}, - {1," Should tags scoped only for a single file (e.g. \"static\" tags"}, - {1," be included in the output [yes]?"}, ---- 208,214 ---- - {1," --extra=[+|-]flags"}, - {1," Include extra tag entries for selected information (flags: \"fq\")."}, - {1," --fields=[+|-]flags"}, -! {1," Include selected extension fields (flags: \"afmikKlnsStz\") [fks]."}, - {1," --file-scope=[yes|no]"}, - {1," Should tags scoped only for a single file (e.g. \"static\" tags"}, - {1," be included in the output [yes]?"}, -*************** -*** 835,840 **** ---- 836,842 ---- - field->kindLong = FALSE; - field->language = FALSE; - field->scope = FALSE; -+ field->typeName = FALSE; - } - while ((c = *p++) != '\0') switch (c) - { -*************** -*** 852,857 **** ---- 854,860 ---- - case 's': field->scope = mode; break; - case 'S': field->signature = mode; break; - case 'z': field->kindKey = mode; break; -+ case 't': field->typeName = mode; break; - - default: error(WARNING, "Unsupported parameter '%c' for \"%s\" option", - c, option); -diff -cr ../ctags-5.5.4.orig/options.h ./options.h -*** ../ctags-5.5.4.orig/options.h Mon Jul 21 03:09:08 2003 ---- ./options.h Sun Sep 11 12:48:29 2005 -*************** -*** 77,82 **** ---- 77,85 ---- - boolean lineNumber; - boolean scope; - boolean signature; -+ -+ /* Added by Bram. */ -+ boolean typeName; - }; - - /* This stores the command line options. diff --git a/dev-util/ctags/files/ctags-5.6-ebuilds.patch b/dev-util/ctags/files/ctags-5.6-ebuilds.patch deleted file mode 100644 index 5b0de66..0000000 --- a/dev-util/ctags/files/ctags-5.6-ebuilds.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur ctags-5.6/sh.c ctags-5.6-ebuild/sh.c ---- ctags-5.6/sh.c 2006-05-30 00:37:13.000000000 -0400 -+++ ctags-5.6-ebuild/sh.c 2006-10-07 17:37:31.000000000 -0400 -@@ -7,7 +7,8 @@ - * GNU General Public License. - * - * This module contains functions for generating tags for scripts for the --* Bourne shell (and its derivatives, the Korn and Z shells). -+* Bourne shell (and its derivatives, the Korn and Z shells), along with some -+* specialised kinds of shell scripts (Gentoo ebuilds and eclasses). - */ - - /* -@@ -102,7 +103,7 @@ - extern parserDefinition* ShParser (void) - { - static const char *const extensions [] = { -- "sh", "SH", "bsh", "bash", "ksh", "zsh", NULL -+ "sh", "SH", "bsh", "bash", "ksh", "zsh", "ebuild", "eclass", NULL - }; - parserDefinition* def = parserNew ("Sh"); - def->kinds = ShKinds; diff --git a/dev-util/ctags/files/ctags-5.6-php5.patch b/dev-util/ctags/files/ctags-5.6-php5.patch deleted file mode 100644 index a5dd345..0000000 --- a/dev-util/ctags/files/ctags-5.6-php5.patch +++ /dev/null @@ -1,91 +0,0 @@ -Index: php.c -=================================================================== ---- php.c (.../tags/Ctags-5_6/php.c) (revision 488) -+++ php.c (.../trunk/php.c) (revision 488) -@@ -42,6 +42,43 @@ - * FUNCTION DEFINITIONS - */ - -+/* JavaScript patterns are duplicated in jscript.c */ -+ -+static void installPHPRegex (const langType language) -+{ -+ addTagRegex(language, "(^|[ \t])class[ \t]+([A-Za-z\x7F-\xFF_][0-9A-Za-z\x7F-\xFF_]*)", -+ "\\2", "c,class,classes", NULL); -+ addTagRegex(language, "(^|[ \t])interface[ \t]+([A-Za-z\x7F-\xFF_][0-9A-Za-z\x7F-\xFF_]*)", -+ "\\2", "i,interface,interfaces", NULL); -+ addTagRegex(language, "(^|[ \t])define[ \t]*\\([ \t]*['\"]?([A-Za-z\x7F-\xFF_][0-9A-Za-z\x7F-\xFF_]*)", -+ "\\2", "d,define,constant definitions", NULL); -+ addTagRegex(language, "(^|[ \t])function[ \t]+&?[ \t]*([A-Za-z\x7F-\xFF_][0-9A-Za-z\x7F-\xFF_]*)", -+ "\\2", "f,function,functions", NULL); -+ addTagRegex(language, "(^|[ \t])\\$([A-Za-z\x7F-\xFF_][0-9A-Za-z\x7F-\xFF_]*)[ \t]*=", -+ "\\2", "v,variable,variables", NULL); -+ -+ // function regex is covered by PHP regex -+ addTagRegex (language, "(^|[ \t])([A-Za-z0-9_]+)[ \t]*[=:][ \t]*function[ \t]*\\(", -+ "\\2", "j,jsfunction,javascript functions", NULL); -+ addTagRegex (language, "(^|[ \t])([A-Za-z0-9_.]+)\\.([A-Za-z0-9_]+)[ \t]*=[ \t]*function[ \t]*\\(", -+ "\\2.\\3", "j,jsfunction,javascript functions", NULL); -+ addTagRegex (language, "(^|[ \t])([A-Za-z0-9_.]+)\\.([A-Za-z0-9_]+)[ \t]*=[ \t]*function[ \t]*\\(", -+ "\\3", "j,jsfunction,javascript functions", NULL); -+} -+ -+/* Create parser definition stucture */ -+extern parserDefinition* PhpParser (void) -+{ -+ static const char *const extensions [] = { "php", "php3", "phtml", NULL }; -+ parserDefinition* def = parserNew ("PHP"); -+ def->extensions = extensions; -+ def->initialize = installPHPRegex; -+ def->regex = TRUE; -+ return def; -+} -+ -+#if 0 -+ - static boolean isLetter(const int c) - { - return (boolean)(isalpha(c) || (c >= 127 && c <= 255)); -@@ -65,6 +102,7 @@ - while ((line = fileReadLine ()) != NULL) - { - const unsigned char *cp = line; -+ const char* f; - - while (isspace (*cp)) - cp++; -@@ -87,17 +125,23 @@ - vStringClear (name); - } - } -- else if (strncmp ((const char*) cp, "function", (size_t) 8) == 0 && -- isspace ((int) cp [8])) -+ else if ((f = strstr ((const char*) cp, "function")) != NULL && -+ (f == (const char*) cp || isspace ((int) f [-1])) && -+ isspace ((int) f [8])) - { -- cp += 8; -+ cp = ((const unsigned char *) f) + 8; - - while (isspace ((int) *cp)) - ++cp; - -- if (*cp == '&') /* skip reference character */ -+ if (*cp == '&') /* skip reference character and following whitespace */ -+ { - cp++; - -+ while (isspace ((int) *cp)) -+ ++cp; -+ } -+ - vStringClear (name); - while (isalnum ((int) *cp) || *cp == '_') - { -@@ -168,4 +212,6 @@ - return def; - } - -+#endif -+ - /* vi:set tabstop=4 shiftwidth=4: */ diff --git a/dev-util/ctags/files/ctags-5.7-f95-pointers.patch b/dev-util/ctags/files/ctags-5.7-f95-pointers.patch deleted file mode 100644 index 4018172..0000000 --- a/dev-util/ctags/files/ctags-5.7-f95-pointers.patch +++ /dev/null @@ -1,15 +0,0 @@ -allow pointer assignment ("=>" operator) from fortran 95 -http://sourceforge.net/tracker/index.php?func=detail&aid=2046078&group_id=6556&atid=106556 -diff -Naur ctags-5.7.orig/fortran.c ctags-5.7/fortran.c ---- ctags-5.7.orig/fortran.c 2009-06-10 20:24:30.000000000 +0200 -+++ ctags-5.7/fortran.c 2009-06-10 20:26:25.000000000 +0200 -@@ -1334,7 +1334,8 @@ - readToken (token); - skipPast (token, TOKEN_OPERATOR); - } -- else if (strcmp (vStringValue (token->string), "=") == 0) -+ else if ((strcmp (vStringValue (token->string), "=") == 0) || -+ (strcmp (vStringValue (token->string), "=>") == 0)) - { - while (! isType (token, TOKEN_COMMA) && - ! isType (token, TOKEN_STATEMENT_END)) diff --git a/dev-util/ctags/files/ctags-5.7-netbsd.patch b/dev-util/ctags/files/ctags-5.7-netbsd.patch deleted file mode 100644 index 349e23a..0000000 --- a/dev-util/ctags/files/ctags-5.7-netbsd.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- general.h.orig 2007-05-03 05:21:08 +0200 -+++ general.h 2008-01-07 11:32:56 +0100 -@@ -57,7 +57,11 @@ - * to prevent warnings about unused variables. - */ - #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) && !defined (__GNUG__) --# define __unused__ __attribute__((unused)) -+# if defined(__NetBSD__) -+# define __unused__ __unused -+# else -+# define __unused__ __attribute__((unused)) -+# endif - # define __printf__(s,f) __attribute__((format (printf, s, f))) - #else - # define __unused__ diff --git a/dev-util/ctags/files/ctags-5.7-python-vars-starting-with-def.patch b/dev-util/ctags/files/ctags-5.7-python-vars-starting-with-def.patch deleted file mode 100644 index a20007a..0000000 --- a/dev-util/ctags/files/ctags-5.7-python-vars-starting-with-def.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- python.c 2008-03-26 20:31:26.000000000 +0200 -+++ python.c 2008-03-26 20:31:35.000000000 +0200 -@@ -185,7 +185,7 @@ - while (*cp) - { - cp = skipEverything (cp); -- if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5)) -+ if (!strncmp(cp, "def ", 4) || !strncmp(cp, "class ", 6)) - { - return cp; - } diff --git a/dev-util/ctags/files/ctags-5.8-ada.patch b/dev-util/ctags/files/ctags-5.8-ada.patch deleted file mode 100644 index 48ed96f..0000000 --- a/dev-util/ctags/files/ctags-5.8-ada.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- parsers-orig.h 2009-11-16 23:39:49.747328066 +0200 -+++ parsers.h 2009-11-16 23:40:26.541581805 +0200 -@@ -16,6 +16,7 @@ - - /* Add the name of any new parser definition function here */ - #define PARSER_LIST \ -+ AdaParser, \ - AntParser, \ - AsmParser, \ - AspParser, \ ---- source-orig.mak 2009-11-16 23:41:17.184586699 +0200 -+++ source.mak 2009-11-16 23:41:48.358331136 +0200 -@@ -8,6 +8,7 @@ - strlist.h vstring.h - - SOURCES = \ -+ ada.c \ - args.c \ - ant.c \ - asm.c \ -@@ -70,6 +71,7 @@ - REGEX_HEADERS = gnu_regex/regex.h - - OBJECTS = \ -+ ada.$(OBJEXT) \ - args.$(OBJEXT) \ - ant.$(OBJEXT) \ - asm.$(OBJEXT) \ diff --git a/dev-util/ctags/files/ctags-5.8-f95-pointers.patch b/dev-util/ctags/files/ctags-5.8-f95-pointers.patch deleted file mode 100644 index 4ac9560..0000000 --- a/dev-util/ctags/files/ctags-5.8-f95-pointers.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- fortran-orig.c 2009-11-16 23:38:06.154328652 +0200 -+++ fortran.c 2009-11-16 23:38:08.711335501 +0200 -@@ -1319,7 +1319,8 @@ - readToken (token); - skipPast (token, TOKEN_OPERATOR); - } -- else if (strcmp (vStringValue (token->string), "=") == 0) -+ else if ((strcmp (vStringValue (token->string), "=") == 0) || -+ (strcmp (vStringValue (token->string), "=>") == 0)) - { - while (! isType (token, TOKEN_COMMA) && - ! isType (token, TOKEN_STATEMENT_END)) diff --git a/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch b/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch deleted file mode 100644 index 83d9f7e..0000000 --- a/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- python-orig.c 2009-11-16 23:33:44.930351712 +0200 -+++ python.c 2009-11-16 23:35:08.433328150 +0200 -@@ -264,8 +264,8 @@ - while (*cp) - { - cp = skipEverything (cp); -- if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5) || -- !strncmp(cp, "cdef", 4) || !strncmp(cp, "cpdef", 5)) -+ if (!strncmp(cp, "def ", 4) || !strncmp(cp, "class ", 6) || -+ !strncmp(cp, "cdef ", 5) || !strncmp(cp, "cpdef ", 6)) - { - return cp; - } diff --git a/dev-util/ctags/files/ctags-ada.patch b/dev-util/ctags/files/ctags-ada.patch deleted file mode 100644 index b130fb9..0000000 --- a/dev-util/ctags/files/ctags-ada.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru ctags-5.6-orig/parsers.h ctags-5.6/parsers.h ---- ctags-5.6-orig/parsers.h 2006-05-30 06:37:12.000000000 +0200 -+++ ctags-5.6/parsers.h 2007-06-16 18:38:31.000000000 +0200 -@@ -16,6 +16,7 @@ - - /* Add the name of any new parser definition function here */ - #define PARSER_LIST \ -+ AdaParser, \ - AsmParser, \ - AspParser, \ - AwkParser, \ -diff -ru ctags-5.6-orig/source.mak ctags-5.6/source.mak ---- ctags-5.6-orig/source.mak 2004-06-10 05:01:17.000000000 +0200 -+++ ctags-5.6/source.mak 2007-06-16 18:37:40.000000000 +0200 -@@ -8,6 +8,7 @@ - strlist.h vstring.h - - SOURCES = \ -+ ada.c \ - args.c \ - asm.c \ - asp.c \ -@@ -58,6 +59,7 @@ - argproc.c mac.c qdos.c - - OBJECTS = \ -+ ada.$(OBJEXT) \ - args.$(OBJEXT) \ - asm.$(OBJEXT) \ - asp.$(OBJEXT) \ diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml deleted file mode 100644 index 80ac66c..0000000 --- a/dev-util/ctags/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>vim</herd> - <use> - <flag name="ada">Enable Ada support</flag> - </use> -</pkgmetadata>
