3 files changed, 52 insertions, 38 deletions
diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD
index 36eeb00ef..ba11a2083 100644
--- a/libre/openexr-libre/PKGBUILD
+++ b/libre/openexr-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196943 2013-10-21 10:31:44Z tpowa $
+# $Id: PKGBUILD 198354 2013-10-30 14:21:29Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
@@ -16,22 +16,15 @@ makedepends=('libcups' 'libxinerama')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-options=('!libtool')
-source=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
-        "http://repo.parabolagnulinux.org/other/${pkgname}/MultiViewOpenEXR.odt"
-        "http://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt"
-        "http://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt"
-        "http://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt")
+mksource=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
+          "https://repo.parabolagnulinux.org/other/${pkgname}/MultiViewOpenEXR.odt"
+          "https://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt"
+          "https://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt"
+          "https://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt")
+source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz")
 noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt)
 
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  [ "$CARCH" = "mips64el" ] && sed -i 's/ doc //' Makefile.in  # no libreoffice yet
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
+mksource() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
   # remove documentation with embedded nonfree fonts
@@ -40,24 +33,30 @@ package() {
   # add source documentation with free fonts
   install -m644 -v "${srcdir}/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt doc
 
+  # convert documentation from odt to pdf format and clean source code
   if [ "$CARCH" != "mips64el" ]; then
-    # convert documentation to pdf format
     cd doc
-
-    for x in ${noextract[@]}; do
-      libreoffice --headless --invisible --convert-to pdf ${x}
-    done
-
-    cd ..
+    libreoffice --headless --invisible --convert-to pdf {MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt
+    rm -rv "${srcdir}/"{Configurations2,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails}
   fi
+}
 
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 
   install -m644 "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}"
 }
-md5sums=('4387e6050d2faa65dd5215618ff2ddce'
-         '69f117d3c91827e5de47f1e00137a4cc'
-         '4d5ffa31f9af63bd5c621c6cbac6c673'
-         'de099240193d8a51086dfae914fff3cf'
-         'ece8bf90d438b89c6bd9fe4a89cc318a')
+mkmd5sums=('4387e6050d2faa65dd5215618ff2ddce'
+           '69f117d3c91827e5de47f1e00137a4cc'
+           '4d5ffa31f9af63bd5c621c6cbac6c673'
+           'de099240193d8a51086dfae914fff3cf'
+           'ece8bf90d438b89c6bd9fe4a89cc318a')
+md5sums=('13e8ec945aa651a7a7f6aad133941866')
diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD
index 70cb073a9..dbbca2238 100644
--- a/libre/povray-libre/PKGBUILD
+++ b/libre/povray-libre/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: neri
 
 # Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
-# Don't build povray before 3.7 version (it's nonfree software)
+# Don't build povray before 3.7 version (that ones are nonfree software)
 
 _pkgname=povray
 pkgname=$_pkgname-libre
@@ -24,11 +24,20 @@ conflicts=("$_pkgname")
 replaces=("$_pkgname")
 backup=("etc/povray/$pkgver/povray.conf"
         "etc/povray/$pkgver/povray.ini")
-source=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip"
+mksource=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip")
+source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-stable.tar.xz"
         'povray3.7.0_rc3-user-conf.patch')
-sha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb'
+mksha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb')
+sha256sums=('ba2a867b8593689067143b23ebdccb8f8f46487244802d24d873517287b924f1'
             '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0')
 
+mksource() {
+  cd "$_pkgname-$pkgver-stable"
+
+  # remove nonfree documentation
+  rm -rv doc
+}
+
 prepare() {
   cd "$_pkgname-$pkgver-stable"
 
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index a9f697ae0..ad75af70a 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -18,20 +18,26 @@ provides=('psutils-lprng' 'psutils')
 replaces=('psutils-lprng' 'psutils')
 conflicts=('psutils-lprng' 'psutils')
 options=('!makeflags')
-source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
-        'psutils-1.17.diff'
-        'libre.patch')
-md5sums=('b161522f3bd1507655326afa7db4a0ad'
-         '2b49e9e796000b42f42804d4b50a2be1'
-         'a4beaf371607085e89ef190c1db7aee3')
+mksource=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
+          'libre.patch')
+source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz"
+        'psutils-1.17.diff')
+mkmd5sums=('b161522f3bd1507655326afa7db4a0ad'
+           'a4beaf371607085e89ef190c1db7aee3')
+md5sums=('75c88dc9e33877368d471dfa8652d96d'
+         '2b49e9e796000b42f42804d4b50a2be1')
 
-build() {
+mksource() {
   cd "${srcdir}/${_pkgname}"
-  patch -Np1 -i "${srcdir}/psutils-1.17.diff"
   # apply patch to remove nonfree files support from Makefile
   patch -Np1 -i "${srcdir}/libre.patch"
   # remove nonfree files
   rm -v {fixmacps.{man,pl},md{68_0,71_0}.ps} 
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}"
+  patch -Np1 -i "${srcdir}/psutils-1.17.diff"
   make -f Makefile.unix BINDIR=/usr/bin \
     INCLUDEDIR=/usr/include/psutils PERL=/usr/bin/perl \
     MANDIR=/usr/share/man/man1 \