diff --git a/800.renames-and-merges/a.yaml b/800.renames-and-merges/a.yaml index 1d3ba88a9..90706f675 100644 --- a/800.renames-and-merges/a.yaml +++ b/800.renames-and-merges/a.yaml @@ -26,10 +26,14 @@ - { setname: acroread, namepat: "acroread[0-9.]*" } - { setname: acroread-asianfonts, namepat: "acroread9-.*font.*", ruleset: pkgsrc } - { setname: acroread7-asianfonts, namepat: "acroread7-.*font.*", ruleset: pkgsrc } +- { setname: acsccid, name: pcsc-acsccid } - { setname: actiona, name: actionaz, ruleset: chocolatey } - { setname: activeio, name: activemq-activeio } - { setname: adabooch, name: [booch95,gnat-booch95] } +- { setname: adapta-gtk-theme, name: [adapta,gtk-theme-adapta] } +- { setname: adapta-gtk-theme, namepat: "adapta-gtk-theme.*" } - { setname: adblock-plus, name: adblockplus-firefox, ruleset: chocolatey } +- { setname: adms, name: [adms-qucs,mot-adms] } - { setname: adobeps, name: adobeps-win, ruleset: pkgsrc } - { setname: adodb, name: adodb5 } - { setname: adolc, name: adol-c } @@ -48,6 +52,7 @@ - { setname: agda-stdlib, name: "haskell:agda-stdlib" } - { setname: agg, name: antigraingeometry } - { setname: agg, name: libagg } +- { setname: aiohttp-cors, name: ["python:aiohttp-cors","python:aiohttp-cors2","python:aiohttp1-cors"] } - { setname: airspy, name: [airspy-host, airspyone-host] } - { setname: aisleriot, name: gnome-games-aisleriot } - { setname: akode, name: [akode-plugins-alsa,akode-plugins-jack,akode-plugins-mpc,akode-plugins-mpeg,akode-plugins-oss,akode-plugins-pulseaudio,akode-plugins-resampler,akode-plugins-sun,akode-plugins-xiph], addflavor: true } @@ -56,6 +61,7 @@ - { setname: alberta, name: alberta-wo-fem, addflavor: true } - { setname: alberta, name: libalberta2 } - { setname: alfred, name: batman-alfred } +- { setname: alfred-json, name: batman-alfred-json } - { setname: alien, name: alien-package-converter } - { setname: alienarena, name: alien-arena } - { setname: alienarena-data, name: alien-arena-data } @@ -74,6 +80,8 @@ - { setname: alsa-plugins, name: alsa-plugins-oss, addflavor: oss } - { setname: alsamodularsynth, name: [alsa-modular-synth, ams] } - { setname: amavisd-new, name: amavisd, ruleset: openpkg } +- { setname: amber-search, name: amber, wwwpart: dalance } +- { setname: amber-search, name: "rust:amber" } - { setname: amd-app-sdk, name: amdapp-sdk } - { setname: amp, name: "rust:amp" } - { setname: ampy, name: ["python:adafruit-ampy","python:ampy",adafruit-ampy,ampy], wwwpart: adafruit } diff --git a/800.renames-and-merges/b.yaml b/800.renames-and-merges/b.yaml index f099448dc..a2f5c6c0d 100644 --- a/800.renames-and-merges/b.yaml +++ b/800.renames-and-merges/b.yaml @@ -1,7 +1,7 @@ # vim: tabstop=39 expandtab softtabstop=39 - { setname: babl, name: libbabl } -- { setname: backblaze-b2, name: b2-tools } +- { setname: backblaze-b2, name: [b2-tools,"python:b2"] } - { setname: backintime, name: [backintime-cli,backintime-common,backintime-qt4], addflavor: true } - { setname: backuppc, name: backuppc-devel, weak_devel: true } - { setname: backuppc, name: backuppc4 } @@ -33,6 +33,8 @@ - { setname: bbswitch, namepat: "(linux[0-9]+)-bbswitch", addflavor: $1 } - { setname: bbswitch, name: dkms-bbswitch } - { setname: bbswitch, name: [bbswitch-ck,bbswitch-ck-fbcondecor,bbswitch-dkms,bbswitch-dkms-lts,bbswitch-lts,bbswitch-mainline,bbswitch-next,bbswitch-pf,kernel-modules-bbswitch-std-def,kernel-modules-bbswitch-un-def], addflavor: true } +- { setname: bc-gh, name: bc, wwwpart: gavinhoward } +- { setname: bc-gh, name: [gh-bc,howard-bc] } - { setname: bcc, name: "python:bcc", addflavor: python } # split in 850 - { setname: bcc, name: bcc-tools, addflavor: tools } - { setname: bcc, name: bpfcc } @@ -65,6 +67,8 @@ - { setname: bitdefender, name: bdc, ruleset: openpkg } - { setname: bitkeeper, name: bitkeeper-development, weak_devel: true } - { setname: bitkeeper, name: bitkeeper-production } +- { setname: bitkeeper, name: bk, wwwpart: bitkeeper } +- { setname: blackbird-gtk-theme, name: [blackbird-themes,gtk-theme-blackbird,xfce-theme-blackbird] } - { setname: blackshades, name: blackshades-svn, ignore: true } - { setname: blackshadeselite, name: blackshades-elite-svn, ignore: true } - { setname: blas, name: [blas-reference,blas-docs], addflavor: docs } @@ -79,6 +83,7 @@ - { setname: blockattack, name: block-attack-rise-of-the-blocks } - { setname: blockout, name: [blockout2,blockoutii] } - { setname: blop-lv2, name: blop.lv2 } +- { setname: bluebird-gtk-theme, name: [bluebird,bluebird-theme,bluebird-themes,gtk-theme-bluebird,xfce-theme-bluebird] } - { setname: bluedevil, name: bluedevil5 } - { setname: bmp, name: bmp-esound, addflavor: esound } - { setname: bnd, name: bnd1.50 } diff --git a/800.renames-and-merges/c.yaml b/800.renames-and-merges/c.yaml index 0df21925b..e1b76adb9 100644 --- a/800.renames-and-merges/c.yaml +++ b/800.renames-and-merges/c.yaml @@ -119,6 +119,7 @@ - { setname: codeblocks, name: [codeblocks-gcc,codeblocks-full], addflavor: true } - { setname: codeblocks, name: codeblocks-devel, weak_devel: true } - { setname: codec2, name: libcodec2 } +- { setname: codespell, name: "python:codespell", wwwpart: "github.com/codespell-project/codespell" } - { setname: coffee-script, name: coffeescript } # XXX: problem - { setname: cogl, name: cogl-amdgpu-pro } - { setname: cogl, name: libcogl } @@ -165,6 +166,8 @@ - { setname: coolreader3, name: coolreader } - { setname: corsixth, name: corsix-th } - { setname: couchpotato, name: couchpotatoserver } +- { setname: cozy-audiobooks, name: com.github.geigi.cozy } +- { setname: cozy-audiobooks, name: cozy, wwwpart: geigi } - { setname: cpmtools, name: cpmtools2 } - { setname: cpp-hocon, name: libcpp-hocon } - { setname: cppcheck, name: [cppcheck-nox,cppcheck-gui] } diff --git a/800.renames-and-merges/d.yaml b/800.renames-and-merges/d.yaml index 1a3134497..b93c9e562 100644 --- a/800.renames-and-merges/d.yaml +++ b/800.renames-and-merges/d.yaml @@ -79,7 +79,7 @@ - { setname: doublecmd, name: [doublecmd-gtk2,doublecmd-qt,doublecmd-qt4,doublecmd-qt5], addflavor: true } - { setname: doublecmd, name: doublecommander } - { setname: dovecot, namepat: "dovecot[0-9]+" } -- { setname: dovecot-pigeonhole, name: [dovecot-pigeonhole04,pigeonhole] } +- { setname: dovecot-pigeonhole, name: [dovecot-pigeonhole04,pigeonhole,dovecot-plugin-pigeonhole] } - { setname: doxygen, name: [doxygen-gui,doxygen-docs,doxygen-doc,doxywizard], addflavor: true } - { setname: dr14tmeter, name: dr14-tmeter } - { setname: dragon-drag-and-drop, name: dragon-drop } diff --git a/800.renames-and-merges/f.yaml b/800.renames-and-merges/f.yaml index 72eb8f7f0..f4ebd6c82 100644 --- a/800.renames-and-merges/f.yaml +++ b/800.renames-and-merges/f.yaml @@ -14,6 +14,7 @@ - { setname: fcgi, name: [fcgi-devkit,libfcgi] } - { setname: fcgi-cgi, name: fcgi-cgi-static, addflavor: static } - { setname: fcitx, name: [fcitx-gtk2,fcitx-gtk3], addflavor: true } +- { setname: fcitx-qt5, name: libfcitx-qt5 } - { setname: fdk-aac, name: libfdk-aac } - { setname: fdkaac, name: fdk-aac-encoder } - { setname: fetch-crl, name: fetch-crl3 } @@ -57,6 +58,7 @@ - { setname: flight-of-the-amazon-queen, name: fotaq } - { setname: flight-of-the-amazon-queen, name: scummvm-fotaq } - { setname: flim, name: [flim-xemacs,flim-emacs25,emacs-flim] } +- { setname: flint-checker, name: flint, wwwpart: pengwynn } - { setname: flipit, name: flipit-x10 } - { setname: flite, name: [flite1,flite-fpic] } - { setname: floating-ips, name: flips } diff --git a/800.renames-and-merges/fonts/d.yaml b/800.renames-and-merges/fonts/d.yaml index 79e00ad6a..97b170346 100644 --- a/800.renames-and-merges/fonts/d.yaml +++ b/800.renames-and-merges/fonts/d.yaml @@ -41,8 +41,10 @@ name: - droid-fonts-ttf - droid-ttf + - droidfonts - font-droid - fonts-droid + - fonts-droid-ttf - fonts-ttf-droid - fonts-ttf-google-droid diff --git a/800.renames-and-merges/fonts/f.yaml b/800.renames-and-merges/fonts/f.yaml index edb20e5a1..d66975957 100644 --- a/800.renames-and-merges/fonts/f.yaml +++ b/800.renames-and-merges/fonts/f.yaml @@ -4,6 +4,7 @@ name: - fantasque-sans - font-fantasque-sans + - font-fantasque-sans-ttf - fonts-fantasque-sans - ttf-fantasque-sans @@ -45,6 +46,9 @@ - fira-fonts - fira-sans - fira-webfont + - font-fira-otf + - font-fira-sans + - font-fira-ttf - mozilla-fira-fonts - otf-fira-sans - ttf-fira-sans @@ -52,7 +56,11 @@ - setname: "fonts:firacode" name: - fira-code + - fira-code-fonts + - fira-code-ttf - firacode + - firacode-ttf + - font-fira-code - fonts-firacode - otf-fira-code - ttf-fira-code diff --git a/800.renames-and-merges/fonts/g.yaml b/800.renames-and-merges/fonts/g.yaml index 85394a620..19d30c12a 100644 --- a/800.renames-and-merges/fonts/g.yaml +++ b/800.renames-and-merges/fonts/g.yaml @@ -188,10 +188,12 @@ - setname: "fonts:go" name: - font-go + - font-go-ttf - fonts-go - go-font - go-fonts - go-ttf + - gofont-ttf - gofonts - setname: "fonts:goudybookletter" diff --git a/800.renames-and-merges/fonts/i.yaml b/800.renames-and-merges/fonts/i.yaml index f8142f872..c29c43c04 100644 --- a/800.renames-and-merges/fonts/i.yaml +++ b/800.renames-and-merges/fonts/i.yaml @@ -3,6 +3,7 @@ - setname: "fonts:ibm-plex" name: - font-ibm-plex + - font-ibm-plex-ttf - fonts-ibm-plex - ibm-plex - ibm-plex-fonts diff --git a/800.renames-and-merges/fonts/n.yaml b/800.renames-and-merges/fonts/n.yaml index 51d34a551..09cf2705f 100644 --- a/800.renames-and-merges/fonts/n.yaml +++ b/800.renames-and-merges/fonts/n.yaml @@ -89,8 +89,11 @@ - google-noto-serif-cjk-fonts - noto - noto-cfk + - noto-cjk + - noto-cjk-fonts - noto-emoji-ttf - noto-fonts + - noto-fonts-all - noto-fonts-cjk - noto-fonts-cjk-otf - noto-fonts-compat @@ -101,10 +104,13 @@ - noto-fonts-lite - noto-fonts-main - noto-fonts-sc + - noto-fonts-ttf - noto-lite + - noto-sans-cjk - noto-ttf - notosanscjktc - ttf-noto + - ttf-noto-cjk - ttf-noto-fonts-emoji-ib - ttf-noto-fonts-ib - ttf-noto-fonts-simple diff --git a/800.renames-and-merges/fonts/o.yaml b/800.renames-and-merges/fonts/o.yaml index 830104002..b3637af90 100644 --- a/800.renames-and-merges/fonts/o.yaml +++ b/800.renames-and-merges/fonts/o.yaml @@ -33,12 +33,15 @@ - setname: "fonts:opendyslexic" name: - font-open-dyslexic + - font-open-dyslexic-ttf - fonts-ttf-open-dyslexic - fonts-opendyslexic - fonts-otf-opendyslexic - open-dyslexic - open-dyslexic-fonts - opendyslexic-fonts + - ttf-open-dyslexic + - ttf-opendyslexic - setname: "fonts:opensans" name: diff --git a/800.renames-and-merges/fonts/t.yaml b/800.renames-and-merges/fonts/t.yaml index 9f17e3fae..5d3cb1776 100644 --- a/800.renames-and-merges/fonts/t.yaml +++ b/800.renames-and-merges/fonts/t.yaml @@ -15,6 +15,7 @@ - setname: "fonts:tamsyn" name: + - font-tamsyn - tamsyn-console-font - tamsyn-font diff --git a/800.renames-and-merges/fonts/v.yaml b/800.renames-and-merges/fonts/v.yaml index 11eccba66..63fce3073 100644 --- a/800.renames-and-merges/fonts/v.yaml +++ b/800.renames-and-merges/fonts/v.yaml @@ -25,9 +25,11 @@ - setname: "fonts:vollkorn" name: - font-vollkorn + - font-vollkorn-ttf - fonts-otf-vollkorn - fonts-vollkorn - otf-vollkorn + - ttf-vollkorn-ibx - vollkorn - vollkorn-fonts - vollkorn-ttf diff --git a/800.renames-and-merges/g.yaml b/800.renames-and-merges/g.yaml index 032b04c76..1f82a0288 100644 --- a/800.renames-and-merges/g.yaml +++ b/800.renames-and-merges/g.yaml @@ -26,6 +26,7 @@ - { setname: gcin, name: gcin-qt5, addflavor: qt5 } - { setname: gconf, name: [gconf-gtk2,gconf-nopolkit,gconf2-reference], addflavor: true } - { setname: gconf, name: gconf2 } +- { setname: gconf-python, name: ["python:gconf","python:gconf-python",gnome-python2-gconf] } - { setname: gconfmm, namepat: "(?:lib)?gconfmm[0-9.-]*(-docs)?", addflavor: $1 } - { setname: gd, name: [gd2, libgd, libgd2] } - { setname: gdal, name: [gdal1,libgdal] } @@ -47,6 +48,7 @@ - { setname: gegl, name: gegl-unstable, ignore: true } - { setname: geki2, name: geki2-kxl, ruleset: gentoo } # XXX: recheck - { setname: geki3, name: geki3-kxl, ruleset: gentoo } # XXX: recheck +- { setname: generator-scripting-language, name: gsl-ucg } - { setname: genpuid, name: linux-genpuid, ruleset: freebsd } - { setname: gens, name: gensemulator } - { setname: geoclue, namepat: "(?:lib)?geoclue[0-9.-]*" } @@ -154,6 +156,7 @@ - { setname: gnats, namepat: "gnats[0-9]+" } - { setname: gnet, namepat: "gnet[0-9]+" } - { setname: gnet, name: libgnet } +- { setname: gnome-authenticator, name: authenticator, wwwpart: [gnome,bilelmoussaoui] } - { setname: gnome-bluetooth, name: compat-gnome-bluetooth38, disposable: true } - { setname: gnome-chemistry-utils, name: gchemutils } - { setname: gnome-chess, name: gnome-games-chess } @@ -310,6 +313,7 @@ - { setname: gtksourceviewmm, namepat: "(?:lib)?gtksourceviewmm[0-9.-]*" } - { setname: gtkspell, namepat: "(?:lib)?gtkspell[0-9.-]*(-reference)?", addflavor: $1 } - { setname: gtkspellmm, namepat: "(?:lib)?gtkspellmm[0-9.-]*" } +- { setname: gtkwrite, name: gtkedit } - { setname: gtypist, name: gnu-typist } - { setname: guava, namepat: "guava(?:-libraries)?[0-9.-]*" } - { setname: guava, name: [google-guava, java-guava] } diff --git a/800.renames-and-merges/go.yaml b/800.renames-and-merges/go.yaml index dd392ab15..cdf3ea2f3 100644 --- a/800.renames-and-merges/go.yaml +++ b/800.renames-and-merges/go.yaml @@ -1,6 +1,10 @@ # vim: tabstop=39 expandtab softtabstop=39 - { setname: "go:ethereum", name: [geth,geth-backports,ethereum] } +- { setname: "go:github-alecthomas-chroma", name: chroma, wwwpart: alecthomas } +- { setname: "go:github-alecthomas-chroma", name: "go:chroma" } - { setname: "go:github-miekg-mmark", name: ["go:mmark",mmark] } - { setname: "go:github-rakyll-statik", name: ["go:statik"] } - { setname: "go:gopkg-sourcemap", name: "go:gopkg-sourcemap-1" } +- { setname: "go:goversion", name: goversion } +- { setname: "go:minify", name: minify, wwwpart: tdewolff } diff --git a/800.renames-and-merges/h.yaml b/800.renames-and-merges/h.yaml index c1f78382d..ee267b456 100644 --- a/800.renames-and-merges/h.yaml +++ b/800.renames-and-merges/h.yaml @@ -37,6 +37,7 @@ - { setname: hugin, name: [hugin-app,hugin-tools], addflavor: true } - { setname: hugo-sitegen, name: "go:hugo" } - { setname: hunspell, name: [libhunspell,libhunspell1.3], addflavor: lib } +- { setname: hunspell-ru-ru-ieyo, name: hunspell-ru-aot-ieyo } - { setname: hydra, name: thc-hydra } - { setname: hylafax+, name: hylafaxplus } - { setname: hypre, name: hypre-openmpi, addflavor: true } diff --git a/800.renames-and-merges/k.yaml b/800.renames-and-merges/k.yaml index d2bfa9b75..3e7a8f1ec 100644 --- a/800.renames-and-merges/k.yaml +++ b/800.renames-and-merges/k.yaml @@ -1,9 +1,11 @@ # vim: tabstop=39 expandtab softtabstop=39 +- { setname: kactivities-stats, name: kactivities5-stats } - { setname: kaitai-struct, name: [kaitai-struct-compiler,kaitai-struct-visualizer,"python:kaitaistruct","ruby:kaitai-struct"], addflavor: true } - { setname: kamailio, name: kamailio-5.x } # openwrt - { setname: kamailio, name: [kamailio-berkeley,kamailio-carrierroute,kamailio-ldap,kamailio-mysql,kamailio-perl,kamailio-postgresql,kamailio-presence,kamailio-radius,kamailio-snmpstats,kamailio-xml], ruleset: openbsd, addflavor: true } - { setname: kate, name: kate-root, addflavor: true } +- { setname: kde-baseapps, name: [kde-baseapps4,kde4-baseapps,kde5-baseapps] } - { setname: kde-i18n, namepat: "kde-(i18n|l10n)-.*" } - { setname: kde4-l10n, namepat: "kde4-l10n-.*", ruleset: pkgsrc } - { setname: kdegraphics-mobipocket, name: mobipocket } @@ -14,6 +16,7 @@ - { setname: keepasshttp, name: [keepass-keepasshttp,keepass-plugin-http,keepass-plugin-keepasshttp,keepass2-plugin-keepasshttp] } # XXX: other plugins may need this; also may need better scheme (keepass:...?) - { setname: keepassx, name: keepassx-devel, weak_devel: true } - { setname: keepassx, namepat: "keepassx[0-9]*" } +- { setname: keybase-client, name: keybase-desktop } - { setname: keybinder, namepat: "(lib)?keybinder[0-9.-]*", addflavor: $1 } - { setname: keybinder, name: [keybinder-gtk3,keybinder-python,"lua:keybinder","python:keybinder","python:keybinder2"], addflavor: true } - { setname: keystone, name: "python:keystone" } diff --git a/800.renames-and-merges/l.yaml b/800.renames-and-merges/l.yaml index 835ef90f9..06b44bd96 100644 --- a/800.renames-and-merges/l.yaml +++ b/800.renames-and-merges/l.yaml @@ -52,7 +52,7 @@ - { setname: lightdm, namepat: "(liblightdm(?:-qt4|-qt5)*)-devel", addflavor: $1, weak_devel: true } - { setname: lightdm, namepat: "liblightdm(?:-qt4|-qt5|-ubuntu)*", addflavor: true } - { setname: lightdm, name: [lightdm-guest,liblightdm-qt4-guest,liblightdm-qt5-guest] } -- { setname: lightdm-gtk-greeter, name: lightdm-gtk } +- { setname: lightdm-gtk-greeter, name: [lightdm-gtk,lightdm-gtk2-greeter,lightdm-gtk3-greeter] } - { setname: lightdm-gtk-greeter, name: lightdm-gtk-greeter-devel, weak_devel: true } - { setname: lightsoff, name: gnome-games-lightsoff } - { setname: lightyears, name: 20kly } @@ -90,6 +90,7 @@ - { setname: lrslib, name: lrs } - { setname: ls++, name: ls++-git, weak_devel: true } - { setname: lsof-freebsd, name: lsof, ruleset: freebsd } # patched version with own versioning +- { setname: lttng-modules, name: lttng-modules-dkms } - { setname: lua, namepat: "(?:lib)?lua[0-9.-]*" } - { setname: luajit, name: [luajit-2.1,luajit2] } - { setname: lugaru, name: openlugaru } @@ -121,4 +122,5 @@ - { setname: lynx, name: [lynx-cur,lynx-current] } - { setname: lyx, name: lyx1 } - { setname: lz4, name: liblz4 } +- { setname: lz4json, name: lz4jsoncat } - { setname: lzo, name: [lzo2,liblzo,liblzo2] } diff --git a/800.renames-and-merges/lib.yaml b/800.renames-and-merges/lib.yaml index 0d8a2d4fc..c605ca566 100644 --- a/800.renames-and-merges/lib.yaml +++ b/800.renames-and-merges/lib.yaml @@ -8,9 +8,10 @@ - { setname: libarchive, name: libarchive-devel, weak_devel: true } - { setname: libarchive, name: libarchive3 } - { setname: libatomic-ops, name: [atomic-ops,libatomicops] } -- { setname: libcap, name: [libcap2,libcap1,compat-libcap1] } +- { setname: libcap, name: [libcap2,libcap1,compat-libcap1,libcap-pam] } - { setname: libcdr, namepat: "libcdr[0-9.-]+" } - { setname: libchamplain, namepat: "libchamplain[0-9.-]+" } +- { setname: libclc, name: libclc-git } - { setname: libcmis, name: cmis-client, addflavor: client } - { setname: libcompizconfig, name: libcompizconfig0.8 } - { setname: libconfuse, name: libconfuse0 } @@ -21,6 +22,7 @@ - { setname: libdbi-drivers, name: [libdbi-drivers-freetds,libdbi-drivers-mysql,libdbi-drivers-pgsql,libdbi-drivers-sqlite,libdbi-drivers-sqlite3], addflavor: true } - { setname: libdc1394, namepat: "libdc1394[0-9.-]+" } - { setname: libdca, name: libdca0 } +- { setname: libdri2, name: libdri2-git } - { setname: libdvbpsi, namepat: "libdvbpsi[0-9.-]+" } - { setname: libdvdplay, name: libdvdplay0 } - { setname: libdvdread, name: libdvdread3 } @@ -74,6 +76,7 @@ - { setname: libgphoto2, name: libgphoto } - { setname: libgpod, name: libgpod4 } - { setname: libgtop, namepat: "libgtop[0-9.-]+" } +- { setname: libharu, name: haru } - { setname: libical, namepat: "(?:compat-)?libical[0-9.-]*" } - { setname: libiconv, name: gnu-libiconv } - { setname: libiconv, name: libiconv-full, addflavor: true } diff --git a/800.renames-and-merges/m.yaml b/800.renames-and-merges/m.yaml index eed3200bb..a11a53d1b 100644 --- a/800.renames-and-merges/m.yaml +++ b/800.renames-and-merges/m.yaml @@ -167,6 +167,7 @@ - { setname: mpv, name: [mpv-full,mpv-light,mpv-rpi,mpv-scripts,mpv-sndio,mpv-thin,mpv-tools,mpv-with-scripts], addflavor: true } - { setname: mrboom, name: libretro-mrboom } - { setname: ms-gsl, name: [guidelines-support-library,microsoft-gsl,c++gsl] } +- { setname: msbuild, name: [msbuild-bin,msbuild-stable,msbuild-15] } - { setname: msgpack, name: [msgpack-c,msgpack-c-cpp,libmsgpack,msgpack1] } # c/cpp by default - { setname: mstflint, name: mstflint4 } - { setname: msynctool, namepat: "msynctool[0-9]+" } @@ -177,6 +178,7 @@ - { setname: munin, namepat: munin-(master|node|server|common), addflavor: $1 } - { setname: muparser, namepat: "libmuparser[0-9.-]*" } - { setname: mupdf, name: [libmupdf,mupdf-nojs,mupdf-seccomp,mupdf-tools], addflavor: true } +- { setname: musl-rpmatch, name: rpmatch-standalone } - { setname: mutt, name: mutt-devel, weak_devel: true } - { setname: mutt, name: [mutt-lite,mutt14,mutt14-lite,mutt-patched,mutt-slang,mutt-kiss] } - { setname: mvapich2, namepat: "mvapich2(?:-psm2?)?(?:-2-2)?(?:-gnu-hpc)?", addflavor: true } diff --git a/800.renames-and-merges/n.yaml b/800.renames-and-merges/n.yaml index faf11241f..1588a3688 100644 --- a/800.renames-and-merges/n.yaml +++ b/800.renames-and-merges/n.yaml @@ -42,6 +42,7 @@ - { setname: networkmanager, name: networkmanager-elogind, addflavor: elogind } - { setname: networkmanager, name: networkmanager-consolekit, addflavor: consolekit } - { setname: networkmanager, name: networkmanager-consolekit-noscan, addflavor: consolekit-noscan } +- { setname: networkmanager-qt, name: [kf5-networkmanager-qt,libkf5networkmanagerqt,networkmanager-qt5] } - { setname: neverball, name: neverball-data, addflavor: data } - { setname: newsboat, name: newsbeuter } # abandoned in favor of - { setname: newsboat, name: newsbeuter-dev, ignore: true } diff --git a/800.renames-and-merges/o.yaml b/800.renames-and-merges/o.yaml index 464f56c99..bf41b6abc 100644 --- a/800.renames-and-merges/o.yaml +++ b/800.renames-and-merges/o.yaml @@ -36,8 +36,10 @@ - { setname: openbor, namepat: "openbor[0-9]+" } - { setname: opencascade, name: [opencascade-data,opencascade-doc,opencascade-samples], addflavor: true } # sisyphus artifacts - { setname: opencc, name: opencc-doc, addflavor: doc } +- { setname: opencl-headers, name: [khronos-opencl-headers,opencl,opencl-cpp-headers,opencl-headers-1-2,opencl-headers12,opencl2-headers] } - { setname: opencollada, name: libopencollada } - { setname: opencore-amr, name: libopencore-amr0 } +- { setname: opencpn-plugin-gshhs, name: [opencpn-gshhs,opencpn-gshhs-crude] } - { setname: opencv, name: [opencv2,libopencv3.4,opencv-legacy] } - { setname: opencv, name: [opencv-contrib-face,opencv-core,opencv-docs,opencv-cuda,opencv-java,opencv-qt5,opencv-samples], addflavor: true } - { setname: opendbx, name: libopendbx } @@ -62,6 +64,7 @@ - { setname: openoffice, name: openoffice-bin, addflavor: bin } - { setname: openoffice, name: openoffice.org } - { setname: openr2, namepat: "(?:lib)?openr2[0-9.-]*" } +- { setname: openrazer, name: openrazer-meta } - { setname: openrc, name: [openrc-debug,openrc-init], addflavor: true } - { setname: openrct2, name: [libopenrct2,openrct2-cli], addflavor: true } - { setname: opensc, namepat: "opensc[0-9.-]+" } @@ -103,3 +106,5 @@ - { setname: ossp-cfg, name: cfg, ruleset: openpkg } - { setname: ostree, name: libostree } - { setname: otb, name: [orfeo-toolbox,orfeotoolbox] } +- { setname: oxygen-gtk2, name: [oxygen-gtk+,gtk2-theme-oxygen-gtk] } +- { setname: oxygen-gtk3, name: [oxygen-gtk+3,gtk3-theme-oxygen-gtk] } diff --git a/800.renames-and-merges/p.yaml b/800.renames-and-merges/p.yaml index 57cb032cb..51439b208 100644 --- a/800.renames-and-merges/p.yaml +++ b/800.renames-and-merges/p.yaml @@ -17,6 +17,7 @@ - { setname: pam, name: pam-selinux, addflavor: true } - { setname: pam-ccreds, name: libpam-ccreds } - { setname: pam-ldap, name: libpam-ldap } +- { setname: pam-radius, name: [libpam-radius-auth,pam-radius-auth] } - { setname: pango, name: pango-reference, addflavor: reference } - { setname: pango, namepat: "(?:lib)?pango[0-9.-]*" } - { setname: pangomm, namepat: "(?:lib)?pangomm[0-9.-]*" } @@ -86,6 +87,7 @@ - { setname: pkgconf, name: pkgconfig, ruleset: ravenports } # XXX - { setname: plasma-browser-integration, name: plasma5-plasma-browser-integration } - { setname: plasma-integration, name: [plasma5-integration,plasma5-plasma-integration] } +- { setname: plasma5-applets-active-window-control, name: [plasma-active-window-control,plasma-applet-active-window-control,plasmoid-active-window-control] } # normalize all plasma applets? - { setname: plpgsql-check, namepat: "(postgresql[0-9.-]*)-plpgsql-check", addflavor: $1 } - { setname: plr, namepat: "(postgresql[0-9.-]*)-plr", addflavor: $1 } - { setname: pluma, name: pluma-1.16 } @@ -143,6 +145,7 @@ - { setname: pptpd, name: [bcrelay,poptop,poptop-man,pptpd-server], addflavor: true } - { setname: presto, name: presto-cli } - { setname: printproto, name: xprintproto } +- { setname: procdump, name: procdump-for-linux } - { setname: processing, name: processing3 } - { setname: proj, name: [proj4,proj.4,proj47] } - { setname: proj, name: libproj } @@ -169,8 +172,12 @@ - { setname: pulseaudio, name: [libpulseaudio,libpulse,libpulse-nosystemd], addflavor: true } - { setname: pulseaudio, name: [pulseaudio-bluetooth,pulseaudio-gconf,pulseaudio-jack,pulseaudio-lirc,pulseaudio-zeroconf], addflavor: true } - { setname: puppet, namepat: "puppet[0-9.-]+" } +- { setname: purple-facebook, name: libpurple-facebook } - { setname: purple-hangouts, name: libpurple-hangouts } - { setname: purple-hangouts, name: purple-hangouts-hg, weak_devel: true } +- { setname: purple-skypeweb, name: [libpurple-skypeweb,pidgin-skypeweb,skypeweb-purple] } +- { setname: purple-opensteamworks, name: [purple-steam,libpurple-steam,pidgin-opensteamworks,purple-libsteam] } +- { setname: purple-telegram, name: [libpurple-telegram,pidgin-telegram,telegram-purple] } - { setname: putty, name: [putty-gtk2,putty-nogtk], addflavor: true } - { setname: pyalsa, name: ["python:alsa","python:pyalsa"], addflavor: python } - { setname: pycharm, name: [pycharm-ce,pycharm-community,pycharm-community-eap,pycharm-community-edition], addflavor: community } diff --git a/800.renames-and-merges/python.yaml b/800.renames-and-merges/python.yaml index da0a906e1..d9c5078d9 100644 --- a/800.renames-and-merges/python.yaml +++ b/800.renames-and-merges/python.yaml @@ -25,6 +25,7 @@ - { setname: "python:boto3", name: boto3 } - { setname: "python:bottleneck", name: bottleneck } # XXX: make upstream use prefix - { setname: "python:box2d", name: ["python:pybox2d", pybox2d] } +- { setname: "python:btrfs-backup", name: btrfs-backup } - { setname: "python:cartopy", name: cartopy } - { setname: "python:cherrypy", name: "python:cherrypy-old" } - { setname: "python:cherrypy", name: "python:cherrypy2" } @@ -34,6 +35,7 @@ - { setname: "python:cld2", name: pycld2 } - { setname: "python:colorama", name: "python:colorama-0.3.3" } - { setname: "python:colorama", name: colorama } # XXX: make upstream use prefix +- { setname: "python:configparser", name: [configparser,"python:backports.configparser"] } - { setname: "python:ctypes", name: ctypes } # XXX: make upstream use prefix - { setname: "python:cvxopt", name: cvxopt } # debian - { setname: "python:cypari2", name: cypari2 } @@ -82,7 +84,7 @@ - { setname: "python:impacket", name: impacket } - { setname: "python:importlib", name: importlib } - { setname: "python:internetarchive", name: internetarchive } -- { setname: "python:ipykernel", name: ["python:jupyter-ipykernel","python:jupyter-ipykernel-doc",ipykernel,jupyter-ipykernel] } +- { setname: "python:ipykernel", name: ["python:jupyter-ipykernel","python:jupyter-ipykernel-doc",ipykernel,jupyter-ipykernel,"python-ipython-ipykernel","python:ipykernel5"] } - { setname: "python:ipyparallel", name: [ipyparallel,ipython-ipyparallel,ipython2-ipyparallel] } - { setname: "python:ipython-genutils", name: ipython-genutils } - { setname: "python:ipywidgets", name: ["python:jupyter-ipywidgets","python:jupyter-ipywidgets-doc",ipywidgets,jupyter-ipywidgets] } @@ -181,6 +183,7 @@ - { setname: "python:pycassa", name: pycassa } - { setname: "python:pycha", name: pycha } - { setname: "python:pychart", name: pychart } +- { setname: "python:pychroot", name: "python:chroot", wwwpart: pkgcore } - { setname: "python:pycodestyle", name: ["python:codestyle",pycodestyle] } - { setname: "python:pycups", name: ["python:cups",pycups] } - { setname: "python:pydocstyle", name: "python:docstyle" } diff --git a/800.renames-and-merges/qt.yaml b/800.renames-and-merges/qt.yaml index 2f7774ec0..f976338b7 100644 --- a/800.renames-and-merges/qt.yaml +++ b/800.renames-and-merges/qt.yaml @@ -2,8 +2,9 @@ - { namepat: "(?:lib)?qt[0-9]*-?(?:qt)?(multimedia|opengl|network|linguist|linguisttools|gui|svg|xml|xmlpatterns)[0-9]*", verpat: "4\\..*", setname: "qt4-$1" } - { namepat: "(qt.*)-opensource-src(-gles|-touch)?", setname: "$1", addflavor: "$2" } -- { namepat: "(?:lib)?qt[0-9]*-?(?:qt)?(multimedia|opengl|network|linguist|linguisttools|gui|svg|xml|xmlpatterns|webkit|widgets|qml|base|graphicaleffects|webchannel|tools|location)[0-9]*(-docs|-examples)?", verpat: "5\\..*", setname: "qt5-$1", addflavor: "$2" } +- { namepat: "(?:lib)?qt[0-9]*-?(?:qt)?(multimedia|opengl|network|linguist|linguisttools|gui|svg|xml|xmlpatterns|webkit|widgets|qml|base|graphicaleffects|webchannel|tools|location|styleplugins)[0-9]*(-docs|-examples)?", verpat: "5\\..*", setname: "qt5-$1", addflavor: "$2" } - { name: [qtbase-opensource-src, qtbase-opensource-src-gles, qt5-base-nosystemd], verpat: "5\\..*", setname: qt5-base } - { name: [qtgraphicaleffects-opensource-src,qtgraphicaleffects-docindex,qtgraphicaleffects-html,qtgraphicaleffects-qch], verpat: "5\\..*", setname: qt5-graphicaleffects } - { name: [qt5-base-dev], verpat: "5\\..*", setname: qt5-base, ignore: True } - { setname: qt5, name: qt5-static, addflavor: true } +- { setname: qtwebkit, name: qt-webkit } diff --git a/800.renames-and-merges/r.yaml b/800.renames-and-merges/r.yaml index b0cda7d7b..af5aabad7 100644 --- a/800.renames-and-merges/r.yaml +++ b/800.renames-and-merges/r.yaml @@ -10,6 +10,7 @@ - { setname: radare2-bindings, name: r2-bindings } - { setname: radare2-cutter, name: radare-cutter } - { setname: radicale, name: ["python:radicale","python:radicale2"] } +- { setname: rage, name: [rage-player,rageplayer] } - { setname: ragel, name: [ragel-6,ragel7] } - { setname: ragel, name: ragel-dev, ignore: true } - { setname: ranger, name: "python:ranger" } @@ -52,6 +53,7 @@ - { setname: rpm, namepat: "rpm[0-9.-]+" } - { setname: rrdtool, name: [rrdtool12, rrd, rrdtool1] } - { setname: rrdtool, name: [rrdtool-lite,rrdupdate,"ruby:rrd","ruby:rrdtool","ruby:rrdtool-bindings"], addflavor: true } +- { setname: rs-chneukirchen, name: [openbsd-rs,rs], wwwpart: chneukirchen } - { setname: rsh, name: rshd } - { setname: rss2email, name: "python:rss2email" } - { setname: rss2email, name: r2e } diff --git a/800.renames-and-merges/rust.yaml b/800.renames-and-merges/rust.yaml index acebcb41c..eb19b8dae 100644 --- a/800.renames-and-merges/rust.yaml +++ b/800.renames-and-merges/rust.yaml @@ -1,9 +1,13 @@ # vim: tabstop=39 expandtab softtabstop=39 - { setname: "rust:cargo-asm", name: cargo-asm } +- { setname: "rust:cargo-audit", name: [cargo-audit,rust-cargo-audit] } +- { setname: "rust:cargo-bloat", name: [cargo-bloat,rust-cargo-bloat] } +- { setname: "rust:diceware", name: rusty-diceware } - { setname: "rust:getopts", name: rust-getopts } # XXX: replace with wildcard? - { setname: "rust:simple-http-server", name: simple-http-server } - { setname: "rust:xsv", name: xsv-rs } +- { setname: "rust:zou", name: zou, wwwpart: k0pernicus } - namepat: | (rust:(?: diff --git a/800.renames-and-merges/s.yaml b/800.renames-and-merges/s.yaml index 3f0323975..34ceed12c 100644 --- a/800.renames-and-merges/s.yaml +++ b/800.renames-and-merges/s.yaml @@ -24,6 +24,7 @@ - { setname: scalapack, name: libscalapack } - { setname: scamp, name: astromatic-scamp } - { setname: scapy, name: "python:scapy" } +- { setname: schily, name: schilytools } - { setname: schismtracker, name: schism } - { setname: schroedinger, name: libschroedinger } - { setname: scourge, name: scourge-data, addflavor: data } diff --git a/800.renames-and-merges/v.yaml b/800.renames-and-merges/v.yaml index ddcbe18d3..77359bbb0 100644 --- a/800.renames-and-merges/v.yaml +++ b/800.renames-and-merges/v.yaml @@ -37,6 +37,7 @@ - { setname: virtualbox, name: [virtualbox-bin,virtualbox-bin-5.0], addflavor: bin } - { setname: virtualgl, name: virtualgl-lib, addflavor: lib } - { setname: virtuoso, name: [virtuoso-6,virtuoso-7,virtuoso-opensource,virtuoso-ose,virtuoso6] } +- { setname: visualboyadvance-m, name: [vbam,vba-m] } - { setname: vlc, name: [vlc-qt,vlc-qt4,vlc-qt5,vlc-nox,vlc-decklink], ignore: true } - { setname: vlc, name: vlc-nightly, ignore: true } - { setname: vm.lv2, name: vm-lv2 } diff --git a/800.renames-and-merges/w.yaml b/800.renames-and-merges/w.yaml index 85146d17a..57ba3279d 100644 --- a/800.renames-and-merges/w.yaml +++ b/800.renames-and-merges/w.yaml @@ -5,6 +5,7 @@ - { setname: warzone2100, name: warzone-2100 } - { setname: waterfox, name: waterfox-kde, addflavor: kde } - { setname: watson, name: td-watson } +- { setname: waylandpp, name: libwaylandpp } - { setname: wcalc, name: w-calc } - { setname: wcmcommander, name: walcommander } # old name - { setname: wcmcommander, name: wcm-commander } @@ -53,6 +54,7 @@ - { setname: wlc, name: libwlc0 } - { setname: wlroots, name: wlroots-full, addflavor: true } - { setname: wmii, name: wmii-devel, weak_devel: true } +- { setname: wok-plugins-kimchi, name: wokd, wwwpart: kimchi } - { setname: worldofpadman, name: worldofpadman-data, addflavor: data } - { setname: worldofpadman, name: worldofpadman-beta, ignore: true } - { setname: wormsofprey, name: wop } diff --git a/800.renames-and-merges/y.yaml b/800.renames-and-merges/y.yaml index 1d6e6f7fd..c629f7ead 100644 --- a/800.renames-and-merges/y.yaml +++ b/800.renames-and-merges/y.yaml @@ -4,6 +4,7 @@ - { setname: yad, name: [yad-webkitgtk,yad-gtk2], addflavor: webkitgtk } - { setname: yajl, name: [libyajl,libyajl1,libyajl2] } - { setname: yaml-cpp, namepat: "(?:lib)?yaml-cpp[0-9.-]*" } +- { setname: yandex-pgmigrate, name: "python:pgmigrate", wwwpart: yandex } - { setname: yarn, name: yarn-bin, addflavor: true } - { setname: yarn, name: yarn-nightly, weak_devel: true } - { setname: yarn, name: ["node:yarn","node:yarnpkg"] } @@ -16,5 +17,8 @@ - { setname: youtube-dl, name: "python:youtube-dl" } - { setname: youtube-dl-gui, name: youtube-dlg } - { setname: yq, name: ["python:yq",python-yq] } +- { setname: yq-mikefarah, name: yq-go } - { setname: ytnef, name: libytnef } # see https://github.com/Yeraze/ytnef/blob/master/ChangeLog +- { setname: yubico-piv-tool, name: ykpivmgr } +- { setname: yubikey-personalization-gui, name: ykpers-gui } - { setname: yuicompressor, name: yui-compressor } diff --git a/850.split-ambiguities/b.yaml b/850.split-ambiguities/b.yaml index 2cf67d1de..2802604e9 100644 --- a/850.split-ambiguities/b.yaml +++ b/850.split-ambiguities/b.yaml @@ -58,3 +58,7 @@ - { name: bsc, wwwpart: libbsc, setname: libbsc } - { name: bsc, summpart: block-sorting, setname: libbsc } - { name: bsc, warning: "please classify me" } + +- { name: bum, wwwpart: dylanaraps, setname: bum-albums } +- { name: bum, wwwpart: marzocca, setname: bum-runlevels } +- { name: bum, warning: "please classify me" } diff --git a/850.split-ambiguities/f.yaml b/850.split-ambiguities/f.yaml index 9ab42be40..9b41f3ba0 100644 --- a/850.split-ambiguities/f.yaml +++ b/850.split-ambiguities/f.yaml @@ -1,5 +1,9 @@ # vim: tabstop=29 expandtab softtabstop=29 +- { name: fail, ruleset: pld, setname: fail-atari } +- { name: fail, wwwpart: chneukirchen, setname: fail-crash } +- { name: fail, warning: "please classify me" } + - { name: fex, wwwpart: [semicomplete,jordansissel], setname: fex-field-extraction } - { name: fex, wwwpart: [uni-stuttgart,belwue], setname: fex-file-exchange } - { name: fex, ruleset: [aix,yacp], setname: fex-field-extraction } @@ -11,6 +15,11 @@ - { name: flock, wwwpart: flock.com, setname: flock-browser } # need more flock splits +- { name: figurine, wwwpart: arsham, setname: figurine-banner } +- { name: figurine, wwwpart: sourceforge, setname: figurine-graphics } +- { name: figurine, ruleset: gobolinux, setname: figurine-graphics } +- { name: figurine, warning: "please classify me" } + - { name: forge, wwwpart: fsharp, setname: forge-fsharp } - { name: fortune, wwwpart: ahills, setname: fortune-ahills } diff --git a/850.split-ambiguities/g.yaml b/850.split-ambiguities/g.yaml index 7eacdefd7..62c4a40d4 100644 --- a/850.split-ambiguities/g.yaml +++ b/850.split-ambiguities/g.yaml @@ -18,6 +18,10 @@ - { name: ghostscript-fonts, wwwpart: gs-fonts, setname: ghostscript-fonts-std } +- { name: gimme, wwwpart: travis-ci/gimme, setname: gimme-go } +- { name: gimme, wwwpart: netbsd, setname: gimme-netbsd } +- { name: gimme, warning: "please classify me" } + - { name: gist, wwwpart: vim, setname: vim-gist } - { name: git-fame, setname: git-fame-rb, wwwpart: oleander.io } @@ -34,6 +38,11 @@ - { name: gnustep-pixen, wwwpart: pixenapp.com, successor: true } # became proprietary, bug there is GH fork containing source +- { name: goat, wwwpart: mispp, setname: goat-database } +- { name: goat, wwwpart: blampe, setname: goat-diagrams } +- { name: goat, wwwpart: brocode, setname: goat-sleep } +- { name: goat, warning: "please classify me" } + - { name: gom, category: [sound,media-sound,universe/sound], setname: gom-mixer } - { name: gom, wwwpart: installiert, setname: gom-mixer } diff --git a/850.split-ambiguities/h.yaml b/850.split-ambiguities/h.yaml index 0fbcc71a0..ef98b3c4a 100644 --- a/850.split-ambiguities/h.yaml +++ b/850.split-ambiguities/h.yaml @@ -13,6 +13,11 @@ - { name: hermes, setname: hermes-auth, wwwpart: ralt/hermes } # otherwise, (dead?) pixel format convertsion library +- { name: hex, wwwpart: sitkevij, setname: "rust:hx" } +- { name: hex, wwwpart: janouch, setname: hex-janouch } +- { name: hex, wwwpart: [catb,ibiblio], setname: hexdump } +- { name: hex, warning: "please classify me" } + - { name: hexer, wwwpart: hobu, setname: hexer-hobu } - { name: htmlmin, wwwpart: html-minifier, setname: html-minifier } # XXX: problem diff --git a/850.split-ambiguities/m.yaml b/850.split-ambiguities/m.yaml index be0bee505..70ee64b77 100644 --- a/850.split-ambiguities/m.yaml +++ b/850.split-ambiguities/m.yaml @@ -25,6 +25,12 @@ - { name: mars, wwwpart: courses.missouristate.edu, setname: mars-mips } - { name: mars, warning: "please classify me" } +- { name: mash, wwwpart: pagure, setname: mash-buildsystem } +- { name: mash, wwwpart: readthedocs, setname: mash-genome } +- { name: mash, wwwpart: clutter-project, setname: libmash } +- { name: mash, ruleset: pld, setname: libmash } +- { name: mash, warning: "please classify me" } + - { name: mc, wwwpart: minio, setname: minio-mc } - { name: mdk, wwwpart: wlan, setname: mdk-wireless-injection } @@ -51,9 +57,9 @@ - { name: mm, wwwpart: meutraa, setname: mm-matrix } # otherwise, shared memory lib -- { name: mog, setname: mog-cat, ruleset: freebsd } -- { name: mog, setname: mog-game, ruleset: slackbuilds } -- { name: mog, warning: "please classify me" } +- { name: mog, setname: mog-cat, wwwpart: witchard } +- { name: mog, setname: mazeofgalious, wwwpart: braingames } +- { name: mog, warning: "please classify me" } - { name: mpd, wwwpart: [musicpd,mpd.wikia.com], setname: musicpd } - { name: mpd, category: [media-sound,Sound,audio], setname: musicpd } diff --git a/850.split-ambiguities/p.yaml b/850.split-ambiguities/p.yaml index c7464d496..a6cd1155a 100644 --- a/850.split-ambiguities/p.yaml +++ b/850.split-ambiguities/p.yaml @@ -26,6 +26,11 @@ - { name: perl, wwwpart: strawberry, setname: strawberryperl } +- { name: pfff, wwwpart: facebook, setname: pfff-apianalysis } +- { name: pfff, ruleset: aosc, setname: pfff-apianalysis } +- { name: pfff, wwwpart: "cs.ut.ee", setname: pfff-fingerprint } +- { name: pfff, warning: "please classify me" } + - { name: pg-top, wwwpart: cpan, setname: "perl:pgtop" } - { name: pgadmin, verpat: "2\\..*", ruleset: aosc, setname: pgadmin4 } diff --git a/850.split-ambiguities/r.yaml b/850.split-ambiguities/r.yaml index 210410ab0..034aa60d6 100644 --- a/850.split-ambiguities/r.yaml +++ b/850.split-ambiguities/r.yaml @@ -5,6 +5,11 @@ - { name: rc, wwwpart: crux, setname: rc-crux } +- { name: rdd, category: app-forensics, setname: rdd-forensic } +- { name: rdd, wwwpart: chneukirchen, setname: rdd-random } +- { name: rdd, wwwpart: r043v, setname: rdd-redis } +- { name: rdd, warning: "please classify me" } + - { name: rem, wwwpart: kykim, setname: rem-kykim } - { name: rescue, wwwpart: rescue.sourceforge.net, setname: rescue-max } diff --git a/850.split-ambiguities/s.yaml b/850.split-ambiguities/s.yaml index 11baeaf97..4ec303f75 100644 --- a/850.split-ambiguities/s.yaml +++ b/850.split-ambiguities/s.yaml @@ -4,6 +4,10 @@ - { name: sage, category: Sciences/Mathematics, setname: sagemath } - { name: sage, summpart: mathematics, setname: sagemath } +- { name: sample, wwwpart: silentbicycle, setname: sample-filter } +- { name: sample, wwwpart: freenas, setname: sample-stack } +- { name: sample, warning: "please classify me" } + - { name: sasl, wwwpart: cyrus, setname: cyrus-sasl } - { name: scala, ruleset: yacp, setname: scala-ccp4 } @@ -14,6 +18,11 @@ - { name: scratch, wwwpart: launchpad.net/scratch, setname: scratch-text-editor } +- { name: sd, wwwpart: syncwith, setname: sd-syncwith } +- { name: sd, ruleset: exherbo, setname: sd-syncwith } +- { name: sd, wwwpart: chmln/sd, setname: "rust:sd" } +- { name: sd, warning: "please classify me" } + - { name: sdb, wwwpart: libsdb, setname: libsdb } - { name: sdb, wwwpart: mono, setname: sdb-mono } - { name: sdb, wwwpart: [shotgun,game], setname: shotgun-debugger } @@ -33,7 +42,7 @@ - { name: sidplay, wwwpart: sidplay/mac, setname: sidplay-mac } - { name: sift, wwwpart: [sift.jcvi.org, sift.bii.a-star.edu.sg], setname: sift-med } # XXX: cannot decide better name -- { name: sift, wwwpart: [sift-tool,svent], addflag: classidied } +- { name: sift, wwwpart: [sift-tool,svent], addflag: classified } - { name: sift, noflag: classified, warning: "please classify me" } - { name: singularity, wwwpart: singularity.lbl.gov, setname: singularity-container } @@ -81,6 +90,10 @@ - { name: splitter, wwwpart: mkgmap, setname: mkgmap-splitter } # no ambiguity at the time of writing, but let's be on the safe side +- { name: spt, category: "Development/Other", setname: spt-sisyphus } +- { name: spt, wwwpart: pickfire, setname: spt-pomodoro } +- { name: spt, warning: "please classify me" } + - { name: ssr, wwwpart: spatialaudio, setname: soundscaperenderer } - { name: ssr, wwwpart: maarten, setname: simplescreenrecorder } - { name: ssr, ruleset: pclinuxos, setname: simplescreenrecorder } @@ -98,6 +111,12 @@ - { name: sterm, wwwpart: suckless, setname: st-term } # freebsd rename of st; but there's actual sterm project +- { name: sudoku, wwwpart: aneventapart, setname: sudoku-aneventapart } +- { name: sudoku, wwwpart: cinemast, setname: sudoku-cinemast } +- { name: sudoku, ruleset: openbsd, setname: sudoku-laurasia } +- { name: sudoku, wwwpart: wimleers, setname: sudoku-wimleers } +- { name: sudoku, warning: "please classify me" } + - { name: sugar, wwwpart: bach.istc.kobe-u.ac.jp/sugar, setname: sugar-solver } - { name: svn2git, verpat: "1\\.[0-9]+.*", setname: svn-all-fast-export } @@ -114,6 +133,10 @@ - { name: swift, setname: openstack-swift, ruleset: [ debuntu, gentoo ] } - { name: swift, warning: "please classify me" } +- { name: swm, wwwpart: /dcat/, setname: swm-simple } +- { name: swm, wwwpart: small, setname: swm-small } +- { name: swm, warning: "please classify me" } + - { name: sx, wwwpart: earnestly, setname: sx-startx } - { name: sx, wwwpart: skylable, setname: skylable-sx } # already used by fedora - { name: sx, wwwpart: fedorahosted, setname: sx-fedora } diff --git a/850.split-ambiguities/t.yaml b/850.split-ambiguities/t.yaml index f2a87592d..7af73826e 100644 --- a/850.split-ambiguities/t.yaml +++ b/850.split-ambiguities/t.yaml @@ -33,6 +33,10 @@ - { name: tint, category: Graphics, setname: tint-photo-editor } +- { name: tiv, wwwpart: archlinux, setname: tiv-arch } +- { name: tiv, wwwpart: radare, setname: tiv-radare } +- { name: tiv, warning: "please classify me" } + # tales of majeyal vs. troubles of middle earth - { name: tome, verpat: "1\\..*", setname: tales-of-majeyal } - { name: tome, verpat: "2\\..*", setname: tome2 } diff --git a/850.split-ambiguities/u.yaml b/850.split-ambiguities/u.yaml index e80446744..d5421a73b 100644 --- a/850.split-ambiguities/u.yaml +++ b/850.split-ambiguities/u.yaml @@ -12,6 +12,10 @@ - { name: unique, ruleset: exherbo, setname: libunique } +- { name: up, wwwpart: akavel, setname: up-plumber } +- { name: up, wwwpart: apex, setname: up-deploy } +- { name: up, warning: "please classify me" } + - { name: uwm, wwwpart: uwm.sourceforge.net, setname: uwm-microwm } - { name: uwm, wwwpart: udeproject, setname: uwm-ude } - { name: uwm, ruleset: pkgsrc, setname: uwm-x11 } diff --git a/850.split-ambiguities/w.yaml b/850.split-ambiguities/w.yaml index 12e69a0b8..36443e400 100644 --- a/850.split-ambiguities/w.yaml +++ b/850.split-ambiguities/w.yaml @@ -19,6 +19,11 @@ - { name: wlc, wwwpart: weblate, setname: wlc-weblate } +- { name: wok, wwwpart: kimchi, setname: wok-plugins-kimchi } +- { name: wok, wwwpart: mythmon, setname: wok-generator } +- { name: wok, ruleset: maemo, setname: wok-game } +- { name: wok, warning: "please classify me" } + - { name: words, wwwpart: wordlist.sourceforge.net, setname: words-scrowl } - { name: words, wwwpart: moby, setname: words-moby } - { name: words, wwwpart: wordsdoc, setname: words-latin } diff --git a/850.split-ambiguities/x.yaml b/850.split-ambiguities/x.yaml index 4d09fe37d..897a2db36 100644 --- a/850.split-ambiguities/x.yaml +++ b/850.split-ambiguities/x.yaml @@ -4,6 +4,12 @@ - { name: xclip, setname: emacs-xclip, ruleset: gentoo, category: app-emacs } +- { name: xed, setname: xed-mint, wwwpart: mint } +- { name: xed, setname: xed-mint, ruleset: [sisyphus,aosc,debuntu] } +- { name: xed, setname: xed-xcontrib, ruleset: [freebsd] } +- { name: xed, setname: xed-ed, wwwpart: sourceforge } +- { name: xed, warning: "please classify me" } + - { name: xdrfile, ruleset: arch, verpat: "2\\..*", setname: xdrfile-wesbarnett } # fork - { name: xsv, wwwpart: burntsushi, setname: "rust:xsv" } diff --git a/900.version-fixes/c.yaml b/900.version-fixes/c.yaml index 29b111668..af192acf0 100644 --- a/900.version-fixes/c.yaml +++ b/900.version-fixes/c.yaml @@ -82,6 +82,7 @@ - { name: clojure, verpat: "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]{3,}", incorrect: true } # homebrew and nix garbage - { name: clonekeen, verpat: "0\\.(.*)", setver: "$1" } - { name: cloog, ver: "0.18.5", ruleset: [haikuports, aosc, arch], ignore: true } # unofficial fork +- { name: cloudfuse, verpat: "20[0-9]{6}", snapshot: true } - { name: clusterssh, ruleset: gentoo, ignore: true } # perl module version mangling rules apply here - { name: cmatrix, ver: "1.2b", ruleset: termux, incorrect: true } - { name: cmatrix, ruleset: termux, untrusted: true } diff --git a/900.version-fixes/d.yaml b/900.version-fixes/d.yaml index e1a63e13d..ef207ce5c 100644 --- a/900.version-fixes/d.yaml +++ b/900.version-fixes/d.yaml @@ -60,6 +60,7 @@ - { name: dolphin, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: dolphin-emu, verpat: ".*[0-9]{4,}.*", ignore: true } - { name: dolphin-plugins, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } +- { name: doom3, verpat: "1.3.([0-9]{2,})", ruleset: gentoo, setver: "1.3.1.$1" } - { name: dosbox, verpat: "0\\.74\\.r?[0-9]{4}.*", snapshot: true } - { name: dosbox-x, ver: "0.801", outdated: true } - { name: dosemu, verpat: "2013.*", ignore: true } diff --git a/900.version-fixes/f.yaml b/900.version-fixes/f.yaml index 82f38ccea..4d612899b 100644 --- a/900.version-fixes/f.yaml +++ b/900.version-fixes/f.yaml @@ -10,6 +10,7 @@ - { name: fasttracker2, verpat: "2\\.[0-9]{3}", incorrect: true } # pkgsrc 2.130; actually b130 - { name: fasttracker2, verpat: "0\\.1.*[0-9]{3}", incorrect: true } # freebsd 0.1.b131, debian 0.1b126; no idea where 0.1 come from - no mention on the site or in the source, it's just bNNN - { name: fatrat, verlonger: 3, ruleset: kaos, ignore: true } +- { name: fbpdf, noscheme: true } - { name: fcgi, ver: "2.4.1", ruleset: solus, incorrect: true } - { name: fcgi, ruleset: solus, untrusted: true } # accused of fake 2.4.1 - { name: fcron, ver: "3.3.0", devel: true } # http://fcron.free.fr/ @@ -68,6 +69,8 @@ - { name: "fonts:fira-sans", verpat: "20[0-9]{6}", ignore: true } # openbsd garbage - { name: "fonts:gentium-basic", ver: "1102", setver: "1.102" } - { name: "fonts:gnutypewriter", noscheme: true } +- { name: "fonts:go", noscheme: true } +- { name: "fonts:ipa", verpat: "([0-9]{3})\\.([0-9]{2})", setver: $1$2 } - { name: "fonts:linuxlibertine", verpat: ".*2012.*", ignore: true } # gentoo and haikuports snapshots - { name: "fonts:lklug", noscheme: true } - { name: "fonts:mikachan", ver: "9.1.2006.08.09", ignore: true } # openSUSE garbage @@ -77,6 +80,7 @@ - { name: "fonts:raleway", verpat: ".*20[0-9]{6}", snapshot: true } # dated packages are all snapshots, not even all from the same sources - { name: "fonts:raleway", ver: "0.0.2016830", snapshot: true } # irregular 7 digit dated snapshot - { name: "fonts:raleway", verge: "4.0", devel: true } # 4.x series is still only an unreleased partial port to Glyphs +- { name: "fonts:siji", noscheme: true } - { name: "fonts:ubuntu", ver: "1.0", ruleset: pclinuxos, ignore: true } # no such version on the website - { name: fonttosfnt, ver: "1.0.5", ruleset: opensuse, incorrect: true } - { name: fonttosfnt, ruleset: opensuse, untrusted: true } @@ -90,6 +94,8 @@ - { name: foomatic-db-nonfree, noscheme: true } - { name: forecast, verlt: "0.5.1", outdated: true, disposable: true } # there's 0.5.1 - { name: forecast, ver: "0.5.1", rolling: false, disposable: true } +- { name: forego, ver: "20180217041714", ruleset: scoop, incorrect: true } +- { name: forego, ruleset: scoop, untrusted: true } - { name: fotowall, verpat: "20[0-9]{6}.*", ignore: true } - { name: four-in-a-row, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: fox, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } @@ -115,6 +121,7 @@ - { name: frozen-bubble, ver: "2.2.1_1", ruleset: solus, incorrect: true } # 2.2.1beta1 - { name: frozen-bubble, ruleset: solus, untrusted: true } # accused of fake 2.2.1_1 - { name: [fs-uae,fs-uae-arcade,fs-uae-launcher], verpat: "([0-9.]+)-p([0-9]+)", ruleset: exherbo, setver: $1dev$2 } +- { name: fs-utils, ver: "20130701", setver: "1.0" } - { name: fskbsetting, ver: "0.5.3.1", ruleset: antix, incorrect: true } - { name: fskbsetting, ruleset: antix, untrusted: true } - { name: fstrcmp, verpat: "[0-9]+\\.[0-9]+", setver: $0.D001 } # assumed diff --git a/900.version-fixes/g.yaml b/900.version-fixes/g.yaml index 31d363e0c..9ce7fcbc9 100644 --- a/900.version-fixes/g.yaml +++ b/900.version-fixes/g.yaml @@ -1,5 +1,6 @@ # vim: tabstop=39 expandtab softtabstop=39 +- { name: gamehub, verpat: ".*master", rolling: true } - { name: ganv, ver: "1.5.4", ruleset: guix, incorrect: true } - { name: ganv, ruleset: guix, untrusted: true } - { name: gap, verpat: ".*20[0-9]{6}", ignore: true } @@ -22,6 +23,7 @@ - { name: gd, ver: "2.25", incorrect: true } # 2.2.5 - { name: gd, verpat: "2\\.[0-9]{2}", ruleset: gobolinux, untrusted: true } - { name: gdal, verpat: ".*20[0-9]{6}", ignore: true } +- { name: gdash, verpat: "(20[0-9]{6})unstable", setver: "$1" } - { name: gdb, verpat: ".*20[0-9]{2}.*", snapshot: true } - { name: gdb, verpat: ".*\\.[59]0", devel: true } - { name: gdm, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } @@ -54,6 +56,7 @@ - { name: glm, verpat: ".*a.*", devel: true } - { name: glmark2, noscheme: true } - { name: globulation2, ver: "0.9.4.5", ruleset: rosa, ignore: true } # not released yet +- { name: glock, noscheme: true } - { name: gltron, verpat: "(.*)final", setver: $1 } # Maemo - { name: gmic-qt, verpat: "[0-9]{3}", incorrect: true } - { name: gmrun, verge: "0.9.4", successor: true } # https://github.com/wdlkmpx/gmrun diff --git a/900.version-fixes/k.yaml b/900.version-fixes/k.yaml index 6892ce442..383971b1b 100644 --- a/900.version-fixes/k.yaml +++ b/900.version-fixes/k.yaml @@ -32,6 +32,7 @@ - { name: kcron, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: kdav, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: kde-common, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } +- { name: kde5, verpat: "([0-9]+(\\.[0-9]+){2}).*", setver: $1 } - { name: kdebugsettings, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: kdeedu-data, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: kdegraphics-mobipocket, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } diff --git a/900.version-fixes/l.yaml b/900.version-fixes/l.yaml index 1cf5ef4bf..715702c65 100644 --- a/900.version-fixes/l.yaml +++ b/900.version-fixes/l.yaml @@ -9,6 +9,8 @@ - { name: lcov, ruleset: opensuse, untrusted: true } - { name: lensfun, verpat: "[0-9]+\\.[0-9]+\\.9[0-9]", devel: true } - { name: less, vergt: "530", devel: true, maintenance: true } # http://www.greenwoodsoftware.com/less/ +- { name: lf, verpat: "r([.0-9]+)", setver: $1 } +- { name: lf, verpat: ".*20[0-9]{6}", devel: true } - { name: lft, verpat: "([0-9]+)\\.([0-9])", setver: "$1.$20" } # upstream inadequacy - { name: lha, verpat: "[0-9]{3}.*", incorrect: true } # it's e.g 1.14i - { name: lha, ver: "1.17", ruleset: [arch,gobolinux], incorrect: true } @@ -74,6 +76,7 @@ - { name: lugaru, verpat: "[0-9]{3}.*", ignore: true } # dates and snapshots - { name: lugaru, verpat: "201[56].*", outdated: true } # 1.2 from 2017 - { name: luit-xterm, verpat: "20[0-9]{6}", setver: "2.0-$0" } +- { name: lxde, noscheme: true } - { namepat: "lumina.*", ver: "1.4.1", ruleset: [freebsd,ravenports], incorrect: true } - { namepat: "lumina.*", p_is_patch: true } - { name: lxdm, verpat: "20[0-9]{6}.*", ignore: true } diff --git a/900.version-fixes/lib.yaml b/900.version-fixes/lib.yaml index 9d7025949..3467522ff 100644 --- a/900.version-fixes/lib.yaml +++ b/900.version-fixes/lib.yaml @@ -134,12 +134,14 @@ - { name: libssh, ver: ["0.11"], incorrect: true } - { name: libssh, ruleset: gobolinux, untrusted: true } # accused of fake 0.11 - { name: libstemmer, noscheme: true } +- { name: libtcd, verpat: "([0-9]+\\.[0-9]+\\.[0-9]+)[-_.]?[rp]([0-9]+)", setver: "$1.$2" } - { name: libtelnet, verpat: ".*\\+[0-9a-f]{7}", incorrect: true } # nix fake - { name: libtorrent, verpat: "20[0-9]{6}.*", ignore: true } # nix fake - { name: libtorrent, verpat: "[0-9]+\\.[0-9]+\\.[0-9]*[13579]", devel: true } # http://rakshasa.github.io/rtorrent/ - { name: libtxc-dxtn, ver: "1.1", ruleset: solus, incorrect: true } - { name: libtxc-dxtn, ruleset: solus, untrusted: true } - { name: libubox, noscheme: true } +- { name: libui, verpat: "(?:0.)?([.0-9]*[0-9])\\.?(?:a|alpha)", setver: "alpha$1" } - { name: libunwind, verpat: ".*20[0-9]{6}", snapshot: true } # termux snapshot - { name: libusbmuxd, verpat: "1\\.1\\.0.*", ruleset: [openwrt,debuntu], ignore: true } # fake - { name: libvpx, verpat: ".*20[0-9]{6}", snapshot: true } diff --git a/900.version-fixes/m.yaml b/900.version-fixes/m.yaml index 109601917..37e53dfef 100644 --- a/900.version-fixes/m.yaml +++ b/900.version-fixes/m.yaml @@ -77,6 +77,7 @@ - { name: minio-mc, verpat: "[0-9]+", incorrect: true } # must use separators - { name: minio-mc, verpat: "[0-9]{4}([.-][0-9]{2}){2}", incorrect: true } # datetime, not date - { name: minio-mc, verpat: "([0-9]{4})[.-]([0-9]{2})[.-]([0-9]{2})[.-]([0-9]{2})[.-]([0-9]{2})[.-]([0-9]{2})", setver: $1-$2-$3T$4-$5-$6Z } +- { name: minissdpd, verpat: "[0-9]+\\.[0-9]+\\.20[0-9]{6}", devel: true } - { name: miniupnpd, verpat: "[0-9]+\\.[0-9]+\\.20[0-9]{6}", devel: true } - { name: minuet, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: mixxx, verpat: "2\\.1\\.[0-9]+", ruleset: [aosc,fedora,kaos], incorrect: true } # actually unitedrpms, but knowing fedora I won't trust it whole @@ -106,8 +107,10 @@ - { name: mozo, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: mp3diags, verpat: "1\\.[0-9]\\.[0-9]{3}.*", incorrect: true } - { name: mp3diags, verpat: "1\\.[0-9]*[13579]\\..*", devel: true } # assumed; https://sourceforge.net/projects/mp3diags/files/unstable/mp3diags-src/ +- { name: mpdcron, verpat: "20[0-9]{6}", devel: true } - { name: mpdscribble, ver: "0.23", ruleset: openwrt, incorrect: true } # entware - { name: mpdscribble, ruleset: openwrt, untrusted: true } # entware +- { name: mpdviz, ruleset: aur, rolling: true } - { name: mpfr, verlonger: 3, incorrect: true } # openbsd, openpkg, openindiana fakes - { name: mphidflash, verpat: "20[0-9]{6}.*", ignore: true } # fake - { name: mpich, verpat: ".*[ab].*", devel: true } @@ -124,6 +127,7 @@ - { name: mtd-utils, verpat: "[0-9]{6}", incorrect: true } # slackware garbage - { name: mtree, ruleset: ravenports, ignore: true } # fake - { name: mtree, verpat: ".*20[0-9]{6}.*", snapshot: true } # there's probably a mess with different mtree versions, but at least ignore snapshots +- { name: mtxclient, verpat: "20[-0-9]{8}", snapshot: true } - { name: multimon-ng, verpat: "20[0-9]{6}.*", ignore: true } - { name: mumble, ruleset: kaos, ignore: true } # snapshot with random version - { name: mumble, ver: "1.2.89", incorrect: true } diff --git a/900.version-fixes/n.yaml b/900.version-fixes/n.yaml index 6afa75768..18f8222ef 100644 --- a/900.version-fixes/n.yaml +++ b/900.version-fixes/n.yaml @@ -46,6 +46,7 @@ - { name: nodejs, verpat: ".*20[0-9]{6}", snapshot: true } - { name: noice, verpat: "20[0-9]{2}.*", snapshot: true } - { name: noip, verpat: "[0-9]+\\.[0-9]+\\.[0-9]+-.*", incorrect: true} # nix fake +- { name: noise-repellent, verpat: ".*\\.20[0-9]{6}", snapshot: true } - { name: notify-osd, ver: "0.9.35", ruleset: [arch,debuntu], incorrect: true } # https://launchpad.net/notify-osd - { name: notion, verpat: "20[0-9]{6}.*", incorrect: true } # it's 3-YYYYMMDD, not just date - { name: novnc, verpat: "201[1234567].*", outdated: true } diff --git a/900.version-fixes/p.yaml b/900.version-fixes/p.yaml index f75d2e5bf..e44260887 100644 --- a/900.version-fixes/p.yaml +++ b/900.version-fixes/p.yaml @@ -79,6 +79,7 @@ - { name: polkit-qt-1, ver: "0.112.0.1", ruleset: kaos, incorrect: true } - { name: polkit-qt-1, ruleset: kaos, untrusted: true } # accused of fake 0.112.0.1 - { name: polkit-qt-1, verpat: "1-.*", incorrect: true } # guix; -1 is a part of project name +- { name: polygen, verpat: "(.*).ds([0-9]+)", setver: "$1.$2" } - { name: pony-stable, ver: "0.1.6.1", ruleset: openbsd, incorrect: true } - { name: pony-stable, ruleset: openbsd, untrusted: true } # accused of fake 0.1.6.1 - { name: popt, ver: "1.17", ruleset: pld, incorrect: true } diff --git a/900.version-fixes/perl.yaml b/900.version-fixes/perl.yaml index 122cba5f7..bae9ab385 100644 --- a/900.version-fixes/perl.yaml +++ b/900.version-fixes/perl.yaml @@ -66,6 +66,7 @@ - { name: "perl:test-exception", ver: [ "0.430000", "0.400", "0.320" ], ignore: true } - { name: "perl:test-exception", verpat: "0\\.[0-9]{3,}", ignore: true } - { name: "perl:test-number-delta", verpat: "1\\.[0-9]{3,}", ignore: true } +- { name: "perl:test-trap", verpat: "v(.*)", setver: "$1" } - { name: "perl:text-autoformat", verpat: "1\\.740.*", incorrect: true } # 1.74 - { name: "perl:text-autoformat", verpat: "1\\.6[67].*", outdated: true } - { name: "perl:time-duration", ver: "1.200000", ignore: true } diff --git a/900.version-fixes/python.yaml b/900.version-fixes/python.yaml index 6e04394e2..79f82eec1 100644 --- a/900.version-fixes/python.yaml +++ b/900.version-fixes/python.yaml @@ -1,5 +1,7 @@ # vim: tabstop=39 expandtab softtabstop=39 +- { name: "python:aiohttp-socks", ruleset: aur, rolling: true } +- { name: "python:apsw", verpat: "(.*[0-9])[-._]?[pr]1", setver: $1 } # upstream use -r1 suffix - { name: "python:backports", ver: "4.0.0", incorrect: true } # opensuse fake - { name: "python:bottle", verpat: "0\\.13.*", devel: true } - { name: "python:configshell-fb", any_is_patch: true } diff --git a/900.version-fixes/q.yaml b/900.version-fixes/q.yaml index f9c5c47d6..710091b7b 100644 --- a/900.version-fixes/q.yaml +++ b/900.version-fixes/q.yaml @@ -24,6 +24,7 @@ - { name: qpdfview, verpat: "0.4.18_pre.*", incorrect: true } # gentoo fakes - { name: qps, verpat: "20[0-9]{6}.*", snapshot: true } - { name: qrfcview, ver: "1.0.0", ruleset: openbsd, successor: true } # uses unofficial fork (dead as well) +- { name: qt5-styleplugins, verpat: "[0-9]+\\.[0-9]+\\.[0-9]+\\.20[0-9]{6}", snapshot: true } - { name: qt5-webkit, ver: "5.212.0", ruleset: [fedora,sisyphus], incorrect: true } # fake, it's 5.212.0alpha2; actually most repos use github.com/annulen repo which is 5.212.0alpha2 (Jun 2017), however there's also https://download.qt.io/snapshots/ci/qtwebkit/5.212/latest/src/submodules/ from 2018 - { name: qt5-webkit, ruleset: [fedora,sisyphus], untrusted: true } # accused of fake 5.212.0 - { name: qt5-webkit, ver: "5.212.0_2", ruleset: solus, incorrect: true } # fake, it's 5.212.0alpha2 diff --git a/900.version-fixes/r.yaml b/900.version-fixes/r.yaml index 6f18c2085..018b95647 100644 --- a/900.version-fixes/r.yaml +++ b/900.version-fixes/r.yaml @@ -24,6 +24,7 @@ - { name: rbldnsd, verpat: ".*20[0-9]{6}.*", ignore: true } - { name: rdate, verpat: "20[0-9]{6}", snapshot: true } - { name: rdist, verpat: ".*a.*", devel: true } +- { name: re2, verpat: "([0-9]{4})[-.]([0-9]{2})[-.]([0-9]{2})", setver: $1$2$3 } - { name: readline, verpat: "([0-9]+\\.[0-9]+)\\.([0-9]+)", setver: $1p$2 } - { name: readline, p_is_patch: true } - { name: recode, ver: "3.7-2fd838565", ignore: true } diff --git a/900.version-fixes/s.yaml b/900.version-fixes/s.yaml index 901a4b1c4..58ad77858 100644 --- a/900.version-fixes/s.yaml +++ b/900.version-fixes/s.yaml @@ -3,6 +3,7 @@ - { name: s25rttr, verpat: "20[0-9]{6}", devel: true } # official nightlies - { name: samurai, ver: "0.3.21", ruleset: freebsd, incorrect: true } - { name: samurai, ruleset: freebsd, untrusted: true } +- { name: sandfox, verpat: "20[0-9]{6}", snapshot: true } - { name: sane-frontends, verge: "1.0.25", incorrect: true } # https://gitlab.com/sane-project/frontends/tags latest is 1.0.14 - { name: sauerbraten, verpat: "(?:0\\.)*(20[0-9]{2})[^0-9]?([0-9]{2})[^0-9]?([0-9]{2})(.*)", setver: "$1_$2_$3$4" } # fix version - { name: sauerbraten, verpat: "(20[0-9]{2}_[0-9]{2}_[0-9]{2})[a-z_-]+", setver: "$1" } # remove release name (like _collect_edition) @@ -96,6 +97,7 @@ - { name: sonata, ver: "1.7", ruleset: sisyphus, incorrect: true } - { name: sonata, ruleset: sisyphus, untrusted: true } - { name: sonata, verpat: ".*[ab].*", devel: true } +- { name: spamassassin, verpat: "[0-9]\\.[0-9]{6}", ignore: true } - { name: spandsp, verpat: ".*20[0-9]{6}", snapshot: true } - { name: sparse, verpat: "20[0-9]{6}", ignore: true } - { name: sparse, verge: "20000000", verle: "20180430", outdated: true } # 0.5.2 from 20180430 diff --git a/900.version-fixes/t.yaml b/900.version-fixes/t.yaml index ed4b34b04..018e0ff45 100644 --- a/900.version-fixes/t.yaml +++ b/900.version-fixes/t.yaml @@ -63,6 +63,7 @@ - { name: tiny-dnn, ruleset: buckaroo, untrusted: true } - { name: tk, verpat: ".*a[0-9]+", devel: true } - { name: tk, verpat: "[0-9]+\\.[0-9]+\\.0\\.?a.*", incorrect: true } # it's X.YaZ, not X.Y.0aZ +- { name: tmfs, verpat: "r([.0-9]+)", setver: "$1" } - { name: tmux, ver: "2.8", devel: true, disposable: true } # marked as 2.8-rc, tag 2.8 - { name: tolua++, ver: "1.0.94", ruleset: maemo, ignore: true } - { name: tomahawk, verpat: "0\\.8\\.99.*", ignore: true } # fake diff --git a/900.version-fixes/v.yaml b/900.version-fixes/v.yaml index 6d97944e3..29f8e93f1 100644 --- a/900.version-fixes/v.yaml +++ b/900.version-fixes/v.yaml @@ -5,6 +5,7 @@ - { name: v86d, verpat: ".*-.*", ruleset: nix, incorrect: true } # kernel version appended - { name: vala, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true } - { name: valentina, verpat: ".*a", devel: true } +- { name: vapoursynth, verpat: "R([.0-9]+)", setver: "$1" } - { name: vbindiff, ver: "3.0", ruleset: pld, incorrect: true } - { name: vbindiff, ruleset: pld, untrusted: true } - { name: vcdimager, ver: "0.7.24cvs", ignore: true } # opensuse garbage @@ -36,6 +37,7 @@ - { name: vlc, verpat: "20[0-9]{6}.*", ignore: true } - { name: vlmc, verpat: ".*ff", incorrect: true } # not a version, but feature freeze tag - { name: vmware-view-open-client, verpat: ".*[0-9]{5}", ignore: true } +- { name: vndr, ruleset: nix, untrusted: true } - { name: vo-aacenc, ver: "1.3", ruleset: pisi, incorrect: true } - { name: vo-aacenc, ruleset: pisi, untrusted: true } # accused of fake 1.3 - { name: vo-amrwbenc, ver: "1.3", ruleset: pisi, incorrect: true } diff --git a/900.version-fixes/x.yaml b/900.version-fixes/x.yaml index 92ba750ac..c8fdf74c9 100644 --- a/900.version-fixes/x.yaml +++ b/900.version-fixes/x.yaml @@ -59,6 +59,7 @@ - { name: xsp, verpat: "20[0-9]{2}.*", incorrect: true } - { name: xtitle, verpat: "20[0-9]{6}", snapshot: true } - { name: xtitle, ver: "20170206", outdated: true } # 0.4.3 which is latest normal version ls from feb 15, e.g. newer +- { name: xtrlock-pam, verpat: ".*post.*", snapshot: true } - { name: xxdiff, verpat: ".*20[0-9]{6}", snapshot: true } - { name: xxdiff, verpat: "[0-9]{3}", incorrect: true } - { name: xz, ver: "5.03", incorrect: true } # gobolinux garbage