Add merge rules for Chimera Linux

repology · Sep 11, 2024 · ec03f5e · ec03f5e
1 parent f704b50
commit ec03f5e
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 3 deletions.
diff --git a/800.renames-and-merges/c.yaml b/800.renames-and-merges/c.yaml
@@ -51,6 +51,7 @@
 - { setname: cargo,                    name: cargo-nightly, weak_devel: true, nolegacy: true }
 - { setname: cargo-audit,              name: ["rust:cargo-audit",rust-cargo-audit] }
 - { setname: cargo-auditable,          name: rust:$0 }
+- { setname: cargo-auditable,          name: cargo-auditable-bootstrap, addflavor: true }
 - { setname: cargo-bloat,              name: ["rust:cargo-bloat",rust-cargo-bloat] }
 - { setname: cargo-c,                  name: "rust:cargo-c" }
 - { setname: cargo-deb,                name: "rust:cargo-deb" }

diff --git a/800.renames-and-merges/e.yaml b/800.renames-and-merges/e.yaml
@@ -78,6 +78,7 @@
 - { setname: emacs,                    name: [emacs-devel-nox], addflavor: nox11, weak_devel: true, nolegacy: true }
 - { setname: emacs,                    name: emacs-git-gtk2, addflavor: gtk2, ignore: true }
 - { setname: emacs,                    namepat: "emacs[0-9.-]+(-non-dfsg)?" }
+- { setname: emacs,                    name: emacs-console }
 - { setname: emacs-lua-mode,           name: emacs-lua }
 - { setname: emacs-mediawiki,          name: mediawiki, category: app-emacs }
 - { setname: emacs-mmm-mode,           name: emacs-mmm }

diff --git a/800.renames-and-merges/f.yaml b/800.renames-and-merges/f.yaml
@@ -135,6 +135,7 @@
 - { setname: font-v,                   name: python:$0 }
 - { setname: fontbakery,               name: "python:$0" }
 - { setname: fontconfig,               name: fontconfig-reference, addflavor: true }
+- { setname: fontforge,                name: fontforge-cli, addflavor: true }
 - { setname: fontmake,                 name: "python:fontmake" }
 - { setname: fonttools,                name: "python:fonttools" }
 - { setname: foo2js,                   name: foo2zjs-nightly, weak_devel: true, nolegacy: true }
@@ -189,7 +190,7 @@
 - { setname: freetds,                  name: freetds-devel, weak_devel: true, nolegacy: true }
 - { setname: freetds,                  name: [freetds-krb5,freetds-patched-enum], addflavor: true }
 - { setname: freetype,                 name: [libfreetype,freetype1,freetype2] }
-- { setname: freetype,                 name: [freetype2-bootstrap,freetype2-minimal,freetype2-old-hinting,freetype2-ttmetrics,freetype2-ultimate5,freetype2-v35,freetype2-static,freetype2-static-bootstrap], addflavor: true }
+- { setname: freetype,                 name: [freetype2-bootstrap,freetype2-minimal,freetype2-old-hinting,freetype2-ttmetrics,freetype2-ultimate5,freetype2-v35,freetype2-static,freetype2-static-bootstrap,freetype-bootstrap], addflavor: true }
 - { setname: freetype-infinality,      name: [freetype2-infinality,libfreetype-infinality] }
 - { setname: freexl,                   name: libfreexl, addflavor: true }
 - { setname: frei0r,                   name: frei0r-plugins }

diff --git a/800.renames-and-merges/fonts/c.yaml b/800.renames-and-merges/fonts/c.yaml
@@ -8,6 +8,7 @@
     - cantarell-fonts-0.100
     - font-abattis-cantarell
     - fonts-cantarell
+    - fonts-cantarell-otf
     - fonts-otf-abattis-cantarell
     - fonts-otf-cantarell
     - ttf-cantarell

diff --git a/800.renames-and-merges/fonts/f.yaml b/800.renames-and-merges/fonts/f.yaml
@@ -70,6 +70,7 @@
     - font-fira-code
     - font-firacode
     - fonts-firacode
+    - fonts-firacode-ttf
     - fonts-ttf-fira-code
     - otf-fira-code
     - ttf-fira-code
@@ -86,6 +87,7 @@
     - fontawesome
     - fontawesome-fonts
     - fonts-font-awesome
+    - fonts-font-awesome-otf
     - fonts-ttf-fontawesome
     - otf-font-awesome
     - otf-font-awesome-5-free
@@ -105,6 +107,7 @@
     - font-gnu-freefont
     - font-gnu-freefont-ttf
     - fonts-freefont
+    - fonts-freefont-otf
     - fonts-freefont-ttf
     - fonts-otf-freefont
     - fonts-ttf-freefont

diff --git a/800.renames-and-merges/fonts/h.yaml b/800.renames-and-merges/fonts/h.yaml
@@ -5,6 +5,7 @@
     - font-hack
     - font-hack-ttf
     - fonts-hack
+    - fonts-hack-ttf
     - fonts-otf-hack
     - fonts-ttf-hack
     - hack-font

diff --git a/800.renames-and-merges/fonts/l.yaml b/800.renames-and-merges/fonts/l.yaml
@@ -109,6 +109,7 @@
 - setname: "fonts:libertinus"
   name:
     - font-libertinus
+    - fonts-libertinus-otf
     - libertinus
     - libertinus-font
     - libertinus-fonts

diff --git a/800.renames-and-merges/fonts/n.yaml b/800.renames-and-merges/fonts/n.yaml
@@ -85,6 +85,7 @@
 
 - setname: "fonts:nerd-fonts"
   name:
+    - fonts-nerd-fonts
     - nerd-fonts
     - nerd-fonts-bitstream-vera-mono
     - nerd-fonts-complete
@@ -178,6 +179,7 @@
   name:
     - font-google-noto-sans-cjk
     - font-notosanscjktc
+    - fonts-noto-sans-cjk
     - google-noto-sans-cjk-fonts
     - google-noto-sans-cjk-subset-fonts
     - google-noto-sans-cjk-vf-fonts
@@ -193,6 +195,7 @@
 - setname: "fonts:noto-cjk-serif"
   name:
     - font-google-noto-serif-cjk
+    - fonts-noto-serif-cjk
     - google-noto-serif-cjk-fonts
     - google-noto-serif-cjk-vf-fonts
     - noto-fonts-cjk-serif

diff --git a/800.renames-and-merges/fonts/o.yaml b/800.renames-and-merges/fonts/o.yaml
@@ -61,6 +61,7 @@
   name:
     - font-opensans
     - fonts-open-sans
+    - fonts-opensans-ttf
     - fonts-ttf-open-sans
     - fonts-ttf-opensans
     - google-opensans-fonts

diff --git a/800.renames-and-merges/fonts/s.yaml b/800.renames-and-merges/fonts/s.yaml
@@ -101,6 +101,7 @@
     - font-adobe-source-code-pro-fonts
     - fonts-otf-adobe-source-code-pro
     - fonts-otf-adobe-sourcecodepro
+    - fonts-source-code-pro-otf
     - otf-source-code-pro
     - source-code-pro
     - sourcecodepro
@@ -192,6 +193,7 @@
     - font-adobe-source-sans-pro-v2
     - fonts-otf-adobe-source-sans-pro
     - fonts-otf-adobe-sourcesanspro
+    - fonts-source-sans-otf
     - otf-source-sans-pro
     - source-sans
     - source-sans-fonts

diff --git a/800.renames-and-merges/fonts/t.yaml b/800.renames-and-merges/fonts/t.yaml
@@ -126,6 +126,7 @@
 
 - setname: "fonts:twitter-twemoji"
   name:
+    - fonts-twemoji-ttf
     - ttf-twemoji
     - twitter-color-emoji
     - twitter-twemoji-fonts

diff --git a/800.renames-and-merges/g.yaml b/800.renames-and-merges/g.yaml
@@ -204,7 +204,7 @@
 - { setname: glew,                     name: glew-wayland, addflavor: true }
 - { setname: glfw,                     name: [glfw-doc,glfw-wayland,glfw-x11] }
 - { setname: glfw,                     namepat: "(?:lib)?glfw[0-9.-]*" }
-- { setname: glib,                     name: [glib-reference,glib-static,glib2-docs,glib2-patched-thumbnailer,glib2-quiet,glib2-static,glib-utils,glib2-clear,glib2-sched-policy,glib2-tools], addflavor: true }
+- { setname: glib,                     name: [glib-reference,glib-static,glib2-docs,glib2-patched-thumbnailer,glib2-quiet,glib2-static,glib-utils,glib2-clear,glib2-sched-policy,glib2-tools,glib-bootstrap], addflavor: true }
 - { setname: glib,                     namepat: "(?:lib)?glib[0-9.-]*" }
 - { setname: glib-networking,          namepat: "glib[0-9.-]+networking" }
 - { setname: glib-openssl,             namepat: "glib[0-9.-]+openssl" }
@@ -485,6 +485,7 @@
 - { setname: gtk,                      namepat: "(?:lib)?gtk[0-9.+-]*(-reference)?", addflavor: $1 }
 - { setname: gtk,                      name: gtk-update-icon-cache, addflavor: true }
 - { setname: gtk-doc,                  name: gtk-doc-am, addflavor: am }
+- { setname: gtk-doc,                  name: gtk-doc-tools }
 - { setname: gtk-engines,              namepat: "gtk[0-9.-]*engines[0-9.-]*" }
 - { setname: gtk-engines-$1,           namepat: "gtk[0-9.-]*engines-(.*)" } # XXX: convert to wildcard rule?
 - { setname: gtk-recordmydesktop,      name: recordmydesktop-gtk }

diff --git a/800.renames-and-merges/linux.yaml b/800.renames-and-merges/linux.yaml
@@ -38,6 +38,7 @@
     - linux-headers
     - linux-mainline
     - linux-tools
+    - linux-stable
     - linux-vanilla
     - perf
     - vanilla-kernel

diff --git a/800.renames-and-merges/xorg-server.yaml b/800.renames-and-merges/xorg-server.yaml
@@ -2,7 +2,7 @@
 
 - { setname: xorg-server$1,            namepat: "xorg-server[0-9.-]+(-.+)?" } # XXX: should be before large xorg-server rule at the end
 - { setname: xorg-server$1,            namepat: "xorg-server(-.+)?-dev", ignore: true } # XXX: should be before large xorg-server rule at the end
-- { setname: xorg-server,              name: [xorg-x11-server,xorg-xserver-server,xserver-xorg-server,modular-xorg-server] }
+- { setname: xorg-server,              name: [xorg-x11-server,xorg-xserver-server,xserver-xorg-server,modular-xorg-server,xserver-xorg-core] }
 - { setname: xorg-server,              name: xorg-server-legacy }
 - { setname: xorg-server,              namepat: "xorg-server-lts-[a-z]+" }