texlive-latexextra: remove libre suffix and add complex pkgrel

3 files changed, 15 insertions, 16 deletions

diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra/PKGBUILD
index bb9e5422d..19e2f1bb6 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra/PKGBUILD
@@ -4,11 +4,11 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@parabola.nu>
 
-pkgname=texlive-latexextra-libre
-_pkgname=texlive-latexextra
+_pkgname=texlive-latexextra-libre
+pkgname=texlive-latexextra
 pkgver=2014.34865
 _revnr=${pkgver#2014.}
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages"
 license=('GPL')
 arch=(any)
@@ -20,14 +20,13 @@ optdepends=(
   'texlive-pictures: to use the package overpic'
   'java-environment: to use pdfannotextractor'
 )
-provides=('texlive-latexextra')
-replaces=('texlive-latexextra')
-conflicts=('texlive-latexextra')
+replaces=('texlive-latexextra-libre')
+conflicts=('texlive-latexextra-libre')
 groups=('texlive-most')
 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')
 options=(!strip)
 install=texlive.install
@@ -36,9 +35,9 @@ md5sums=('ee9592ae75037c73360ec5bb9df20b65'
          '9e4825f47dac663dd62c4bfa67899e84')
 
 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.
@@ -49,18 +48,18 @@ mksource() {
    popd
 }
 build() {
-   cd $srcdir/$_pkgname-$pkgver
+   cd $srcdir/$pkgname-$pkgver
    for p in *.tar.xz; do
 	   bsdtar -xf $p
    done
    rm -rf {tlpkg,doc,source} || true
 }
 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-latexextra-libre/texlive-latexextra.maps b/libre/texlive-latexextra/texlive-latexextra.maps
index b97f37fdd..b97f37fdd 100644
--- a/libre/texlive-latexextra-libre/texlive-latexextra.maps
+++ b/libre/texlive-latexextra/texlive-latexextra.maps
diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra/texlive.install
index befc29143..befc29143 100644
--- a/libre/texlive-latexextra-libre/texlive.install
+++ b/libre/texlive-latexextra/texlive.install