diff --git a/800.renames-and-merges/a.yaml b/800.renames-and-merges/a.yaml index e2c587252..c046db12c 100644 --- a/800.renames-and-merges/a.yaml +++ b/800.renames-and-merges/a.yaml @@ -32,6 +32,8 @@ - { 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,adapta-gtk-theme-3.94,adapta-gtk-theme-legacy] } +- { setname: adapta-gtk-theme, name: [adapta-gtk-theme-colorpack,adapta-gtk-theme-wal], addflavor: true } - { setname: adblock-plus, name: adblockplus-firefox, ruleset: chocolatey } - { setname: adms, name: [adms-qucs,mot-adms] } - { setname: adobeps, name: adobeps-win, ruleset: pkgsrc } diff --git a/800.renames-and-merges/b.yaml b/800.renames-and-merges/b.yaml index 93f00fe57..25ca6fd67 100644 --- a/800.renames-and-merges/b.yaml +++ b/800.renames-and-merges/b.yaml @@ -53,6 +53,7 @@ - { setname: beneath-a-steel-sky, name: beneath-a-steel-sky-cd } - { setname: beneath-a-steel-sky, name: scummvm-bass } - { setname: berusky2, name: berusky-ii } +- { setname: bff, name: bff-apankrat } - { setname: bibtool, name: bib-tool } - { setname: bicyclerepair, name: bicyclerepair-py27 } - { setname: billardgl, name: billard-gl } diff --git a/800.renames-and-merges/c.yaml b/800.renames-and-merges/c.yaml index 1ac1067d2..b43a22410 100644 --- a/800.renames-and-merges/c.yaml +++ b/800.renames-and-merges/c.yaml @@ -123,6 +123,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" } - { setname: coffee-script, name: coffeescript } # XXX: problem - { setname: cogl, name: cogl-amdgpu-pro } - { setname: cogl, name: libcogl } @@ -169,6 +170,7 @@ - { setname: coolreader3, name: coolreader } - { setname: corsixth, name: corsix-th } - { setname: couchpotato, name: couchpotatoserver } +- { setname: cozy-audiobooks, name: com.github.geigi.cozy } - { setname: cpmtools, name: cpmtools2 } - { setname: cpp-hocon, name: libcpp-hocon } - { setname: cppcheck, name: [cppcheck-nox,cppcheck-gui] } diff --git a/800.renames-and-merges/fonts/n.yaml b/800.renames-and-merges/fonts/n.yaml index e627204bf..f224b9cde 100644 --- a/800.renames-and-merges/fonts/n.yaml +++ b/800.renames-and-merges/fonts/n.yaml @@ -113,8 +113,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 @@ -125,10 +128,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/r.yaml b/800.renames-and-merges/fonts/r.yaml index 605ad7511..dab0cce85 100644 --- a/800.renames-and-merges/fonts/r.yaml +++ b/800.renames-and-merges/fonts/r.yaml @@ -39,3 +39,14 @@ name: - fonts-roadgeek - roadgeek2005-fonts + +- setname: "fonts:roboto" + name: + - font-google-roboto + - fonts-roboto + - fonts-roboto-ttf + - fonts-ttf-roboto + - roboto + - roboto-fonts-ttf + - ttf-roboto + - ttf-roboto-base diff --git a/800.renames-and-merges/fonts/u.yaml b/800.renames-and-merges/fonts/u.yaml index b2e4cbeec..6dbba4382 100644 --- a/800.renames-and-merges/fonts/u.yaml +++ b/800.renames-and-merges/fonts/u.yaml @@ -50,6 +50,19 @@ - ttf-umeplus-ibx - umeplus-fonts +- setname: "fonts:unifont" + name: + - bdf-unifont + - font-gnu-unifont + - font-unifont-bdf + - fonts-ttf-unifont + - gnu-unifont + - gnu-unifont-ttf + - ttf-unifont + - ttf-unifont-csur + - unifont + - unifont-upper + - setname: "fonts:uralic" name: - fonts-ttf-uralic diff --git a/800.renames-and-merges/g.yaml b/800.renames-and-merges/g.yaml index bc4fc8ffd..d1cbbd682 100644 --- a/800.renames-and-merges/g.yaml +++ b/800.renames-and-merges/g.yaml @@ -172,6 +172,7 @@ - { setname: gnome-mines, name: gnome-mines-3.12.2 } - { setname: gnome-nibbles, name: gnome-games-nibbles } - { setname: gnome-photo-printer, name: [gnomephotoprinter,gnome-photo-print] } +- { setname: gnome-python, name: [gconf-python,"python:gconf","python:gconf-python"], addflavor: true } - { setname: gnome-robots, name: gnome-games-robots } - { setname: gnome-settings-daemon, name: [gnome-settings-daemon-120dpi,gnome-settings-daemon-elementary,gnome-settings-daemon-shutdown,gnome-settings-daemon-ubuntu,gnome-settings-daemon-volume-step-patch], addflavor: true } - { setname: gnome-settings-daemon, name: gnome-settings-daemon-compat } @@ -317,6 +318,8 @@ - { 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: "gtktheme:blackbird", name: [blackbird-gtk-theme,blackbird-themes,gtk-theme-blackbird,xfce-theme-blackbird] } +- { setname: "gtktheme:bluebird", name: [bluebird-gtk-theme,bluebird,bluebird-theme,bluebird-themes,gtk-theme-bluebird,xfce-theme-bluebird] } - { setname: gtkwrite, name: gtkedit } - { setname: gts, name: gnugts } - { setname: gtypist, name: gnu-typist } diff --git a/800.renames-and-merges/h.yaml b/800.renames-and-merges/h.yaml index c1f78382d..014867f6c 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-aot-ieyo, name: [hunspell-ru-ru-ieyo,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/lib.yaml b/800.renames-and-merges/lib.yaml index f29589763..2da03061a 100644 --- a/800.renames-and-merges/lib.yaml +++ b/800.renames-and-merges/lib.yaml @@ -11,6 +11,7 @@ - { setname: libc++, name: libcxx } - { setname: libc++abi, name: libcxxabi } - { setname: libcap, name: [libcap2,libcap1,compat-libcap1] } +- { setname: libcap, name: libcap-pam, addflavor: true } - { setname: libcapplet, name: libcapplet15 } - { setname: libcdr, namepat: "libcdr[0-9.-]+" } - { setname: libchamplain, namepat: "libchamplain[0-9.-]+" } diff --git a/800.renames-and-merges/o.yaml b/800.renames-and-merges/o.yaml index 201d99ebb..80d51262b 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:gshhs", name: [opencpn-plugin-gshhs,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 } diff --git a/800.renames-and-merges/p.yaml b/800.renames-and-merges/p.yaml index 341995278..393a6ea35 100644 --- a/800.renames-and-merges/p.yaml +++ b/800.renames-and-merges/p.yaml @@ -93,6 +93,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 } diff --git a/800.renames-and-merges/python.yaml b/800.renames-and-merges/python.yaml index e10c71235..8ea441d52 100644 --- a/800.renames-and-merges/python.yaml +++ b/800.renames-and-merges/python.yaml @@ -3,6 +3,8 @@ - { setname: "python:3to2", name: 3to2 } - { setname: "python:absl-py", name: "python:absl", ruleset: macports } # there's python:absl in pypi which is different package - { setname: "python:absl-py", name: absl-py } +- { setname: "python:aiohttp-cors", name: [aiohttp-cors,"python:aiohttp-cors2","python:aiohttp1-cors"] } +- { setname: "python:aiohttp-cors", name: "python:aiohttp-cors-gns3", addflavor: true } - { setname: "python:aiopg", name: aiopg } - { setname: "python:aiozmq", name: aiozmq } - { setname: "python:airnef", name: airnef } @@ -34,6 +36,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 } @@ -128,6 +131,10 @@ - { setname: "python:nbsphinx", name: ["python:jupyter-nbsphinx",nbsphinx] } - { setname: "python:nbxmpp", name: ["python:python-nbxmpp",nbxmpp] } - { setname: "python:netifaces", name: netifaces } +- { setname: "python:notify-python", name: notify-python, wwwpart: galago } +- { setname: "python:notify-python", name: notify-python, ruleset: [maemo,slackware,solus] } +- { setname: "python:notify-python", name: python-notify, wwwpart: galago } +- { setname: "python:notify-python", name: "python:pynotify", ruleset: pld } - { setname: "python:numarray", name: numarray } - { setname: "python:numeric", name: numeric, ruleset: [crux,gobolinux] } - { setname: "python:numpy", name: "python:numpy-docs-devhelp", addflavor: devhelp } diff --git a/800.renames-and-merges/qt.yaml b/800.renames-and-merges/qt.yaml index 71998690a..2d8e2356a 100644 --- a/800.renames-and-merges/qt.yaml +++ b/800.renames-and-merges/qt.yaml @@ -165,6 +165,7 @@ serialbus| serialport| speech| + styleplugins| svg| tools| translations| diff --git a/800.renames-and-merges/r.yaml b/800.renames-and-merges/r.yaml index 86a0e2ba5..c7cf8906d 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, weak_devel: true } - { setname: ranger, name: "python:ranger" } @@ -70,3 +71,4 @@ - { setname: rust, name: rust-msvc-nightly, ignore: true } - { setname: rust, name: rust-toolset-7-rust } - { setname: rust-dwm-status, name: "rust:rust-dwm-status" } +- { setname: rusty-diceware, name: "rust-diceware" } diff --git a/800.renames-and-merges/s.yaml b/800.renames-and-merges/s.yaml index e735b4593..ce4a53b9a 100644 --- a/800.renames-and-merges/s.yaml +++ b/800.renames-and-merges/s.yaml @@ -121,6 +121,7 @@ - { setname: sogo, name: [gnustep-sogo,gnustep-sogo3,sogo4] } - { setname: sogo, name: [sogo2-activesync,sogo3-activesync,sogo4-activesync], addflavor: activesync } - { setname: soil, name: libsoil } +- { setname: solid, name: [ksolid,kf5-solid] } - { setname: solidity, name: [solc,lll], addflavor: true } - { setname: sonarqube, name: sonarqube-bin, addflavor: true } - { setname: sonarqube, name: sonarqube-lts } diff --git a/800.renames-and-merges/w.yaml b/800.renames-and-merges/w.yaml index 36697f318..87fc2a809 100644 --- a/800.renames-and-merges/w.yaml +++ b/800.renames-and-merges/w.yaml @@ -55,6 +55,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 } - { 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..c83b22872 100644 --- a/800.renames-and-merges/y.yaml +++ b/800.renames-and-merges/y.yaml @@ -16,5 +16,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 b893b36e3..1a3e79d43 100644 --- a/850.split-ambiguities/b.yaml +++ b/850.split-ambiguities/b.yaml @@ -38,6 +38,8 @@ - { name: beef, wwwpart: beefproject, setname: beef-browser-exploitation } - { name: beef, setname: beef-brainfuck } +- { setname: bff4, name: bff, wwwpart: mazonka } + - { name: bk, setname: bitkeeper, wwwpart: bitkeeper } - { name: blackhole, wwwpart: 3Hren, setname: blackhole-logging } diff --git a/850.split-ambiguities/c.yaml b/850.split-ambiguities/c.yaml index dc8b1ffa6..42b8dec41 100644 --- a/850.split-ambiguities/c.yaml +++ b/850.split-ambiguities/c.yaml @@ -69,6 +69,11 @@ - { name: cmt, wwwpart: cmtsite.net, setname: cmt-configuration-management } - { name: cmt, warning: "please classify me" } +- { name: cozy, setname: cozy-cloud, wwwpart: cozy.io } +- { name: cozy, setname: cozy-audiobooks, wwwpart: geigi } +- { name: cozy, setname: cozy-audiobooks, summpart: "audio book" } +- { name: cozy, warning: "please classify me" } + - { name: command-not-found, wwwpart: metti, setname: command-not-found-arch } - { name: command-not-found, wwwpart: kaniini, setname: command-not-found-kaniini } - { name: command-not-found, wwwpart: [jrabbit,haiku], setname: command-not-found-haiku } diff --git a/850.split-ambiguities/h.yaml b/850.split-ambiguities/h.yaml index c70200612..1f56cf41b 100644 --- a/850.split-ambiguities/h.yaml +++ b/850.split-ambiguities/h.yaml @@ -13,8 +13,8 @@ - { name: hermes, setname: hermes-auth, wwwpart: ralt/hermes } # otherwise, (dead?) pixel format convertsion library -- { name: hex, wwwpart: sitkevij, setname: hex-sitkevij } -- { name: hex, wwwpart: [catb,ibiblio], setname: hex-esr } +- { name: hex, wwwpart: sitkevij, setname: "rust:hx" } +- { name: hex, wwwpart: [catb,ibiblio], setname: hexdump } - { name: hex, wwwpart: janouch, setname: hex-janouch } - { name: hex, warning: "please classify me" } diff --git a/850.split-ambiguities/o.yaml b/850.split-ambiguities/o.yaml index 8bd76a2cc..74bc15690 100644 --- a/850.split-ambiguities/o.yaml +++ b/850.split-ambiguities/o.yaml @@ -32,6 +32,8 @@ - { name: openal, ruleset: [pkgsrc,chocolatey,freebsd,macports], setname: openal-creative } - { name: openal, setname: openal-soft } # most openal's are openal-soft, even if they erroneously list openal.org as a website +- { name: openbsd-rs, setname: rs-chneukirchen, wwwpart: chneukirchen } + - { name: openbox-themes, wwwpart: openbox.org, setname: openbox, addflavor: themes } # slitaz - { name: orrery, ruleset: maemo, setname: orrery-maemo } diff --git a/850.split-ambiguities/p.yaml b/850.split-ambiguities/p.yaml index 528626130..24e165688 100644 --- a/850.split-ambiguities/p.yaml +++ b/850.split-ambiguities/p.yaml @@ -107,6 +107,10 @@ - { name: "python:antlr", wwwpart: [antlr.org, antlr2.org], setname: antlr } +- { name: "python:chroot", setname: "python:pychroot", wwwpart: pkgcore } + +- { name: "python:codespell", setname: codespell, wwwpart: "github.com/codespell-project/codespell" } + - { name: "python:eventlib", setname: "python:eventlib-icanblink", wwwpart: icanblink } - { name: "python:keystone", wwwpart: openstack, setname: openstack-keystone } @@ -118,11 +122,18 @@ - { name: "python:magic", wwwpart: darwinsys.com/file, setname: file, addflavor: python } - { name: "python:magic", wwwpart: [ahupp/python-magic,pypi/python-magic], setname: "python:python-magic" } # XXX: problem -- { name: "python:vlc", wwwpart: videolan.org, setname: "python:python-vlc" } # XXX: problem -- { name: "python:vlc", ruleset: [sisyphus,solus], setname: "python:python-vlc" } +- { name: "python:notify", setname: "python:notify-python", wwwpart: galago } +- { name: "python:notify", setname: "python:notify-python", ruleset: [sisyphus,openbsd] } +- { name: "python:notify", setname: "python:notify2", ruleset: [pkgsrc] } +- { name: "python:notify", warning: "please classify me" } + +- { name: "python:pgmigrate", setname: yandex-pgmigrate, wwwpart: yandex } - { name: "python:planet", setname: planet, wwwpart: planetplanet } - { name: "python:poppler-qt", ruleset: kaos, setname: "python:python-poppler-qt5" } - { name: "python:tz", wwwpart: pytz, setname: "python:pytz" } # there is tz module, but in most (currently all) cases it misspelled pytz; XXX: problem + +- { name: "python:vlc", wwwpart: videolan.org, setname: "python:python-vlc" } # XXX: problem +- { name: "python:vlc", ruleset: sisyphus, setname: "python:python-vlc" } diff --git a/850.split-ambiguities/r.yaml b/850.split-ambiguities/r.yaml index 210410ab0..4142dfaac 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,Archiving/Backup], 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 } @@ -19,6 +24,8 @@ - { name: roundup, wwwpart: mizerany, setname: sh-roundup } # taken name already used in parabola/hyperbola +- { name: rs, setname: rs-chneukirchen, wwwpart: chneukirchen } + - { name: rsync, wwwpart: cwrsync, setname: cwrsync } - { name: ruby, wwwpart: rubyinstaller, setname: rubyinstaller } diff --git a/850.split-ambiguities/s.yaml b/850.split-ambiguities/s.yaml index 18cb4e0f7..0ba779d95 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 } @@ -79,6 +88,8 @@ - { name: sokoban, wwwpart: sourceforge.net/projects/sokoban, setname: sokoban-tgfcoder } - { name: sokoban, warning: "please classify me" } +- { name: solid, wwwpart: dtecta, setname: solid-dtecta } + - { name: sope, wwwpart: opengroupware, setname: sope-skyrix } - { name: sphinx, wwwpart: cmusphinx, setname: cmusphinx } @@ -97,6 +108,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 } @@ -116,6 +131,12 @@ - { name: stone, ruleset: t2, setname: stone-t2 } +- { 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 } @@ -132,6 +153,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 2831edd07..e1de45da0 100644 --- a/850.split-ambiguities/t.yaml +++ b/850.split-ambiguities/t.yaml @@ -39,6 +39,10 @@ - { name: tint, category: [games,Amusements/Games/Board/Puzzle], setname: tint-tetris } - { name: tint, warning: "please classify me" } +- { 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 3329588f4..646274bff 100644 --- a/850.split-ambiguities/u.yaml +++ b/850.split-ambiguities/u.yaml @@ -14,6 +14,10 @@ - { name: unreal, wwwpart: unrealircd, setname: unrealircd } +- { 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 0f6a45805..7f050da28 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: xst, wwwpart: gpe.handhelds, setname: xst-gpe } diff --git a/900.version-fixes/f.yaml b/900.version-fixes/f.yaml index 14148d57a..41e90377e 100644 --- a/900.version-fixes/f.yaml +++ b/900.version-fixes/f.yaml @@ -78,6 +78,7 @@ - { 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 } @@ -88,6 +89,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: "fonts:wqy-microhei", verpat: "(.*?)[^0-9]?beta", setver: $1 } - { name: fonttosfnt, ver: "1.0.5", ruleset: opensuse, incorrect: true } @@ -131,6 +133,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", ignore: true } # it's 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/l.yaml b/900.version-fixes/l.yaml index aca41618b..08669d473 100644 --- a/900.version-fixes/l.yaml +++ b/900.version-fixes/l.yaml @@ -12,6 +12,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 } diff --git a/900.version-fixes/lib.yaml b/900.version-fixes/lib.yaml index 147116432..786114f93 100644 --- a/900.version-fixes/lib.yaml +++ b/900.version-fixes/lib.yaml @@ -139,6 +139,8 @@ - { name: libssh, ruleset: gobolinux, untrusted: true } # accused of fake 0.11 - { name: libstemmer, noscheme: true } - { name: libstroke, verpat: ".*fvwm.*", ignore: true } # ? +- { name: libtcd, any_is_patch: true } +- { name: libtcd, verpat: "(.*)p(.*)", ruleset: gentoo, setver: "$1r$2" } - { name: libtelnet, verpat: ".*\\+[0-9a-f]{7}", incorrect: true } # nix fake - { name: libtompoly, ver: "0.40", ruleset: t2, incorrect: true } # 0.04 - { name: libtompoly, ruleset: t2, untrusted: true } # accused of fake 0.40 @@ -148,6 +150,7 @@ - { name: libtxc-dxtn, ruleset: solus, untrusted: true } - { name: libtxc-dxtn, verpat: "[0-9]+", ruleset: t2, snapshot: true } - { name: libubox, noscheme: true } +- { name: libui, verpat: "[0-9].*a.*", incorrect: true } - { name: libunwind, verpat: ".*20[0-9]{6}", snapshot: true } # termux snapshot - { name: libusbmuxd, verpat: "1\\.1\\.0.*", ruleset: [openwrt,debuntu], ignore: true } # fake - { name: libusbmuxd, verpat: ".*20[0-9]{6}.*", snapshot: true } diff --git a/900.version-fixes/p.yaml b/900.version-fixes/p.yaml index 55d30fcb8..ad6072803 100644 --- a/900.version-fixes/p.yaml +++ b/900.version-fixes/p.yaml @@ -85,6 +85,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/python.yaml b/900.version-fixes/python.yaml index 0b41e3447..f44af6a45 100644 --- a/900.version-fixes/python.yaml +++ b/900.version-fixes/python.yaml @@ -1,6 +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 429f837f5..f704decdf 100644 --- a/900.version-fixes/q.yaml +++ b/900.version-fixes/q.yaml @@ -26,6 +26,7 @@ - { name: qrfcview, ver: "1.0.0", ruleset: openbsd, successor: true } # uses unofficial fork (dead as well) - { name: [qt,qt3], verpat: "3\\.8.*", incorrect: true } # openbsd garbage (3.3.8*, not 3.8*) - { name: [qt,qt3], ver: ["3.3.8c","3.3.8d"], incorrect: true } +- { 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