* Adjust provides and replaces.

* Did you know that replaces do not work with packages installed
  from the AUR? Only conflicts work. The AUR packaging guidelines
  were written by someone who isn't familiar with pacman's
  corner bugs. Although, can this bug be considered an outlier?

2 files changed, 52 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3a3eff3e67f..494f37559eb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ttf-literata
 	pkgdesc = Google's contemporary serif typeface family for long-form reading; default typeface for Play Books. Truetype, open source (OFL) distribution.
 	pkgver = 3.103
-	pkgrel = 2
+	pkgrel = 4
 	url = https://github.com/googlefonts/literata
 	arch = any
 	license = custom:OFL
@@ -12,13 +12,28 @@ pkgbase = ttf-literata
 	b2sums = 2a91a436d60192c0794f4114ef755a23f99a062b1485f96ee4196f862cd8c022079cbb2310d3406dc5059a01d6986663e7ecf2411a52d2d5425cbe07301bc2d6
 
 pkgname = ttf-literata
-	pkgdesc = Google's default typeface for Play Books. Truetype collections, open source (OFL) distribution.
+	pkgdesc = Google's default typeface for Play Books. Truetype variable fonts, open source (OFL) distribution.
+	provides = ttf-literata-opticals
+	conflicts = ttf-literata-opticals
+	replaces = ttf-literata-opticals
 
 pkgname = ttf-literata-opticals
-	pkgdesc = Google's default typeface for Play Books. Truetype opticals, open source (OFL) distribution.
+	pkgdesc = Google's default typeface for Play Books. Truetype in optical sizes, open source (OFL) distribution.
+	provides = ttf-literata
+	conflicts = ttf-literata
+	replaces = ttf-literata
 
 pkgname = ttf-literata-webfonts
-	pkgdesc = Google's default typeface for Play Books. Truetype collection webfonts, open source (OFL) distribution.
+	pkgdesc = Google's default typeface for Play Books. Truetype variable webfonts, open source (OFL) distribution.
+	provides = ttf-literata-webfonts-opticals
+	provides = ttf-literata-webfont-opticals
+	conflicts = ttf-literata-webfonts-opticals
+	conflicts = ttf-literata-webfont-opticals
+	replaces = ttf-literata-webfonts-opticals
+	replaces = ttf-literata-webfont-opticals
 
-pkgname = ttf-literata-webfonts-opticals
-	pkgdesc = Google's default typeface for Play Books. Truetype webfonts opticals, open source (OFL) distribution.
+pkgname = ttf-literata-webfont-opticals
+	pkgdesc = Google's default typeface for Play Books. Truetype webfonts in optical sizes, open source (OFL) distribution.
+	provides = ttf-literata-webfonts-opticals
+	conflicts = ttf-literata-webfonts-opticals
+	replaces = ttf-literata-webfonts-opticals
diff --git a/PKGBUILD b/PKGBUILD
index d03045257ef3..12fbf24e9e83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Pedro A. López-Valencia <https://aur.archlinux.org/user/toropisco>
-pkgname=('ttf-literata' 'ttf-literata-opticals' 'ttf-literata-webfonts' 'ttf-literata-webfonts-opticals')
+pkgname=('ttf-literata' 'ttf-literata-opticals' 'ttf-literata-webfonts' 'ttf-literata-webfont-opticals')
 pkgbase=ttf-literata
 pkgver=3.103
-pkgrel=2
+pkgrel=4
 pkgdesc="Google's contemporary serif typeface family for long-form reading; default typeface for Play Books. Truetype, open source (OFL) distribution."
 arch=('any')
 url="https://github.com/googlefonts/literata"
@@ -15,19 +15,26 @@ b2sums=('d626f872310c6e857d0ba2d8751cbade216d3b232457bb16dc1268ea6529476b78ac71a
 
 package_ttf-literata() {
 pkgname='ttf-literata'
-pkgdesc="Google's default typeface for Play Books. Truetype collections, open source (OFL) distribution."
+pkgdesc="Google's default typeface for Play Books. Truetype variable fonts, open source (OFL) distribution."
   cd "$srcdir"
+conflicts=('ttf-literata-opticals')
+provides=('ttf-literata-opticals')
+replaces=('ttf-literata-opticals')
 
-  install -dm755 "$pkgdir/usr/share/fonts/TTF/literata"
+  install -dm755 "$pkgdir/usr/share/fonts/TTF/literata-variable"
   install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
 
-  install -m644 fonts/variable/Literata*.ttf "$pkgdir/usr/share/fonts/TTF/literata"
+  install -m644 fonts/variable/Literata*.ttf "$pkgdir/usr/share/fonts/TTF/literata-variable"
   install -m644 OFL.txt "$pkgdir/usr/share/licenses/$pkgname"
 }
 
 package_ttf-literata-opticals() {
 pkgname='ttf-literata-opticals'
-pkgdesc="Google's default typeface for Play Books. Truetype opticals, open source (OFL) distribution."
+pkgdesc="Google's default typeface for Play Books. Truetype in optical sizes, open source (OFL) distribution."
+conflicts=('ttf-literata')
+provides=('ttf-literata')
+replaces=('ttf-literata')
+
   cd "$srcdir"
 
   install -dm755 "$pkgdir/usr/share/fonts/TTF/literata-opticals"
@@ -39,27 +46,34 @@ pkgdesc="Google's default typeface for Play Books. Truetype opticals, open sourc
 
 package_ttf-literata-webfonts() {
 pkgname='ttf-literata-webfonts'
-pkgdesc="Google's default typeface for Play Books. Truetype collection webfonts, open source (OFL) distribution."
+pkgdesc="Google's default typeface for Play Books. Truetype variable webfonts, open source (OFL) distribution."
+conflicts=('ttf-literata-webfonts-opticals' 'ttf-literata-webfont-opticals')
+provides=('ttf-literata-webfonts-opticals' 'ttf-literata-webfont-opticals')
+replaces=('ttf-literata-webfonts-opticals' 'ttf-literata-webfont-opticals')
+
   cd "$srcdir"
 
-  install -dm755 "$pkgdir/usr/share/literata-webfonts"
+  install -dm755 "$pkgdir/usr/share/literata-variable-webfonts"
   install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
 
-  install -m644 fonts/webfonts/Literata[opsz,wght].woff2 "$pkgdir/usr/share/literata-webfonts"
-  install -m644 fonts/webfonts/Literata-Italic[opsz,wght].woff2 "$pkgdir/usr/share/literata-webfonts"
+  install -m644 fonts/webfonts/Literata[opsz,wght].woff2 "$pkgdir/usr/share/literata-variable-webfonts"
+  install -m644 fonts/webfonts/Literata-Italic[opsz,wght].woff2 "$pkgdir/usr/share/literata-variable-webfonts"
   install -m644 OFL.txt "$pkgdir/usr/share/licenses/$pkgname"
 }
 
-package_ttf-literata-webfonts-opticals() {
-pkgname='ttf-literata-webfonts-opticals'
-pkgdesc="Google's default typeface for Play Books. Truetype webfonts opticals, open source (OFL) distribution."
+package_ttf-literata-webfont-opticals() {
+pkgname='ttf-literata-webfont-opticals'
+pkgdesc="Google's default typeface for Play Books. Truetype webfonts in optical sizes, open source (OFL) distribution."
+conflicts=('ttf-literata-webfonts-opticals')
+provides=('ttf-literata-webfonts-opticals')
+replaces=('ttf-literata-webfonts-opticals')
+
   cd "$srcdir"
 
-  install -dm755 "$pkgdir/usr/share/literata-webfonts-opticals"
+  install -dm755 "$pkgdir/usr/share/literata-webfont-opticals"
   install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
 
-  install -m644 fonts/webfonts/Literata{,7pt,36pt,72pt}-*.woff2 "$pkgdir/usr/share/literata-webfonts-opticals"
-  #rm "$pkgdir/usr/share/literata-webfonts-opticals/Literata[opsz,wght].woff2"
-  rm "$pkgdir/usr/share/literata-webfonts-opticals/Literata-Italic[opsz,wght].woff2"
+  install -m644 fonts/webfonts/Literata{,7pt,36pt,72pt}-*.woff2 "$pkgdir/usr/share/literata-webfont-opticals"
+  rm "$pkgdir/usr/share/literata-webfont-opticals/Literata-Italic[opsz,wght].woff2"
   install -m644 OFL.txt "$pkgdir/usr/share/licenses/$pkgname"
 }