Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

12 files changed, 52 insertions, 54 deletions

diff --git a/libre/texlive-core-libre/09-texlive-fonts.conf b/libre/texlive-core/09-texlive-fonts.conf
index f870fbd7a..f870fbd7a 100644
--- a/libre/texlive-core-libre/09-texlive-fonts.conf
+++ b/libre/texlive-core/09-texlive-fonts.conf
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core/PKGBUILD
index 419a384e7..9b4556602 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core/PKGBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@parabola.nu>
 
-pkgname=texlive-core-libre
-_pkgname=texlive-core
+_pkgname=texlive-core-libre
+pkgname=texlive-core
 pkgver=2014.34872
 _revnr=${pkgver#2014.}
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)"
 license=('GPL')
 arch=(any)
@@ -23,14 +23,14 @@ optdepends=(
   't1utils:     can be useful when installing Type1 fonts'
 )
 groups=('texlive-most')
-conflicts=('tetex' 'texlive-latex3' 'texlive-core')
-provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
-replaces=('tetex' 'texlive-latex3' 'texlive-core')
+conflicts=('tetex' 'texlive-latex3' 'texlive-core-libre')
+provides=('tetex' 'texlive-latex3')
+replaces=('tetex' 'texlive-latex3' 'texlive-core-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"
         "texmf.cnf"
         "texmfcnf.lua"
         "09-texlive-fonts.conf")
@@ -54,9 +54,9 @@ md5sums=('016626916175b074e98b6f1aa9fa9ff7'
          '393a4bf67adc7ca5df2b386759d1a637')
 
 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
    # MeX licensed packages.
@@ -72,7 +72,7 @@ mksource() {
 }
 
 build() {
-   cd $srcdir/$_pkgname-$pkgver
+   cd $srcdir/$pkgname-$pkgver
    echo -n "   --> extracting all packages... "
    for p in *.tar.xz; do 
      bsdtar -xf $p
@@ -88,11 +88,11 @@ build() {
    sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg 
 
    # remove nonfree packages references from texlive-core.maps
-   sed -i '/ccpl.map/d'       $srcdir/$_pkgname.maps
-   sed -i '/cs-charter.map/d' $srcdir/$_pkgname.maps
-   sed -i '/csfonts.map/d'    $srcdir/$_pkgname.maps
-   sed -i '/plother.map/d'    $srcdir/$_pkgname.maps
-   sed -i '/pltext.map/d'     $srcdir/$_pkgname.maps
+   sed -i '/ccpl.map/d'       $srcdir/$pkgname.maps
+   sed -i '/cs-charter.map/d' $srcdir/$pkgname.maps
+   sed -i '/csfonts.map/d'    $srcdir/$pkgname.maps
+   sed -i '/plother.map/d'    $srcdir/$pkgname.maps
+   sed -i '/pltext.map/d'     $srcdir/$pkgname.maps
 
    # remove nonfree packages references from fmtutil.cnf
    sed -i '/cslatex/d'     texmf-dist/web2c/fmtutil.cnf
@@ -102,12 +102,12 @@ build() {
 }
 
 package() {
-   cd $srcdir/$_pkgname-$pkgver
+   cd $srcdir/$pkgname-$pkgver
    # Install packages.
    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-core-libre/texlive-core.maps b/libre/texlive-core/texlive-core.maps
index 8cb9a9689..8cb9a9689 100644
--- a/libre/texlive-core-libre/texlive-core.maps
+++ b/libre/texlive-core/texlive-core.maps
diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core/texlive.install
index 77d4213be..77d4213be 100644
--- a/libre/texlive-core-libre/texlive.install
+++ b/libre/texlive-core/texlive.install
diff --git a/libre/texlive-core-libre/texmf.cnf b/libre/texlive-core/texmf.cnf
index c96c20e39..c96c20e39 100644
--- a/libre/texlive-core-libre/texmf.cnf
+++ b/libre/texlive-core/texmf.cnf
diff --git a/libre/texlive-core-libre/texmfcnf.lua b/libre/texlive-core/texmfcnf.lua
index 4409692be..4409692be 100644
--- a/libre/texlive-core-libre/texmfcnf.lua
+++ b/libre/texlive-core/texmfcnf.lua
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
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