Sun Jan 12 03:35:50 UTC 2014

1 files changed, 47 insertions, 26 deletions

diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index 6bd33d769..af4881e7e 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -25,7 +25,9 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core')
 provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
 replaces=('tetex' 'texlive-latex3' 'texlive-core')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip"
+mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip")
+noextract=("$_pkgname-$pkgver-src.zip")
+source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-src.tar.xz"
         "$_pkgname.maps"
         "texmf.cnf"
         "09-texlive-fonts.conf")
@@ -43,60 +45,79 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
 
-md5sums=('80c7fa3db1b468f9043c6acdd941a526'
+mkmd5sums=('80c7fa3db1b468f9043c6acdd941a526')
+md5sums=('a005881089830e47c8502849055e866e'
          '306ab28bb9b070fc3e40d86d28ea7e8e'
          'd5a3f442ec3b7aa1518170f64f9d006b'
          '393a4bf67adc7ca5df2b386759d1a637')
 
-build() {
-   cd "$srcdir"
+mksource() {
+   mkdir $_pkgname-$pkgver
+   pushd $_pkgname-$pkgver
+   bsdtar xfv ../$_pkgname-$pkgver-src.zip
 
    # remove nonfree packages
    # MeX licensed packages.
-   rm {cc-pl,cs,ec,mex,pl}.tar.xz
+   rm -v {cc-pl,cs,ec,mex,pl}.tar.xz
    # Public domain, will be relicensed.
-   rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
+   rm -v context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz
    # No specific free license.
-   rm euro-ce.tar.xz
-   # Remove them from package list.
+   rm -v euro-ce.tar.xz
+   # Remove their references from package list.
    sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS
 
-   echo -n "   --> extracting all packages... "
-   for p in *.tar.xz; do 
-     bsdtar -xf $p
-   done
-   echo "done"
-   rm -rf {tlpkg,doc,source,omega} || true
+   # remove nonfree packages references from updmap.cfg
+   tar xvpf tetex.tar.xz
+   rm -v tetex.tar.xz
 
-   # remove nonfree packages from updmap.cfg
    sed -i '/ccpl.map/d'       texmf-dist/web2c/updmap.cfg
    sed -i '/cs-charter.map/d' texmf-dist/web2c/updmap.cfg
    sed -i '/csfonts.map/d'    texmf-dist/web2c/updmap.cfg
    sed -i '/plother.map/d'    texmf-dist/web2c/updmap.cfg
-   sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg 
+   sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg
 
-   # remove nonfree packages from texlive-core.maps
-   sed -i '/ccpl.map/d'       texlive-core.maps
-   sed -i '/cs-charter.map/d' texlive-core.maps
-   sed -i '/csfonts.map/d'    texlive-core.maps
-   sed -i '/plother.map/d'    texlive-core.maps
-   sed -i '/pltext.map/d'     texlive-core.maps
+   tar cvJf tetex.tar.xz texmf-dist tlpkg
+   rm -rv texmf-dist tlpkg
+
+   # remove nonfree packages references from fmtutil.cnf
+   tar xvpf kpathsea.tar.xz
+   rm -v kpathsea.tar.xz
 
-   # remove nonfree packages from fmtutil.cnf
    sed -i '/cslatex/d'     texmf-dist/web2c/fmtutil.cnf
    sed -i '/csplain/d'     texmf-dist/web2c/fmtutil.cnf
    sed -i '/from mex/d'    texmf-dist/web2c/fmtutil.cnf
    sed -i '/mexconf.tex/d' texmf-dist/web2c/fmtutil.cnf
+
+   tar cvJf kpathsea.tar.xz texmf-dist tlpkg
+   rm -rv texmf-dist tlpkg
+
+   popd
 }
 
-package() {
-   cd "$srcdir"
+build() {
+   cd $srcdir/$_pkgname-$pkgver
+   echo -n "   --> extracting all packages... "
+   for p in *.tar.xz; do 
+     bsdtar -xf $p
+   done
+   echo "done"
+   rm -rf {tlpkg,doc,source,omega} || true
 
+   # remove nonfree packages 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
+}
+
+package() {
+   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 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+   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