From c54c235da9f4322a2ad352fd43c5bc875f1daf2d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 4 Sep 2014 03:37:40 -0300
Subject: xorg-fonts-{{100,75}dpi,type1}: remove libre suffix and add complex
 pkgrel

---
 libre/xorg-fonts-100dpi-libre/PKGBUILD       | 40 ------------------------
 libre/xorg-fonts-100dpi-libre/xfonts.install | 15 ---------
 libre/xorg-fonts-100dpi/PKGBUILD             | 39 +++++++++++++++++++++++
 libre/xorg-fonts-100dpi/xfonts.install       | 15 +++++++++
 libre/xorg-fonts-75dpi-libre/PKGBUILD        | 37 ----------------------
 libre/xorg-fonts-75dpi-libre/xfonts.install  | 15 ---------
 libre/xorg-fonts-75dpi/PKGBUILD              | 36 ++++++++++++++++++++++
 libre/xorg-fonts-75dpi/xfonts.install        | 15 +++++++++
 libre/xorg-fonts-type1-libre/PKGBUILD        | 46 ----------------------------
 libre/xorg-fonts-type1-libre/xfonts.install  | 15 ---------
 libre/xorg-fonts-type1/PKGBUILD              | 45 +++++++++++++++++++++++++++
 libre/xorg-fonts-type1/xfonts.install        | 15 +++++++++
 12 files changed, 165 insertions(+), 168 deletions(-)
 delete mode 100644 libre/xorg-fonts-100dpi-libre/PKGBUILD
 delete mode 100644 libre/xorg-fonts-100dpi-libre/xfonts.install
 create mode 100644 libre/xorg-fonts-100dpi/PKGBUILD
 create mode 100644 libre/xorg-fonts-100dpi/xfonts.install
 delete mode 100644 libre/xorg-fonts-75dpi-libre/PKGBUILD
 delete mode 100644 libre/xorg-fonts-75dpi-libre/xfonts.install
 create mode 100644 libre/xorg-fonts-75dpi/PKGBUILD
 create mode 100644 libre/xorg-fonts-75dpi/xfonts.install
 delete mode 100644 libre/xorg-fonts-type1-libre/PKGBUILD
 delete mode 100644 libre/xorg-fonts-type1-libre/xfonts.install
 create mode 100644 libre/xorg-fonts-type1/PKGBUILD
 create mode 100644 libre/xorg-fonts-type1/xfonts.install

(limited to 'libre')

diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD
deleted file mode 100644
index 066904a5a..000000000
--- a/libre/xorg-fonts-100dpi-libre/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 71678 2010-03-08 11:58:02Z jgc $
-# 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
-pkgver=1.0.3
-pkgrel=2
-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')
-install=xfonts.install
-source=(${url}/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2
-        ${url}/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2)
-
-build() {
-  cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  for dir in font-*-100dpi*; do
-    if [ -d "${dir}" ]; then
-      pushd ${dir}
-      ./configure --prefix=/usr \
-          --with-fontdir=/usr/share/fonts/100dpi
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-  
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1
-      popd
-    fi
-  done
-  rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
-}
-md5sums=('1347c3031b74c9e91dc4dfa53b12f143'
-         '6b223a54b15ecbd5a1bc52312ad790d8')
diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi-libre/xfonts.install
deleted file mode 100644
index 5c5e8a2b4..000000000
--- a/libre/xorg-fonts-100dpi-libre/xfonts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/100dpi
-  mkfontdir /usr/share/fonts/100dpi
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/xorg-fonts-100dpi/PKGBUILD b/libre/xorg-fonts-100dpi/PKGBUILD
new file mode 100644
index 000000000..f4a3d5226
--- /dev/null
+++ b/libre/xorg-fonts-100dpi/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 71678 2010-03-08 11:58:02Z jgc $
+# 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
+pkgver=1.0.3
+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')
+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)
+
+build() {
+  cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  for dir in font-*-100dpi*; do
+    if [ -d "${dir}" ]; then
+      pushd ${dir}
+      ./configure --prefix=/usr \
+          --with-fontdir=/usr/share/fonts/100dpi
+      make || return 1
+      make DESTDIR="${pkgdir}" install || return 1
+  
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1
+      popd
+    fi
+  done
+  rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
+}
+md5sums=('1347c3031b74c9e91dc4dfa53b12f143'
+         '6b223a54b15ecbd5a1bc52312ad790d8')
diff --git a/libre/xorg-fonts-100dpi/xfonts.install b/libre/xorg-fonts-100dpi/xfonts.install
new file mode 100644
index 000000000..5c5e8a2b4
--- /dev/null
+++ b/libre/xorg-fonts-100dpi/xfonts.install
@@ -0,0 +1,15 @@
+post_install() {
+  echo -n "Updating font cache... "
+  fc-cache -f > /dev/null
+  mkfontscale /usr/share/fonts/100dpi
+  mkfontdir /usr/share/fonts/100dpi
+  echo "done."
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD
deleted file mode 100644
index 6921b4ccc..000000000
--- a/libre/xorg-fonts-75dpi-libre/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $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
-pkgver=1.0.3
-pkgrel=2
-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')
-install=xfonts.install
-source=(${url}/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2
-        ${url}/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2)
-
-build() {
-  cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  for dir in *; do
-    if [ -d "${dir}" ]; then
-      pushd "${dir}"
-      ./configure --prefix=/usr \
-          --with-fontdir=/usr/share/fonts/75dpi || return 1
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-75dpi-*}" || return 1
-      popd
-    fi
-  done
-  rm -f "${pkgdir}"/usr/share/fonts/75dpi/fonts.*
-}
-md5sums=('6c9f26c92393c0756f3e8d614713495b'
-         'd7c0588c26fac055c0dd683fdd65ac34')
diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi-libre/xfonts.install
deleted file mode 100644
index e52603946..000000000
--- a/libre/xorg-fonts-75dpi-libre/xfonts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/75dpi
-  mkfontdir /usr/share/fonts/75dpi
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/xorg-fonts-75dpi/PKGBUILD b/libre/xorg-fonts-75dpi/PKGBUILD
new file mode 100644
index 000000000..e02711ab5
--- /dev/null
+++ b/libre/xorg-fonts-75dpi/PKGBUILD
@@ -0,0 +1,36 @@
+# $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
+pkgver=1.0.3
+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')
+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)
+
+build() {
+  cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  for dir in *; do
+    if [ -d "${dir}" ]; then
+      pushd "${dir}"
+      ./configure --prefix=/usr \
+          --with-fontdir=/usr/share/fonts/75dpi || return 1
+      make || return 1
+      make DESTDIR="${pkgdir}" install || return 1
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-75dpi-*}" || return 1
+      popd
+    fi
+  done
+  rm -f "${pkgdir}"/usr/share/fonts/75dpi/fonts.*
+}
+md5sums=('6c9f26c92393c0756f3e8d614713495b'
+         'd7c0588c26fac055c0dd683fdd65ac34')
diff --git a/libre/xorg-fonts-75dpi/xfonts.install b/libre/xorg-fonts-75dpi/xfonts.install
new file mode 100644
index 000000000..e52603946
--- /dev/null
+++ b/libre/xorg-fonts-75dpi/xfonts.install
@@ -0,0 +1,15 @@
+post_install() {
+  echo -n "Updating font cache... "
+  fc-cache -f > /dev/null
+  mkfontscale /usr/share/fonts/75dpi
+  mkfontdir /usr/share/fonts/75dpi
+  echo "done."
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD
deleted file mode 100644
index aaa70454e..000000000
--- a/libre/xorg-fonts-type1-libre/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 216282 2014-07-02 16:41:27Z fyan $
-# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-fonts-type1-libre
-pkgver=7.4
-pkgrel=3
-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')
-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)
-md5sums=('27c55f6a938e7153c59fb551b2f491f9'
-         'df934bfc0339322cee73ee3c5460a648')
-
-build() {
-  cd "${srcdir}"
-  for dir in *; do
-    if [ -d "${dir}" ]; then
-      pushd "${dir}"
-      ./configure --prefix=/usr \
-        --with-fontdir=/usr/share/fonts/Type1
-      make
-      popd
-    fi
-  done
-}
-
-package() {
-  cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  for dir in *; do
-    if [ -d "${dir}" ]; then
-      pushd "${dir}"
-      make DESTDIR="${pkgdir}" install
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}"
-      popd
-    fi
-  done
-  rm -f "${pkgdir}"/usr/share/fonts/Type1/fonts.*
-}
diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1-libre/xfonts.install
deleted file mode 100644
index 51688a1d1..000000000
--- a/libre/xorg-fonts-type1-libre/xfonts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/xorg-fonts-type1/PKGBUILD b/libre/xorg-fonts-type1/PKGBUILD
new file mode 100644
index 000000000..95766fb20
--- /dev/null
+++ b/libre/xorg-fonts-type1/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 216282 2014-07-02 16:41:27Z fyan $
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+
+pkgname=xorg-fonts-type1
+pkgver=7.4
+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)
+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)
+md5sums=('27c55f6a938e7153c59fb551b2f491f9'
+         'df934bfc0339322cee73ee3c5460a648')
+
+build() {
+  cd "${srcdir}"
+  for dir in *; do
+    if [ -d "${dir}" ]; then
+      pushd "${dir}"
+      ./configure --prefix=/usr \
+        --with-fontdir=/usr/share/fonts/Type1
+      make
+      popd
+    fi
+  done
+}
+
+package() {
+  cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  for dir in *; do
+    if [ -d "${dir}" ]; then
+      pushd "${dir}"
+      make DESTDIR="${pkgdir}" install
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}"
+      popd
+    fi
+  done
+  rm -f "${pkgdir}"/usr/share/fonts/Type1/fonts.*
+}
diff --git a/libre/xorg-fonts-type1/xfonts.install b/libre/xorg-fonts-type1/xfonts.install
new file mode 100644
index 000000000..51688a1d1
--- /dev/null
+++ b/libre/xorg-fonts-type1/xfonts.install
@@ -0,0 +1,15 @@
+post_install() {
+  echo -n "Updating font cache... "
+  fc-cache -f > /dev/null
+  mkfontscale /usr/share/fonts/Type1
+  mkfontdir /usr/share/fonts/Type1
+  echo "done."
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
-- 
cgit v1.2.3