gentoo resync : 10.04.2018

2 files changed, 0 insertions, 91 deletions

diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index d3b13b0d6011..a0c190b4875a 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -5,7 +5,6 @@ AUX opendx-4.4.4-gcc43.patch 13310 BLAKE2B 4e4a2240d76e44010b8e736cfb8de99b816d1
 AUX opendx-4.4.4-installpaths.patch 11983 BLAKE2B 052cb3c1bbe3a45852f2cfc0fa8e2d0c0242598c6641ed11062365f1511af9baf8b5ea17da4b2bd741455fd30032e0e8c3c5eefe2c4169ff4c00492fa971d210 SHA512 a06e21431540138a412ad80168d493495cc2808b2d677efc1055b40875610b94e2089dc58f1d1b693eae590e35c95281d17fcaa9af322e3638dccc6d003c5cff
 AUX opendx-4.4.4-invalid-conversion.patch 558 BLAKE2B 073e8119b0ef2f80c5bf593ba465a5b513b5c1808569806fc4f63b3f2d74c8d4621469424d42e59efa3b1d44b7cf215a37bca5dcf2b96795e13e9fcde0b16676 SHA512 f613ede076bb15beca5299fa5e4eb71470be455533922618b40d3580041d3cc3eccf912ac5e885f663770e68e688f71c5f3605856168e2e8d761314fede4000d
 AUX opendx-4.4.4-libtool.patch 319 BLAKE2B 137d0251df4c12a889ae97f628338fa88d4fee01fa4cf4e312be0646ab1da674b1aed5028a551e953fbf08cbb7f3604d5bb3d6d94c836c3f3337d19a67d625a2 SHA512 a98d7a19f1e9c096bc9e7ffdfb9e7a6237bf3599a4f6c29aa3994a0c91653e7369626e86ea69f0d32d6b6dcecb9bc889a888fcddde81d9ca52272be49e957864
-AUX opendx-4.4.4-magick.patch 2863 BLAKE2B 049e0f49054dd55ae599f58c57f90561b802859a0207928d136e413de7a8e76117ae9393a5c57d020422553434f331a306451018240d7964aa13b389759e865f SHA512 e7c35a68768bd58015dbb0d705c4ea82ec09306b5b3e738d45ab4a20fa3ae30b2372c12af55470e59d2b44b3a1bc9bf7bb11289b8c4127b41242772f5ccbcf97
 AUX opendx-4.4.4-null.patch 584 BLAKE2B 6ad58c7c1001069c80a7e9f99059203ce8d0fc87ccf6c25d9812c51aa1eea01a325c8606947c0faaefac7e4022892e444739c47e58efcb52072961c91d65b89c SHA512 9af10aebd267b181be4ade5009987cffaeabc5e1ff68343e63f836722098ffffa813a8b0c6c514b088221dbb5c4a654dd3a756449069fa0ef8edebc8cffb35b5
 AUX opendx-4.4.4-open.patch 1671 BLAKE2B 86578e560c1e7cae30dae208cee14ce64e73362e3c5ab6495be58cf2bc3e4eee6422c0f7d58faa6d3d09ba5503783469f82e6f3a759ed79b268e666938e6c41a SHA512 a35889802f28fc7fa91e887c8c8fc9fc6c7757c877e7469f1b01835de2c8c59c3f29a52e3dc6f30587dfd45f30b0783679273af28820c0120c28733dfed12a38
 AUX opendx-4.4.4-szip.patch 1409 BLAKE2B aee4ce76798a95299d3d41c60f584e011f18e390bc8143968c27ea5bcfbff4ceb3119f46de7b66f96ddb820a88ab15aa4d609b693163aa182bbddbe9d89f7e76 SHA512 50084839a1033e377dda52ec12ce80030555618c9baed7ec36a7eaa5a812e014c22f6a745bb8663fd0763db1a431f0d5c21cca5fcef51dc20c17c2daa0d411a4
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch b/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
deleted file mode 100644
index 5b50470970c3..000000000000
--- a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-newer magick libraries, use pkg-config, add possibility to link with
-graphicsmagick, fix for as-needed
-
---- dx-4.4.4.orig/src/exec/dxmods/_im_image.c
-+++ dx-4.4.4/src/exec/dxmods/_im_image.c
-@@ -329,7 +329,7 @@
-             DestroyImageInfo(new_frame_info);
-             DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--            DestroyConstitute();
-+            ConstituteComponentTerminus();
- #endif
-              DXSetError(ERROR_INTERNAL, "reason = %s, description = %s",
-                         image->exception.reason,
-@@ -346,7 +346,7 @@
-             DestroyImageInfo(new_frame_info);
-             DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--            DestroyConstitute();
-+            ConstituteComponentTerminus();
- #endif
-             DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c");
-         }
-@@ -375,7 +375,7 @@
-         DestroyImageInfo(image_info);
-         DestroyImageInfo(new_frame_info);
- #if MagickLibVersion > 0x0537
--        DestroyConstitute();
-+        ConstituteComponentTerminus();
- #endif
-         
-         DEBUGMESSAGE("back from DestroyImage");
-@@ -491,7 +491,7 @@
-         DestroyImage(image);
-         DestroyImageInfo(image_info);
- #if MagickLibVersion > 0x0537
--        DestroyConstitute();
-+        ConstituteComponentTerminus();
- #endif
-     }
-     return (OK);
---- dx-4.4.4.orig/configure.ac
-+++ dx-4.4.4/configure.ac
-@@ -799,7 +799,29 @@
- LIB_MAGICK=''
- if test "$with_magick" != 'no'
- then
--    AS_MESSAGE([checking for ImageMagick support ......])
-+    found=0
-+    static_lib="libGraphicsMagick.a"
-+    PKG_CHECK_MODULES(GraphicsMagick, GraphicsMagick, [found=1], [found=0])
-+    MAGICK_CFLAGS="$GraphicsMagick_CFLAGS"
-+    MAGICK_LIBS="$GraphicsMagick_LIBS"
-+    if test $found -eq 0
-+    then
-+        static_lib="libMagick.a"
-+        PKG_CHECK_MODULES(ImageMagick, ImageMagick, [found=1], [found=0])
-+        MAGICK_CFLAGS="$ImageMagick_CFLAGS"
-+        MAGICK_LIBS="$ImageMagick_LIBS"
-+    fi
-+    if test $found -eq 1
-+    then
-+	CFLAGS="$CFLAGS $MAGICK_CFLAGS"
-+dnl UNIQUIFY will remove duplicate library tokens leaving the last instance.
-+	AC_UTILS_UNIQUIFY([$LIBS $MAGICK_LIBS], LIBS)
-+	FMT_LIBS="$FMT_LIBS $static_lib"
-+	AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries])
-+        have_magick='yes'
-+dnl legacy checks installations without pkg-config
-+    else
-+    AS_MESSAGE([checking for ImageMagick support (no pkg-config) ......])
-     AC_CHECK_PROG(HAVE_MC, Magick-config, yes, no)
- 
-     failed=0;
-@@ -866,6 +888,7 @@
-   fi
- fi
- fi
-+fi
- 
- AC_LANG([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = true;]])],
---- dx-4.4.4.orig/src/exec/dxmods/Makefile.am
-+++ dx-4.4.4/src/exec/dxmods/Makefile.am
-@@ -113,4 +113,5 @@
- 	$(SOURCES6) \
- 	$(SOURCES7)
- 
-+libDXMODS_la_LIBADD = @MAGICK_LIBS@
- @LOCALMAKE@