From 10887479ce80d79be626ebbbd9886e0479a3aeb3 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 12 Jan 2014 22:50:23 -0200
Subject: texlive-core-libre: move removing nonfree references in the maps and
 files to prepare function, keep removing nonfree files on mksource only

---
 libre/texlive-core-libre/PKGBUILD | 42 ++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

(limited to 'libre/texlive-core-libre')

diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index af4881e7e..246af9a3e 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -46,7 +46,7 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/xdvi/XDvi)
 
 mkmd5sums=('80c7fa3db1b468f9043c6acdd941a526')
-md5sums=('a005881089830e47c8502849055e866e'
+md5sums=('ce7c019db21ce546d6d7f1df4bc247fe'
          '306ab28bb9b070fc3e40d86d28ea7e8e'
          'd5a3f442ec3b7aa1518170f64f9d006b'
          '393a4bf67adc7ca5df2b386759d1a637')
@@ -66,31 +66,6 @@ mksource() {
    # 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
 
-   # remove nonfree packages references from updmap.cfg
-   tar xvpf tetex.tar.xz
-   rm -v tetex.tar.xz
-
-   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
-
-   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
-
-   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
 }
 
@@ -103,12 +78,25 @@ build() {
    echo "done"
    rm -rf {tlpkg,doc,source,omega} || true
 
-   # remove nonfree packages from texlive-core.maps
+   # remove nonfree packages references 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 
+
+   # 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
+
+   # remove nonfree packages references 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
 }
 
 package() {
-- 
cgit v1.2.3-54-g00ecf