libre/texlive-bin: rebuilt

1 files changed, 16 insertions, 37 deletions

diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index 8ba9cfc0c..3e98e159e 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id$
 # Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>
 # Contributor (Arch): francois <francois.archlinux.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
@@ -5,24 +6,18 @@
 # Contributor: Isaac David <isacdaavid(at)isacdaavid!info>
 # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-pkgname=texlive-bin
+# parabola changes and rationale:
+#  - rebranded to parabola
+
+pkgname=('texlive-bin')
 pkgver=2017.44590
-pkgrel=9.parabola4.2
+pkgrel=10.parabola1
 license=('GPL')
-arch=('i686' 'x86_64' 'armv7h')
-makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd'
+arch=('x86_64' 'i686' 'armv7h')
+makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
          'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
-         'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
+         'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
          'perl' 'clisp' 'ffcall')
-# if we know in advance that binaries will be linked against
-# foo.so.$VERSION (as opposed to some foo.so.$VERSION.$MINOR) we can
-# avoid recompiling every time $MINOR is increased, by using a range:
-makedepends+=('icu>=60' 'icu<61')
-# TODO: on the other hand, I don't know enough about the mapping from
-# poppler versions to sonames to predict a safe range. e.g. poppler
-# 0.61.1 provides libpoppler.so.72
-makedepends+=('poppler=0.61.1')
-
 url='http://tug.org/texlive/'
 source=("http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
         "luatex-gcc7.patch"
@@ -51,12 +46,6 @@ prepare() {
 build() {
    cd "$srcdir"
 
-   if [ "${CARCH}" = "armv7h" ]; then
-     local config_xindy="--disable-xindy"
-   else
-     local config_xindy="--enable-xindy"
-   fi
-
    #############################################################
    ### configure
    cd source
@@ -71,7 +60,7 @@ build() {
      --datadir=/usr/share \
      --mandir=/usr/share/man \
      --disable-native-texlive-build \
-     --with-banner-add="/Parabola" \
+     --with-banner-add="/Parabola GNU/Linux-libre" \
      --disable-multiplatform \
      --disable-dialog \
      --disable-psutils \
@@ -105,7 +94,7 @@ build() {
      --disable-aleph \
      --enable-luatex \
      --with-clisp-runtime=default \
-     --disable-xindy-rules --disable-xindy-docs "$config_xindy"
+     --enable-xindy --disable-xindy-rules --disable-xindy-docs
    #############################################################
    ### make
    echo "-------------------------------------------------------"
@@ -114,19 +103,13 @@ build() {
    make
 }
 
-package() {
+package_texlive-bin() {
    pkgdesc="TeX Live binaries (Parabola rebranded)"
-   depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd'
+   depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
             'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
-            'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
+            'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
             'libsynctex')
-   depends+=('poppler=0.61.1')
-   makedepends+=('icu>=60' 'icu<61')
-   provides=('lcdf-typetools' 'kpathsea')
-   provides_i686=('xindy')
-   provides_x86_64=("${provides_i686[@]}")
-   conflicts=('texlive-bin-libre' 'texlive-bin-parabola')
-   replaces=('texlive-bin-libre' 'texlive-bin-parabola')
+   provides=('lcdf-typetools' 'kpathsea' 'xindy')
    optdepends=('ed: for texconfig'
                'biber: for bibliography processing')
    options=('!strip')
@@ -328,11 +311,6 @@ vpl2vpl
 xhlatex
 xindy
 "
-
-   if [ "$CARCH" = "armv7h" ]; then
-     _core_scripts="$(echo "$_core_scripts" | sed '/xindy$/d')"
-   fi
-
    _games_scripts="rubikrotation"
    _humanities_scripts="diadia"
    _langcyrillic_scripts="rubibtex rumakeindex"
@@ -398,3 +376,4 @@ pn2pdf"
    rm -f "$pkgdir"/usr/lib/pkgconfig/synctex.pc
    rm -f "$pkgdir"/usr/share/man/man*/synctex.*
 }
+