xorg-fonts-{{100,75}dpi,type1}: remove libre suffix and add complex pkgrel

6 files changed, 12 insertions, 15 deletions

diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi/PKGBUILD
index 066904a5a..f4a3d5226 100644
--- a/libre/xorg-fonts-100dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-100dpi/PKGBUILD
@@ -2,18 +2,17 @@
 # Maintainer (Arch): Alexander Baldeck <alexander@archlinux.org>
 # Contributor (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
-pkgname=xorg-fonts-100dpi-libre
+pkgname=xorg-fonts-100dpi
 pkgver=1.0.3
-pkgrel=2
+pkgrel=2.parabola1
 pkgdesc="X.org 100dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
 groups=('xorg')
-provides=("xorg-fonts-100dpi=$pkgver")
-conflicts=('xorg-fonts-100dpi')
-replaces=('xorg-fonts-100dpi')
+conflicts=('xorg-fonts-100dpi-libre')
+replaces=('xorg-fonts-100dpi-libre')
 install=xfonts.install
 source=(${url}/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2
         ${url}/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2)
diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi/xfonts.install
index 5c5e8a2b4..5c5e8a2b4 100644
--- a/libre/xorg-fonts-100dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-100dpi/xfonts.install
diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi/PKGBUILD
index 6921b4ccc..e02711ab5 100644
--- a/libre/xorg-fonts-75dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-75dpi/PKGBUILD
@@ -1,18 +1,17 @@
 # $Id: PKGBUILD 71681 2010-03-08 12:06:26Z jgc $
 # Maintainer (Arch): Alexander Baldeck <alexander@archlinux.org>
 # Contributor (Arch): Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-fonts-75dpi-libre
+pkgname=xorg-fonts-75dpi
 pkgver=1.0.3
-pkgrel=2
+pkgrel=2.parabola1
 pkgdesc="X.org 75dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
 groups=('xorg')
-provides=("xorg-fonts-75dpi=$pkgver")
-conflicts=('xorg-fonts-75dpi')
-replaces=('xorg-fonts-75dpi')
+conflicts=('xorg-fonts-75dpi-libre')
+replaces=('xorg-fonts-75dpi-libre')
 install=xfonts.install
 source=(${url}/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2
         ${url}/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2)
diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi/xfonts.install
index e52603946..e52603946 100644
--- a/libre/xorg-fonts-75dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-75dpi/xfonts.install
diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1/PKGBUILD
index aaa70454e..95766fb20 100644
--- a/libre/xorg-fonts-type1-libre/PKGBUILD
+++ b/libre/xorg-fonts-type1/PKGBUILD
@@ -1,17 +1,16 @@
 # $Id: PKGBUILD 216282 2014-07-02 16:41:27Z fyan $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 
-pkgname=xorg-fonts-type1-libre
+pkgname=xorg-fonts-type1
 pkgver=7.4
-pkgrel=3
+pkgrel=3.parabola1
 pkgdesc="X.org Type1 fonts, without nonfree fonts"
 arch=(any)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-provides=("xorg-fonts-type1=${pkgver}")
-conflicts=('xorg-fonts-type1')
-replaces=('xorg-fonts-type1')
+conflicts=('xorg-fonts-type1-libre')
+replaces=('xorg-fonts-type1-libre')
 install=xfonts.install
 source=(${url}/releases/individual/font/font-bitstream-type1-1.0.2.tar.bz2
         ${url}/releases/individual/font/font-xfree86-type1-1.0.3.tar.bz2)
diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1/xfonts.install
index 51688a1d1..51688a1d1 100644
--- a/libre/xorg-fonts-type1-libre/xfonts.install
+++ b/libre/xorg-fonts-type1/xfonts.install