Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/antiword/PKGBUILD
	community/apcupsd/PKGBUILD
	community/busybox/PKGBUILD
	community/chrpath/PKGBUILD
	community/driftnet/PKGBUILD
	community/emesene/PKGBUILD
	community/fdm/PKGBUILD
	community/fftw2/PKGBUILD
	community/gsynaptics/PKGBUILD
	community/gtk-rezlooks-engine/PKGBUILD
	community/httptunnel/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/libopenraw/PKGBUILD
	community/mashup/PKGBUILD
	community/pcb/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/preload/PKGBUILD
	community/rlog/PKGBUILD
	community/scponly/PKGBUILD
	community/splint/PKGBUILD
	community/wmname/PKGBUILD
	community/xosd/PKGBUILD
	community/xxkb/PKGBUILD
	community/znc/PKGBUILD
	core/glibc/PKGBUILD
	core/libtool/PKGBUILD
	extra/at/PKGBUILD
	extra/autogen/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/cdrdao/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/cmt/PKGBUILD
	extra/compface/PKGBUILD
	extra/dasher/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/dmapi/PKGBUILD
	extra/docker/PKGBUILD
	extra/dvd+rw-tools/PKGBUILD
	extra/dvdrtools/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gecko-sharp-2.0/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/gnome-vfsmm/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphite/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3/PKGBUILD
	extra/java-access-bridge/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/koffice/PKGBUILD
	extra/ladspa/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libdc1394/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libglademm/PKGBUILD
	extra/libgnomecanvasmm/PKGBUILD
	extra/libsigsegv/PKGBUILD
	extra/libstdc++5/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/lua/PKGBUILD
	extra/mcpp/PKGBUILD
	extra/metalog/PKGBUILD
	extra/mp3wrap/PKGBUILD
	extra/mt-st/PKGBUILD
	extra/naim/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/oxine/PKGBUILD
	extra/php/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pstoedit/PKGBUILD
	extra/qt/PKGBUILD
	extra/speex/PKGBUILD
	extra/sweep/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib-extras/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/ypbind-mt/PKGBUILD
	gnome-unstable/caribou/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/cogl/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/empathy/empathy.install
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/folks/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/gdm/fix_external_program_directories.patch
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-contacts/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-menus/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-shell/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gnome-utils/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gtkmm3/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/libwnck3/PKGBUILD
	gnome-unstable/mash/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/mx/PKGBUILD
	gnome-unstable/pulseaudio/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/pygobject2/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/sushi/PKGBUILD
	gnome-unstable/totem/PKGBUILD
	gnome-unstable/upower/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-gtk/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-mpg123/PKGBUILD
	multilib/lib32-nspr/PKGBUILD
	multilib/lib32-nss/PKGBUILD
	multilib/lib32-nss/add_spi+cacert_ca_certs.patch
	multilib/lib32-openssl/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	testing/util-linux/PKGBUILD

2 files changed, 91 insertions, 0 deletions

diff --git a/testing/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD
new file mode 100644
index 000000000..fa7a555ef
--- /dev/null
+++ b/testing/imagemagick/PKGBUILD
@@ -0,0 +1,81 @@
+# $Id: PKGBUILD 137864 2011-09-12 05:31:18Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgbase=imagemagick
+pkgname=('imagemagick' 'imagemagick-doc')
+pkgver=6.7.2.5
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.imagemagick.org/"
+license=('custom')
+depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo')
+makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
+source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+        perlmagick.rpath.patch)
+md5sums=('ce0294e6bc7ca3ece03a432518143a29'
+         'ff9974decbfe9846f8e347239d87e4eb')
+sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560'
+          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
+
+build() {
+  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+
+  sed '/AC_PATH_XTRA/d' -i configure.ac
+  autoreconf
+  patch -Np0 -i ../perlmagick.rpath.patch
+
+  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \
+    ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
+    --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
+    --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
+    --with-perl --with-perl-options="INSTALLDIRS=vendor" \
+    --without-gvc --without-djvu --without-autotrace --without-webp \
+    --without-jbig --without-fpx --without-dps --without-fftw --without-lqr
+  make
+}
+
+package_imagemagick() {
+  pkgdesc="An image viewing/manipulation program"
+  optdepends=('ghostscript: for Ghostscript support' 
+              'openexr: for OpenEXR support' 
+              'libwmf: for WMF support' 
+              'librsvg: for SVG support' 
+              'libxml2: for XML support' 
+              'jasper: for JPEG-2000 support' 
+              'libpng: for PNG support')
+  backup=('etc/ImageMagick/coder.xml'
+          'etc/ImageMagick/colors.xml'
+          'etc/ImageMagick/delegates.xml'
+          'etc/ImageMagick/log.xml'
+          'etc/ImageMagick/magic.xml'
+          'etc/ImageMagick/mime.xml'
+          'etc/ImageMagick/policy.xml'
+          'etc/ImageMagick/sRGB.icm'
+          'etc/ImageMagick/thresholds.xml'
+          'etc/ImageMagick/type.xml'
+          'etc/ImageMagick/type-dejavu.xml'
+          'etc/ImageMagick/type-ghostscript.xml'
+          'etc/ImageMagick/type-windows.xml')
+  options=('!makeflags' '!docs' 'libtool')
+
+  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make DESTDIR="${pkgdir}" install
+  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" 
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+
+#Cleaning
+  find "${pkgdir}" -name '*.bs' -delete
+  rm -f "${pkgdir}"/usr/lib/*.la
+}
+
+package_imagemagick-doc() {
+  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
+  depends=()
+  options=('!makeflags')
+
+  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make DESTDIR="${pkgdir}" install-data-html
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
+}
diff --git a/testing/imagemagick/perlmagick.rpath.patch b/testing/imagemagick/perlmagick.rpath.patch
new file mode 100644
index 000000000..958c0f2ee
--- /dev/null
+++ b/testing/imagemagick/perlmagick.rpath.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
++++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
+@@ -10067,6 +10067,7 @@
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(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@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install