shorten some uneeded bindings

3 files changed, 11 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f4556141f1d..3327eafe0257 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = noto-color-emoji-fontconfig
 	pkgdesc = Fontconfig to enable Noto Color Emoji fonts where emojis can be displayed
 	pkgver = 1.0.0
-	pkgrel = 1
+	pkgrel = 2
 	arch = any
 	license = GPL
 	depends = noto-fonts-emoji
+	provides = noto-color-emoji-fontconfig
+	conflicts = noto-color-emoji-fontconfig-no-binding
 	source = 75-noto-color-emoji.conf
-	sha256sums = 0ef3c386c99d34c61e1e64f00c0140a373ce4e09899b9372a29e904afe0326ce
+	sha256sums = 9b7d8e078e0f88582afc8f19cd7d928a6bd2b2f418321d1011d4d6f903056942
 
 pkgname = noto-color-emoji-fontconfig
-
diff --git a/75-noto-color-emoji.conf b/75-noto-color-emoji.conf
index 7379475b6947..cd542dd0e203 100644
--- a/75-noto-color-emoji.conf
+++ b/75-noto-color-emoji.conf
@@ -10,7 +10,7 @@
 
     <!-- This adds Noto Color Emoji as a final fallback font for the default font families. -->
     <match target="pattern">
-        <test name="family"><string>sans</string></test>l.
+        <test name="family"><string>sans</string></test>
         <edit name="family" mode="append"><string>Noto Color Emoji</string></edit>
     </match>
 
@@ -40,74 +40,4 @@
         </rejectfont>
     </selectfont>
 
-    <!-- Use Noto Color Emoji when other popular fonts are being specifically requested. -->
-    <match target="pattern">
-        <test qual="any" name="family"><string>Apple Color Emoji</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>Segoe UI Emoji</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>Segoe UI Symbol</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>Android Emoji</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>Twitter Color Emoji</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>Twemoji</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>Twemoji Mozilla</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>TwemojiMozilla</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>EmojiTwo</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>Emoji Two</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>EmojiSymbols</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>Symbola</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>EmojiOne</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
-
-    <match target="pattern">
-        <test qual="any" name="family"><string>EmojiOne Color</string></test>
-        <edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-    </match>
 </fontconfig>
diff --git a/PKGBUILD b/PKGBUILD
index 89a36ab8097f..c8858f77d822 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,21 @@
 
 pkgname=noto-color-emoji-fontconfig
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Fontconfig to enable Noto Color Emoji fonts where emojis can be displayed'
 arch=('any')
 license=('GPL')
 depends=('noto-fonts-emoji')
 optdepends=()
-conflicts=()
+provides=('noto-color-emoji-fontconfig')
+conflicts=('noto-color-emoji-fontconfig-no-binding')
 options=()
 source=('75-noto-color-emoji.conf')
-sha256sums=('0ef3c386c99d34c61e1e64f00c0140a373ce4e09899b9372a29e904afe0326ce')
+sha256sums=('9b7d8e078e0f88582afc8f19cd7d928a6bd2b2f418321d1011d4d6f903056942')
 
 package() {
-    local conf_avail='etc/fonts/conf.avail'
-    local conf_d='etc/fonts/conf.d/'
+    local conf_avail='usr/share/fontconfig/conf.avail/'
+    local conf_d='usr/share/fontconfig/conf.default/'
 
     install -Dm655 '75-noto-color-emoji.conf' -t "${pkgdir}/${conf_avail}"
     mkdir -p "${pkgdir}/${conf_d}"