From f13ffc2a84db28dc1e9340b6c2daf561aa40bd36 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 24 Oct 2018 18:01:11 +0300 Subject: [PATCH] Another pack of emacs plugins rules (#84) --- 800.renames-and-merges/emacs.yaml | 8 +++++++- 800.renames-and-merges/g.yaml | 1 + 900.version-fixes/e.yaml | 1 + 900.version-fixes/g.yaml | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/800.renames-and-merges/emacs.yaml b/800.renames-and-merges/emacs.yaml index c67cc9abc..8b00ddc0d 100644 --- a/800.renames-and-merges/emacs.yaml +++ b/800.renames-and-merges/emacs.yaml @@ -1,6 +1,8 @@ # vim: tabstop=39 expandtab softtabstop=39 +- { setname: "emacs:anything", name: [anything-el] } - { setname: "emacs:auctex", name: [auctex,emacs-auctex,emacs-mode-auctex] } +- { setname: "emacs:bbdb", name: [bbdb,bbdb3emacs-bbdb] } - { setname: "emacs:calfw", name: [emacs-calfw, "emacs:emacs-calfw"] } - { setname: "emacs:circe", name: [circe, emacs-circe] } - { setname: "emacs:csharp-mode", name: [csharp-mode.el] } @@ -9,7 +11,8 @@ - { setname: "emacs:dash", name: [emacs-dash, dash.el] } - { setname: "emacs:doxymacs", name: [doxymacs] } - { setname: "emacs:ebuild-mode", name: [emacs-ebuild-mode] } -- { setname: "emacs:elib", name: [emacs-elib,elib] } +- { setname: "emacs:edit-server", name: [emacs-edit-server] } +- { setname: "emacs:elib", name: [emacs-elib,elib,emacs20-elib] } - { setname: "emacs:emhacks", name: [emhacks,emacs-emhacks] } - { setname: "emacs:emms", name: [emacs-emms,emms] } - { setname: "emacs:evil", name: [emacs-evil,evil-el] } @@ -28,13 +31,16 @@ - { setname: "emacs:mmm-mode", name: emacs-mmm-mode } - { setname: "emacs:mpg123", name: [emacs-mpg123,"emacs:mpg123-el", mpg123-el, mpg123.el] } - { setname: "emacs:mu-cite", name: [mu-cite] } +- { setname: "emacs:multi-term", name: [emacs-multi-term] } - { setname: "emacs:multiple-cursors", name: [emacs-multiple-cursors] } - { setname: "emacs:muse", name: [emacs-muse, emacs-muse-mode, muse-el] } - { setname: "emacs:navi2ch", name: [emacs-navi2ch,navi2ch] } - { setname: "emacs:org-mode", name: [emacs-org,emacs-org-mode,org-mode] } - { setname: "emacs:org-mode", name: org-mode-doc, addflavor: doc } - { setname: "emacs:php-mode", name: [emacs-php-mode,php-mode.el,php-elisp] } +- { setname: "emacs:popwin", name: emacs-popwin } - { setname: "emacs:psgml", name: [psgml, emacs-psgml, emacs-mode-psgml, psgml-mode] } +- { setname: "emacs:puppet-mode", name: [emacs-puppet-mode, puppet-mode.el] } - { setname: "emacs:python-mode", name: [emacs-python-mode,python-mode.el,python-mode] } - { setname: "emacs:queue", name: [emacs-queue,queue-el] } - { setname: "emacs:rfcview", name: [emacs-rfcview] } diff --git a/800.renames-and-merges/g.yaml b/800.renames-and-merges/g.yaml index 82abfb8fe..014e583a8 100644 --- a/800.renames-and-merges/g.yaml +++ b/800.renames-and-merges/g.yaml @@ -54,6 +54,7 @@ - { setname: getfem++, name: getfemxx } - { setname: getopt, name: [gnugetopt,gnu-getopt,gnu.getopt] } - { setname: gettext, name: [gettext-asprintf,gettext-csharp,gettext-java,gettext-lib,gettext-m4,gettext-minimal,gettext-mono,gettext-progs,gettext-runtime,gettext-runtime-mini,gettext-tools,libintl,gettext-full], addflavor: true } +- { setname: gettext, name: [emacs-po-mode,"emacs:po-mode","po-mode","po-mode.el"], addflavor: emacs } - { setname: gexiv2, name: libgexiv2 } - { setname: gfbgraph, name: libgfbgraph } - { setname: gflags, name: [google-gflags,libgflags] } diff --git a/900.version-fixes/e.yaml b/900.version-fixes/e.yaml index 0790504dc..268bf9fcc 100644 --- a/900.version-fixes/e.yaml +++ b/900.version-fixes/e.yaml @@ -29,6 +29,7 @@ - { name: elm-format, verpat: "(.*?)[_-]?(?:alpha|exp)", setver: $1, devel: true } - { name: elvis, verpat: "20[0-9]{6}", snapshot: true } - { name: elvis, ver: "2.2f", incorrect: true } # source file gone, cannot check +- { name: "emacs:emhacks", noscheme: true } - { name: "emacs:icicles", noscheme: true } - { name: "emacs:matlab", noscheme: true } - { name: "emacs:navi2ch", ver: "2.0.0.d", incorrect: true } # fake diff --git a/900.version-fixes/g.yaml b/900.version-fixes/g.yaml index d601141a3..6926677f0 100644 --- a/900.version-fixes/g.yaml +++ b/900.version-fixes/g.yaml @@ -28,6 +28,8 @@ - { name: geeknote, noscheme: true } - { name: geocode-glib, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: gettext, ver: "2", ignore: true } # libintl from LEDE +- { name: gettext, ver: "2.2", ignore: true } # pkgsrc po-mode, own version? +- { name: gettext, ruleset: pkgsrc, untrusted: true } - { name: ggz-client-libs, verpat: "0\\.99.*", devel: true } - { name: ggz-gtk-client, verpat: "0\\.99.*", devel: true } - { name: gimagereader, verpat: ".*\\.9[0-9]+", devel: true }