Wed Jun 27 03:40:51 UTC 2012

2 files changed, 20 insertions, 25 deletions

diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 5565b19b5..cabf58619 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Maintainer: Rémy Oudompheng <remy.archlinux.org>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-fontsextra-libre
 _pkgname=texlive-fontsextra
-pkgver=2011.24706
-_revnr=${pkgver#2011.}
+pkgver=2012.26866
+_revnr=${pkgver#2012.}
 pkgrel=1
 pkgdesc="TeX Live - all sorts of extra fonts"
 license=('GPL')
@@ -15,31 +16,20 @@ replaces=('texlive-fontsextra')
 conflicts=('texlive-fontsextra')
 provides=('texlive-fontsextra')
 url='http://tug.org/texlive/'
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
-        "${_pkgname}.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('d4bd3dbc8c422d049b082d0e8c70d088'
-         '6e84e4a8ee6a25adec39cd6310d9bef2')
-
-mksource() {
-    [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip
-    mkdir ${pkgname}-${pkgver}
-    pushd ${pkgname}-${pkgver}
-    bsdtar xf ../${_pkgname}-$pkgver-src.zip
-    # remove nonfree packages
-    # No specific free license.
-    rm ogham.tar.xz
-    # Remove them from package list.
-    sed -ri '/^ogham /d' CONTENTS
-    popd
-    tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}
-    rm -rf ${pkgname}-${pkgver}
-}
+md5sums=('f75e552c4573ce73d3eee03fffee723f'
+         '4a2f2b3b4527655fb47ab0d59b01bfea')
 
 build() {
-   cd "$srcdir/${pkgname}-${pkgver}"
+   cd "$srcdir"
+   # remove nonfree packages
+   # No specific free license.
+   rm ogham.tar.xz
+   # Remove them from package list.
+   sed -ri '/^ogham /d' CONTENTS
    for p in *.tar.xz; do
 	   bsdtar -xf $p
    done
@@ -47,11 +37,11 @@ build() {
 }
 
 package() {
-   cd "$srcdir/${pkgname}-${pkgver}"
+   cd "$srcdir"
    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 $_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-libre/texlive-fontsextra.maps
index 4ef977ffa..fbced973a 100644
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -5,6 +5,7 @@ Map ArtNouv.map
 Map ArtNouvc.map
 Map BulletsADF.map
 Map Carrickc.map
+Map CountriesOfEurope.map
 Map ESSTIX.map
 Map Eichenla.map
 Map Eileen.map
@@ -31,6 +32,7 @@ Map ap.map
 Map archaicprw.map
 Map arev.map
 Map ascii.map
+Map aspectratio.map
 Map augie.map
 Map auncial.map
 Map aurical.map
@@ -77,7 +79,9 @@ Map linearA.map
 Map mathabx.map
 Map mdbch.map
 Map mdput.map
+Map mdsymbol.map
 Map mdugm.map
+Map ntx.map
 Map ocrb.map
 Map opensans.map
 Map paratype-type1.map
@@ -87,6 +91,7 @@ Map prodint.map
 Map pxtx.map
 Map recycle.map
 Map rsfso.map
+Map sansmathaccent.map
 Map sqrcaps.map
 Map starfont.map
 Map tfrupee.map