Various rules

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 }

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 }

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] }

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

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

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

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 }

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 }

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.-]+" }

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 }

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 }

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 }

800.renames-and-merges/qt.yaml

@@ -165,6 +165,7 @@
     serialbus|
     serialport|
     speech|
+    styleplugins|
     svg|
     tools|
     translations|

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" }

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 }

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 }

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 }

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 }

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 }

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" }
 

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 }

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" }

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 }

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 }

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 }