texlive-fontsextra: remove libre suffix and add complex pkgrel

3 files changed, 15 insertions, 16 deletions

diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra/PKGBUILD
index c678527ed..9947d4baa 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra/PKGBUILD
@@ -2,23 +2,22 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@parabola.nu>
 
-pkgname=texlive-fontsextra-libre
-_pkgname=texlive-fontsextra
+_pkgname=texlive-fontsextra-libre
+pkgname=texlive-fontsextra
 pkgver=2014.34817
 _revnr=${pkgver#2014.}
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages"
 license=('GPL')
 arch=(any)
 depends=('texlive-core')
 groups=('texlive-most')
-replaces=('texlive-fontsextra')
-conflicts=('texlive-fontsextra')
-provides=('texlive-fontsextra')
+replaces=('texlive-fontsextra-libre')
+conflicts=('texlive-fontsextra-libre')
 url='http://tug.org/texlive/'
-mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip")
-noextract=("$_pkgname-$pkgver-src.zip")
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps")
+mksource=("ftp://ftp.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
+noextract=("$pkgname-$pkgver-src.zip")
+source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz" "$pkgname.maps")
 options=('!emptydirs')
 install=texlive.install
 mkmd5sums=('2094b82201b22a816f3b6fe09f373818')
@@ -26,9 +25,9 @@ md5sums=('235925b615932426986d3c88bebe8a21'
          '77a2d0f39da91c06a2e9ab6a230fe390')
 
 mksource() {
-   mkdir $_pkgname-$pkgver
-   pushd $_pkgname-$pkgver
-   bsdtar xfv ../$_pkgname-$pkgver-src.zip
+   mkdir $pkgname-$pkgver
+   pushd $pkgname-$pkgver
+   bsdtar xfv ../$pkgname-$pkgver-src.zip
 
    # remove nonfree packages
    # No specific free license.
@@ -40,7 +39,7 @@ mksource() {
 }
 
 build() {
-   cd $srcdir/$_pkgname-$pkgver
+   cd $srcdir/$pkgname-$pkgver
    for p in *.tar.xz; do
 	   bsdtar -xf $p
    done
@@ -48,11 +47,11 @@ build() {
 }
 
 package() {
-   cd $srcdir/$_pkgname-$pkgver
+   cd $srcdir/$pkgname-$pkgver
    install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
    sed -i '/^#/d' CONTENTS
-   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $srcdir/$_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs
+   install -m644 $srcdir/$pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
    install -m755 -d $pkgdir/usr/share
    wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
    for dir in $wanteddirs; do
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra/texlive-fontsextra.maps
index e307c1303..e307c1303 100644
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra/texlive-fontsextra.maps
diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra/texlive.install
index bfd2222a0..bfd2222a0 100644
--- a/libre/texlive-fontsextra-libre/texlive.install
+++ b/libre/texlive-fontsextra/texlive.install