Unsplit libmagick to follow repository package

References
----------
https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/imagemagick&id=a2a9f312e2505bd9cc7d3865123e988676d7809d

2 files changed, 82 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 309fa06b863e..be4c552afd8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = imagemagick-full-git
 	pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version)
-	pkgver = 7.0.8.15.r15029.g459b67438
+	pkgver = 7.0.8.47.r15663.g0b437bf28
 	pkgrel = 1
 	url = http://www.imagemagick.org/
 	arch = i686
@@ -15,6 +15,54 @@ pkgbase = imagemagick-full-git
 	makedepends = ghostxps
 	makedepends = zstd
 	makedepends = chrpath
+	makedepends = lcms2
+	makedepends = libraqm
+	makedepends = liblqr
+	makedepends = fftw
+	makedepends = libxml2
+	makedepends = fontconfig
+	makedepends = freetype2
+	makedepends = libxext
+	makedepends = libx11
+	makedepends = bzip2
+	makedepends = zlib
+	makedepends = libltdl
+	makedepends = jemalloc
+	makedepends = djvulibre
+	makedepends = libraw
+	makedepends = graphviz
+	makedepends = openexr
+	makedepends = libheif
+	makedepends = openjpeg2
+	makedepends = libjpeg-turbo
+	makedepends = xz
+	makedepends = glib2
+	makedepends = pango
+	makedepends = cairo
+	makedepends = libpng
+	makedepends = ghostscript
+	makedepends = ming
+	makedepends = librsvg
+	makedepends = libtiff
+	makedepends = libwebp
+	makedepends = libwmf
+	makedepends = ocl-icd
+	makedepends = gsfonts
+	makedepends = ttf-dejavu
+	makedepends = perl
+	makedepends = pstoedit-nomagick
+	makedepends = autotrace-nomagick
+	makedepends = flif
+	makedepends = libfpx
+	makedepends = libumem-git
+	source = git+https://github.com/ImageMagick/ImageMagick.git
+	source = imagemagick-full-security-fix.patch
+	source = arch-fonts.diff
+	sha256sums = SKIP
+	sha256sums = e2453381d283c33107194fa791d6b9b2c4c1856afb936d4fa010c05aaebe538e
+	sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
+
+pkgname = imagemagick-full-git
 	depends = lcms2
 	depends = libraqm
 	depends = liblqr
@@ -49,27 +97,22 @@ pkgbase = imagemagick-full-git
 	depends = ocl-icd
 	depends = gsfonts
 	depends = ttf-dejavu
+	depends = perl
 	depends = pstoedit-nomagick
 	depends = autotrace-nomagick
 	depends = flif
 	depends = libfpx
 	depends = libumem-git
-	source = git+https://github.com/ImageMagick/ImageMagick.git
-	source = imagemagick-full-security-fix.patch
-	source = arch-fonts.diff
-	sha256sums = SKIP
-	sha256sums = e2453381d283c33107194fa791d6b9b2c4c1856afb936d4fa010c05aaebe538e
-	sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
-
-pkgname = libmagick-full-git
-	pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version) (library)
-	optdepends = ttf-mac-fonts: for Apple fonts support
+	optdepends = imagemagick-full-doc-git: manual and API docs
+	provides = imagemagick
+	provides = imagemagick-git
 	provides = libmagick
 	provides = libmagick-git
-	provides = libMagickCore-7.Q32HDRI.so
-	provides = libMagickWand-7.Q32HDRI.so
-	provides = libMagick++-7.Q32HDRI.so
+	provides = libmagick-full
+	provides = libmagick-full-git
+	conflicts = imagemagick
 	conflicts = libmagick
+	replaces = libmagick-full-git
 	options = !emptydirs
 	options = libtool
 	backup = etc//colors.xml
@@ -83,19 +126,9 @@ pkgname = libmagick-full-git
 	backup = etc//type-dejavu.xml
 	backup = etc//type-ghostscript.xml
 
-pkgname = imagemagick-full-git
-	depends = libmagick-full-git=7.0.8.15.r15029.g459b67438-1
-	depends = perl
-	optdepends = imagemagick-full-doc-git: manual and API docs
-	provides = imagemagick
-	provides = imagemagick-git
-	conflicts = imagemagick
-	options = !emptydirs
-
 pkgname = imagemagick-full-doc-git
 	pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version) (manual and API docs)
 	arch = any
-	depends = 
 	provides = imagemagick-doc
 	conflicts = imagemagick-doc
 
diff --git a/PKGBUILD b/PKGBUILD
index c998b9bad545..4c1d149ffdb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,26 +13,27 @@
 _qdepth='32'
 
 pkgbase=imagemagick-full-git
-pkgname=('libmagick-full-git' 'imagemagick-full-git' 'imagemagick-full-doc-git')
+pkgname=('imagemagick-full-git' 'imagemagick-full-doc-git')
 _srcname=ImageMagick
-pkgver=7.0.8.15.r15029.g459b67438
+pkgver=7.0.8.47.r15663.g0b437bf28
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all libs and features, git version)"
 url='http://www.imagemagick.org/'
 license=('custom')
-depends=(
+makedepends=(
     # official repositories:
+        'git' 'perl' 'jbigkit' 'opencl-headers' 'glu' 'ghostpcl' 'ghostxps'
+        'zstd' 'chrpath'
         'lcms2' 'libraqm' 'liblqr' 'fftw' 'libxml2' 'fontconfig' 'freetype2' 'libxext'
         'libx11' 'bzip2' 'zlib' 'libltdl' 'jemalloc' 'djvulibre' 'libraw' 'graphviz'
         'openexr' 'libheif' 'openjpeg2' 'libjpeg-turbo' 'xz' 'glib2' 'pango' 'cairo'
         'libpng' 'ghostscript' 'ming' 'librsvg' 'libtiff' 'libwebp' 'libwmf' 'ocl-icd'
-        'gsfonts' 'ttf-dejavu'
+        'gsfonts' 'ttf-dejavu' 'perl'
     # AUR:
         'pstoedit-nomagick' 'autotrace-nomagick' 'flif' 'libfpx' 'libumem-git'
 )
-makedepends=('git' 'perl' 'jbigkit' 'opencl-headers' 'glu' 'ghostpcl' 'ghostxps'
-             'zstd' 'chrpath')
+BUILDENV+=('!check')
 source=('git+https://github.com/ImageMagick/ImageMagick.git'
         'imagemagick-full-security-fix.patch'
         'arch-fonts.diff')
@@ -43,6 +44,8 @@ sha256sums=('SKIP'
 prepare() {
     cd "$_srcname"
     
+    mkdir -p docpkg/usr/share
+    
     # 1) workaround for ghostscript security issues:
     #      https://bugs.archlinux.org/task/59778
     # 2) security fix:
@@ -150,58 +153,37 @@ check() (
    make check
 )
 
-package_libmagick-full-git() {
+package_imagemagick-full-git() {
     local _majorver="${pkgver%%.*}"
     local _etcdir="ImageMagick-${_majorver}"
-    
-    pkgdesc+=' (library)'
+    depends=(
+        # official repositories:
+            'lcms2' 'libraqm' 'liblqr' 'fftw' 'libxml2' 'fontconfig' 'freetype2' 'libxext'
+            'libx11' 'bzip2' 'zlib' 'libltdl' 'jemalloc' 'djvulibre' 'libraw' 'graphviz'
+            'openexr' 'libheif' 'openjpeg2' 'libjpeg-turbo' 'xz' 'glib2' 'pango' 'cairo'
+            'libpng' 'ghostscript' 'ming' 'librsvg' 'libtiff' 'libwebp' 'libwmf' 'ocl-icd'
+            'gsfonts' 'ttf-dejavu' 'perl'
+        # AUR:
+            'pstoedit-nomagick' 'autotrace-nomagick' 'flif' 'libfpx' 'libumem-git'
+    )
     optdepends=(
         # AUR:
-            'ttf-mac-fonts: for Apple fonts support'
+            'imagemagick-full-doc-git: manual and API docs'
     )
     backup=(etc/"$_etcdir"/{colors,delegates,log,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml)
     options=('!emptydirs' 'libtool')
-    provides=('libmagick' 'libmagick-git'
-              "libMagickCore-${pkgver%%.*}.Q${_qdepth}HDRI.so"
-              "libMagickWand-${pkgver%%.*}.Q${_qdepth}HDRI.so"
-                "libMagick++-${pkgver%%.*}.Q${_qdepth}HDRI.so")
-    conflicts=('libmagick')
+    provides=('imagemagick' 'imagemagick-git' 'libmagick' 'libmagick-git' 'libmagick-full' 'libmagick-full-git')
+    conflicts=('imagemagick' 'libmagick')
+    replaces=('libmagick-full-git')
     
     cd "$_srcname"
     make DESTDIR="$pkgdir" install
     
+    find "${pkgdir}/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
     rm "$pkgdir"/usr/lib/*.la
     
-    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 NOTICE  -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    
-    rm -rf binpkg/* docpkg/*
-    mkdir -p binpkg/usr/lib {binpkg,docpkg}/usr/share
-    
-    # split 'imagemagick'
-    mv "${pkgdir}/usr/bin"       binpkg/usr/
-    mv "${pkgdir}/usr/lib/perl5" binpkg/usr/lib/
-    mv "${pkgdir}/usr/share/man" binpkg/usr/share/
-    
     # split docs
     mv "${pkgdir}/usr/share/doc" docpkg/usr/share/
-}
-
-package_imagemagick-full-git() {
-    depends=("libmagick-full-git=${pkgver}-${pkgrel}" 'perl')
-    optdepends=(
-        # AUR:
-            'imagemagick-full-doc-git: manual and API docs'
-    )
-    provides=('imagemagick' 'imagemagick-git')
-    conflicts=('imagemagick')
-    options=('!emptydirs')
-    
-    cd "$_srcname"
-    
-    cp -a binpkg/* "$pkgdir"
-    
-    find "${pkgdir}/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
     
     install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -D -m644 NOTICE  -t "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -210,7 +192,6 @@ package_imagemagick-full-git() {
 package_imagemagick-full-doc-git() {
     pkgdesc+=' (manual and API docs)'
     arch=('any')
-    depends=()
     provides=('imagemagick-doc')
     conflicts=('imagemagick-doc')