Merge branch 'master' of vparabola:abslibre

8 files changed, 139 insertions, 24 deletions

diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
index d5a45b5b1..e4f4ef65e 100644
--- a/pcr/debootstrap/PKGBUILD
+++ b/pcr/debootstrap-libre/PKGBUILD
@@ -1,23 +1,29 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-pkgname=debootstrap
-pkgver=1.0.52
+_pkgname=debootstrap
+pkgname=debootstrap-libre
+pkgver=1.0.53
 pkgrel=3
-pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt"
+pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian support removed)"
 arch=('any')
 license=('GPL')
 url="http://packages.debian.org/sid/debootstrap"
 depends=('wget')
-source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver}_all.deb"
-        'metad'
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://ftp.debian.org/debian/pool/main/d/${_pkgname}/${_pkgname}_${pkgver}_all.deb"
+        'gnewsense'
         'trisquel')
 install="debootstrap.install"
-md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a'
-         '4425300ca68d60fb60a6d699e153a519'
+md5sums=('1ea9c87d54b6cf9349d602406bf43e5a'
+         '13978bdd1d877a0dd2c3c874ecd54f03'
          'b020aa8426e70a6024c8e76312c17d78')
 
 package(){
   tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+  # remove Debian scripts
+  rm -v "${pkgdir}/usr/share/debootstrap/scripts"/*
   # move the executables to /usr/bin
   mkdir -p ${pkgdir}/usr/bin
   mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/"
@@ -25,14 +31,13 @@ package(){
   # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) 
   sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap
   # doesn't work with gpg 2.x, patch to point to gpg1v
-  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
+  sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"  
 
   # add gNewSense script
-  install -m644  metad        "$pkgdir/usr/share/debootstrap/scripts"
+  install -m644  gnewsense        "$pkgdir/usr/share/debootstrap/scripts"
 
   # create gNewSense symlinks
-  ln -s metad "$pkgdir/usr/share/debootstrap/scripts/deltah"
-  ln -s metad "$pkgdir/usr/share/debootstrap/scripts/parkes"
+  ln -s gnewsense "$pkgdir/usr/share/debootstrap/scripts/parkes"
 
   # add Trisquel script
   install -m644  trisquel        "$pkgdir/usr/share/debootstrap/scripts"
diff --git a/pcr/debootstrap/debootstrap.install b/pcr/debootstrap-libre/debootstrap.install
index 85a99f160..3da2f1d22 100644
--- a/pcr/debootstrap/debootstrap.install
+++ b/pcr/debootstrap-libre/debootstrap.install
@@ -1,7 +1,7 @@
 post_install() {
   if [ "$(uname -m)" = "x86_64" ]; then
     darch="amd64"
-  elif [ "$(uname -m)" = "i386" ]; then
+  elif [ "$(uname -m)" = "i686" ]; then
     darch="i386"
   else
     darch="mips64el"
diff --git a/pcr/debootstrap/metad b/pcr/debootstrap-libre/gnewsense
index 8d14c0ed9..884ac88a0 100644
--- a/pcr/debootstrap/metad
+++ b/pcr/debootstrap-libre/gnewsense
@@ -1,13 +1,4 @@
-case $SUITE in
-    parkes|metad)
-        default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense/
-    ;;
-    deltah)
-        default_mirror http://archive.gnewsense.org/gnewsense
-    ;;
-esac
-
-
+default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/pcr/debootstrap/trisquel b/pcr/debootstrap-libre/trisquel
index 7efa062f9..7efa062f9 100644
--- a/pcr/debootstrap/trisquel
+++ b/pcr/debootstrap-libre/trisquel
diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD
new file mode 100644
index 000000000..9dc9c4cb2
--- /dev/null
+++ b/pcr/imagemagick-srv/PKGBUILD
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=imagemagick
+pkgname=imagemagick-srv
+pkgver=6.8.6.8
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.imagemagick.org/"
+license=('custom')
+provides=("$pkgbase=$pkgver")
+conflicts=$pkgbase
+replaces=$pkgbase
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript-libre' \
+             'openexr-libre' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
+             'libwebp') # libcl opencl-headers
+#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+        perlmagick.rpath.patch)
+sha1sums=('fe298492c6be08eb887d02b75efeb609fa6c4d61'
+          'e143cf9d530fabf3b58023899b5cc544ba93daec')
+
+prepare() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  sed '/AC_PATH_XTRA/d' -i configure.ac
+  autoreconf --force --install
+  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
+}
+
+build() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
+    --disable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
+    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
+    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
+    --disable-opencl --without-gvc --without-djvu --without-autotrace \
+    --without-jbig --without-fpx --without-dps --without-fftw 
+  make
+}
+
+check() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make check
+}
+
+package_imagemagick-srv() {
+  pkgdesc="An image viewing/manipulation program (for web servers)"
+  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') # 'libcl')
+  optdepends=('ghostscript-libre: for Ghostscript support' 
+              'openexr-libre: for OpenEXR support' 
+              'libwmf: for WMF support' 
+              'librsvg: for SVG support' 
+              'libxml2: for XML support' 
+              'jasper: for JPEG-2000 support' 
+              'libpng: for PNG support' 
+	      'libwebp: for WEBP support')
+  backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
+          "etc/ImageMagick-${pkgver%%.*}/colors.xml"
+          "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
+          "etc/ImageMagick-${pkgver%%.*}/log.xml"
+          "etc/ImageMagick-${pkgver%%.*}/magic.xml"
+          "etc/ImageMagick-${pkgver%%.*}/mime.xml"
+          "etc/ImageMagick-${pkgver%%.*}/policy.xml"
+          "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
+          "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
+  options=('!docs' 'libtool' '!emptydirs')
+
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make -j1 DESTDIR="${pkgdir}" install
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+
+#Cleaning
+  rm -f "${pkgdir}"/usr/lib/*.la
+}
diff --git a/pcr/imagemagick-srv/perlmagick.rpath.patch b/pcr/imagemagick-srv/perlmagick.rpath.patch
new file mode 100644
index 000000000..a5b1a82e2
--- /dev/null
+++ b/pcr/imagemagick-srv/perlmagick.rpath.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
++++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
+@@ -10469,6 +10469,8 @@
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
new file mode 100644
index 000000000..ed6aa3a03
--- /dev/null
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 188870 2013-06-23 17:45:51Z heftig $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+
+pkgname=libquvi-scripts-current
+_pkgname=libquvi-scripts
+provides=(libquvi-scripts)
+pkgver=0.4.17
+pkgrel=1
+pkgdesc='Library for parsing video download links.'
+arch=('any')
+url='http://quvi.sourceforge.net/'
+license=('LGPL')
+depends=('curl' 'lua')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/quvi/${_pkgname}-${pkgver}.tar.xz"{,.sig})
+md5sums=('8a887905a368bf31e0ace28e49b5c800'
+         'SKIP')
+
+build() {
+  cd "${_pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-nsfw --with-nlfy
+  make
+}
+
+package() {
+  cd "${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index ac73b6637..a4c1c4674 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.08.17
+pkgver=2013.08.28.1
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('3fd78626b19ac128f15f1bbfee578011'
+md5sums=('c57a46fe394e5c9cd9484f59f9ae029f'
           'SKIP')
 
 prepare() {