[arch-commits] Commit in imagemagick/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Monday, April 22, 2019 @ 16:50:29
  Author: arojas
Revision: 351924

Unsplit libmagick

Modified:
  imagemagick/trunk/PKGBUILD

----------+
 PKGBUILD |   43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-22 16:19:39 UTC (rev 351923)
+++ PKGBUILD	2019-04-22 16:50:29 UTC (rev 351924)
@@ -1,14 +1,14 @@
-# Maintainer: Eric Bélanger <eric at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
 
 pkgbase=imagemagick
-pkgname=(libmagick imagemagick imagemagick-doc)
+pkgname=(imagemagick imagemagick-doc)
 pkgver=7.0.8.41
-pkgrel=1
+pkgrel=2
 pkgdesc="An image viewing/manipulation program"
 url="https://www.imagemagick.org/"
 arch=(x86_64)
 license=(custom)
-depends=(libltdl lcms2 fontconfig libxext liblqr libraqm libpng libxml2)
 makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw opencl-headers libwebp
              chrpath ocl-icd glu ghostpcl ghostxps libheif jbigkit)
 checkdepends=(gsfonts ttf-dejavu)
@@ -25,7 +25,7 @@
 shopt -s extglob
 
 prepare() {
-  mkdir -p binpkg/usr/lib/pkgconfig {binpkg,docpkg}/usr/share
+  mkdir -p docpkg/usr/share
 
   cd $_tarname
 
@@ -77,8 +77,8 @@
   make check
 )
 
-package_libmagick() {
-  pkgdesc+=" (library)"
+package_imagemagick() {
+  depends=(libltdl lcms2 fontconfig libxext liblqr libraqm libpng libxml2)
   optdepends=('ghostscript: PS/PDF support'
               'libheif: HEIF support'
               'libraw: DNG support'
@@ -89,44 +89,29 @@
               'ocl-icd: OpenCL support'
               'openexr: OpenEXR support'
               'openjpeg2: JPEG2000 support'
-              'pango: Text rendering')
+              'pango: Text rendering'
+              'imagemagick-doc: manual and API docs')
+  options=(!emptydirs libtool)
   backup=(etc/$_relname/{colors,delegates,log,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml)
-  options=('!emptydirs' libtool)
+  conflicts=(imagemagick6)
+  provides=(libmagick)
+  replaces=(imagemagick6 libmagick)
 
   cd $_tarname
   make DESTDIR="$pkgdir" install
 
+  find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
   rm "$pkgdir"/etc/$_relname/type-{apple,urw-base35,windows}.xml
   rm "$pkgdir"/usr/lib/*.la
 
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE
 
-# Split 'imagemagick'
-  cd ../binpkg
-  mv "$pkgdir/usr/bin" usr/
-  mv "$pkgdir/usr/lib/perl5" usr/lib/
-  mv "$pkgdir/usr/share/man" usr/share/
-
 # Split docs
   mv "$pkgdir/usr/share/doc" "$srcdir/docpkg/usr/share/"
 }
 
-package_imagemagick() {
-  depends=("libmagick=$pkgver-$pkgrel")
-  optdepends=('imagemagick-doc: manual and API docs')
-  options=('!emptydirs')
-
-  mv binpkg/* "$pkgdir"
-
-  find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
-
-  cd $_tarname
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE
-}
-
 package_imagemagick-doc() {
   pkgdesc+=" (manual and API docs)"
-  depends=()
 
   mv docpkg/* "$pkgdir"