Bump uniconvertor to match latest upstream.

diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest
index 2ded4a9d49fe2a9d0c38d2c2e40720812e0d2fe0..1f89b438a6a149b5d49886c3714f251a5a857fb0 100644 (file)
--- a/media-gfx/uniconvertor/Manifest
+++ b/media-gfx/uniconvertor/Manifest
@@ -1,5 +1,8 @@
+AUX uniconvertor-2.0_pre379-ImageMagick7.patch 2158 SHA256 5c022bdd3492a219cce4881bdde806c4938bab56e2083b29e81a0b1053728a4a SHA512 dcc828944a6458fd479906952afc81830777eb38dc58cd461ab8da560c24ec73016be0d318e2b416b29ca2cb04d2cb61dbb16fec41360a86d4a32224e1645029 WHIRLPOOL 073ab92c79c3142cc6b64bec4f883f370c31aeb67f092df3320535ef36230472335edd1fed5e3009e2df18b8eabc6b820eba07c421bb77989709debb71c2fa17
+AUX uniconvertor-2.0_pre379-abs.patch 215 SHA256 44237a7510b8c433061163d4da7d00fdf2be0f428ea1220f690b5380788f8ee4 SHA512 4b845caa96367a6da29342dac5d9cc54eb5e43ec8d2205712b9b61275db07db5c72018ab26c4c2770e6537eafb6c35b2b634442dc70f550805c406bdb9f93c37 WHIRLPOOL e502f3e0f16d2bcde296f624e0d1feefe695c07065259a35dfe72309f76318c9e802c7d687e7a7211476076b4af98b9759ee7c676863b97e5df3c69bf95ea740
 AUX uniconvertor-2.0_pre379-import.patch 935 SHA256 418f162528d4d53d4393b2b0b0d38447f4d6e36163ffffe74ad23e0e57fd8cf3 SHA512 a51a182f5fb7694a935553b85174e4f32136046eb45cb7246fc4beb071bf9b953124ffd8d6eeb6d33bda5d53b8733236dca8d5f4a2dd3bad28ec1664976337fc WHIRLPOOL a497723f6e7735fd6dd6db001161002d39feb20c89bffe93787f984c629e450a49b53518184eaa6e2d611b74bbf28c5fb1cc154dd71993410551b39302fb1da7
 AUX uniconvertor-2.0_pre379-libimg.patch 1201 SHA256 efcbb1ab90e25ad4f7aa1d9770fcc1f6a18f99d87dc0c833019bc2db77725213 SHA512 ff373151caf0c10e9a833ab68cf153d024706293c8000af248cb11a12582216c20f79e0998bdaabce0cc47d3248f786aa55ce9ba8814b1f4bb33e07670dd3136 WHIRLPOOL 7222f8b43acd7c190a972ce2d54f744f53f556d9a66ba66e58e37d3e5661b1df306861edfdf79f81ddb78fe6fa0fc88dd093af7f3490dad85ea2689d5ea3c5f2
 AUX uniconvertor-2.0_pre379-test.patch 1544 SHA256 b750ea1f5e368d3c45c4333b5f06068214c6f5025b9d860a832785e9169d3108 SHA512 760ea5ced19040d0d29230f9d6fdafafd7f6fcdd727e18261730b7696d0e9a85037cdceab8e20f202a79bd7b8c84edfa7f21619bfde1320bbdc1e1d0c6d298db WHIRLPOOL 5764cb5cb1492a7f36f065e250755b19129a9b328b4275c8e82a71c9c41fcc0ebdf4f9c851149f196feedc667f1e24ceefd3f5eef73f333e9bb3846b226b7cb2
 DIST uniconvertor-2.0_pre379.tar.xz 1844780 SHA256 96ab27fd19743bcb12385ffd15a586033e8a4a3aa1958eecf1c5cdee67a73fa5 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea WHIRLPOOL 53c78ec1fdc64445467ea9a9ab04923a9447b428c37f1d43789e03ece61361a00db7686e0ce566805313c7298334c35a1d4fa0939d81d9962f072d5daece36df
 EBUILD uniconvertor-2.0_pre379-r1.ebuild 1747 SHA256 c7daf2cf07c32146eb14393994f4a0033c26d932bc850e1d0d36b26d72acbb5a SHA512 782a5e4bd4d7916154920d02c3f0ea3b553d34039d8b9b0f85d1f237dacef02f63ab886c481b55bfe7e0b439ffb2c77f9ad45f6c59d24572bd13a3743399e2a7 WHIRLPOOL 56bff90e9bb566880e28f290bb8e1d661d7fda8b75239f1bf0ad2981cf95cbeb343c027d02716e8e4a04cdd31128b30eb7aa11d4e48abb3e91925bd3f16a468f
+EBUILD uniconvertor-2.0_pre379-r2.ebuild 2087 SHA256 d989901e4f0394adabcf7fcf08c629a758a3de8978ac3c4e403a0e5ac0b06385 SHA512 1071e57d2452ebf41d7c478703d4cec5998de6a4adea44fa0d401d659939d7ca5f29e1f2839e318dd4730308e01988fe28dbce002f923c3a41f4ea9f72ba9246 WHIRLPOOL e172ac02378334d5741c8a3591529afb0fb0278214298fadb7cd2e22ffb8f628b397859bd7ae8f41c6523a9edd1567314c713d0443f31823bd7b16b1e602966b

diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch
new file mode 100644 (file)
index 0000000..c79b792
--- /dev/null
+++ b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch
@@ -0,0 +1,72 @@
+--- a/src/uc2/libimg/_libimg.c 2013-02-25 11:20:00.000000000 +0100
++++ b/src/uc2/libimg/_libimg.c 2016-07-11 09:41:03.721305655 +0200
+@@ -16,8 +16,8 @@
+  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <MagickWand/MagickWand.h>
+ #include <Python.h>
+-#include <wand/MagickWand.h>
+ 
+ static PyObject *
+ im_InitMagick(PyObject *self, PyObject *args) {
+@@ -184,33 +184,18 @@
+       else if (img_type == GrayscaleType){
+               return Py_BuildValue("s", "GrayscaleType");
+       }
+-      else if (img_type == GrayscaleMatteType){
+-              return Py_BuildValue("s", "GrayscaleMatteType");
+-      }
+       else if (img_type == PaletteType){
+               return Py_BuildValue("s", "PaletteType");
+       }
+-      else if (img_type == PaletteMatteType){
+-              return Py_BuildValue("s", "PaletteMatteType");
+-      }
+       else if (img_type == TrueColorType){
+               return Py_BuildValue("s", "TrueColorType");
+       }
+-      else if (img_type == TrueColorMatteType){
+-              return Py_BuildValue("s", "TrueColorMatteType");
+-      }
+       else if (img_type == ColorSeparationType){
+               return Py_BuildValue("s", "ColorSeparationType");
+       }
+-      else if (img_type == ColorSeparationMatteType){
+-              return Py_BuildValue("s", "ColorSeparationMatteType");
+-      }
+       else if (img_type == OptimizeType){
+               return Py_BuildValue("s", "OptimizeType");
+       }
+-      else if (img_type == PaletteBilevelMatteType){
+-              return Py_BuildValue("s", "PaletteBilevelMatteType");
+-      }
+       else {
+               return Py_BuildValue("s", "UndefinedType");
+       }
+@@ -235,9 +220,7 @@
+ //HSBColorspace,
+ //HSLColorspace,
+ //HWBColorspace,
+-//Rec601LumaColorspace,
+ //Rec601YCbCrColorspace,
+-//Rec709LumaColorspace,
+ //Rec709YCbCrColorspace,
+ //LogColorspace,
+ //CMYColorspace
+@@ -305,15 +288,9 @@
+       else if (cs == HWBColorspace){
+               return Py_BuildValue("s", "HWBColorspace");
+       }
+-      else if (cs == Rec601LumaColorspace){
+-              return Py_BuildValue("s", "Rec601LumaColorspace");
+-      }
+       else if (cs == Rec601YCbCrColorspace){
+               return Py_BuildValue("s", "Rec601YCbCrColorspace");
+       }
+-      else if (cs == Rec709LumaColorspace){
+-              return Py_BuildValue("s", "Rec709LumaColorspace");
+-      }
+       else if (cs == Rec709YCbCrColorspace){
+               return Py_BuildValue("s", "Rec709YCbCrColorspace");
+       }

diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch
new file mode 100644 (file)
index 0000000..c344f8b
--- /dev/null
+++ b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch
@@ -0,0 +1,10 @@
+--- a/src/uc2/formats/sk1/sk1objs/curvelow.c
++++ b/src/uc2/formats/sk1/sk1objs/curvelow.c
+@@ -24,6 +24,7 @@
+ 
+ 
+ #include "math.h"
++#include <stdlib.h> /* abs() */
+ // #include "X11/Xlib.h"
+ #include "curvelow.h"
+ 

diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
new file mode 100644 (file)
index 0000000..e022e56
--- /dev/null
+++ b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright © 2017 Nick Bowler
+# License GPLv2+: GNU General Public License version 2 or later.
+# There is NO WARRANTY, to the extent permitted by law.
+#
+# This file is a modified version of the original ebuild from Gentoo,
+# covered by the following copyright and permission notice:
+#
+#   Copyright 1999-2017 Gentoo Foundation
+#   Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Convert vector graphic file formats like .cdr, .svg, wmf and more."
+HOMEPAGE="https://sk1project.net/modules.php?name=Products&product=uniconvertor"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+IUSE="imagemagick"
+
+RDEPEND="
+       dev-python/pycairo[${PYTHON_USEDEP}]
+       imagemagick? ( media-gfx/imagemagick:= )
+       media-libs/lcms:2
+       dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       app-text/ghostscript-gpl"
+
+PATCHES=(
+       "${FILESDIR}"/${P}-import.patch
+       "${FILESDIR}"/${P}-test.patch
+       "${FILESDIR}"/${P}-abs.patch
+       )
+
+python_prepare_all() {
+       local wand
+
+       if use imagemagick; then
+               PATCHES+=("$FILESDIR/$P-libimg.patch")
+               wand=$(pkg-config --libs MagickWand | sed -e "s:^ *::g" -e "s: *$::g" -e "s:-l:\':g" -e "s: :',:g" -e "s:$:':g" -e "s:,'$::g")
+       fi
+
+       distutils-r1_python_prepare_all
+
+       if use imagemagick; then
+               sed \
+                       -e "s@/usr/include@${EPREFIX}/usr/include@" \
+                       -e "s@/usr/share@${EPREFIX}/usr/share@" \
+                       -e "/libraries/s:'MagickWand':${wand}:g" \
+                       -i setup.py || die
+
+               # https://bugs.gentoo.org/581816
+               if has_version ">=media-gfx/imagemagick-7.0" ; then
+                       sed  -e "s:ImageMagick-6:ImageMagick-7:" -i setup.py || die
+                       eapply "${FILESDIR}"/${P}-ImageMagick7.patch
+               fi
+       fi
+
+       ln -sf \
+               "${EPREFIX}"/usr/share/imagemagick/sRGB.icm \
+               src/unittests/cms_tests/cms_data/sRGB.icm || die
+}
+
+python_test() {
+       einfo ${PYTHONPATH}
+       #distutils_install_for_testing
+       cd src/unittests || die
+       ${EPYTHON} all_tests.py || die
+}

diff --git a/metadata/.gitignore b/metadata/.gitignore
new file mode 100644 (file)
index 0000000..f87bf8b
--- /dev/null
+++ b/metadata/.gitignore
@@ -0,0 +1 @@
+/md5-cache