[gentoo-commits] repo/gentoo:master commit in: media-gfx/uniconvertor/, media-gfx/uniconvertor/files/, profiles/

[Michał Górny]

commit:     5a97c4b6915076cb4e214460db9cbab0d9656c92
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 11:34:09 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 11:39:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a97c4b6

media-gfx/uniconvertor: Remove last-rited pkg

Closes: https://bugs.gentoo.org/715682
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/uniconvertor/Manifest                    |  1 -
 .../uniconvertor-2.0_pre379-ImageMagick7.patch     | 72 ---------------------
 .../files/uniconvertor-2.0_pre379-abs.patch        | 10 ---
 .../files/uniconvertor-2.0_pre379-import.patch     | 30 ---------
 .../files/uniconvertor-2.0_pre379-libimg.patch     | 30 ---------
 .../files/uniconvertor-2.0_pre379-test.patch       | 37 -----------
 media-gfx/uniconvertor/metadata.xml                |  5 --
 .../uniconvertor/uniconvertor-2.0_pre379-r2.ebuild | 73 ----------------------
 profiles/package.mask                              |  6 --
 9 files changed, 264 deletions(-)

diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest
deleted file mode 100644
index 07266bb69cf..00000000000
--- a/media-gfx/uniconvertor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea

diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch
deleted file mode 100644
index c79b7923158..00000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-ImageMagick7.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- 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
deleted file mode 100644
index c344f8b1c54..00000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/uniconvertor-2.0_pre379-import.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch
deleted file mode 100644
index fae5535c649..00000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-import.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- src/uc2/formats/sk1/model.py          | 2 +-
- src/unittests/image_tests/__init__.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/uc2/formats/sk1/model.py b/src/uc2/formats/sk1/model.py
-index 33e2b55..59aecf2 100644
---- a/src/uc2/formats/sk1/model.py
-+++ b/src/uc2/formats/sk1/model.py
-@@ -16,7 +16,7 @@
- #	along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- from copy import deepcopy
--import Image
-+from PIL import Image
- 
- from uc2 import _, uc2const
- from uc2.formats.pdxf import const
-diff --git a/src/unittests/image_tests/__init__.py b/src/unittests/image_tests/__init__.py
-index 031cd9f..6165129 100644
---- a/src/unittests/image_tests/__init__.py
-+++ b/src/unittests/image_tests/__init__.py
-@@ -16,7 +16,7 @@
- #	along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- import unittest, os, shutil
--import Image
-+from PIL import Image
- 
- 
- _pkgdir = __path__[0]

diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch
deleted file mode 100644
index f84b332ec63..00000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-libimg.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- setup.py | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 46cda83..5cfd22a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -184,14 +184,14 @@ modules.append(cairo_module)
- #		libraries=['potrace'])
- #modules.append(trace_module)
- 
--#libimg_src = os.path.join(src_path, 'uc2', 'libimg')
--#files = make_source_list(libimg_src, ['_libimg.c', ])
--#include_dirs = make_source_list(include_path, ['ImageMagick', ])
--#libimg_module = Extension('uc2.libimg._libimg',
--#		define_macros=[('MAJOR_VERSION', '1'), ('MINOR_VERSION', '0')],
--#		sources=files, include_dirs=include_dirs,
--#		libraries=['MagickWand'])
--#modules.append(libimg_module)
-+libimg_src = os.path.join(src_path, 'uc2', 'libimg')
-+files = make_source_list(libimg_src, ['_libimg.c', ])
-+include_dirs = make_source_list(include_path, ['ImageMagick-6', ])
-+libimg_module = Extension('uc2.libimg._libimg',
-+		define_macros=[('MAJOR_VERSION', '1'), ('MINOR_VERSION', '0')],
-+		sources=files, include_dirs=include_dirs,
-+		libraries=['MagickWand'])
-+modules.append(libimg_module)
- 
- if os.path.isfile(os.path.join(include_path, 'lcms2.h')):
-  	pycms_src = os.path.join(src_path, 'uc2', 'cms')

diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch
deleted file mode 100644
index 2a3e3a00601..00000000000
--- a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
- src/unittests/_libimg_tests/__init__.py | 2 +-
- src/unittests/image_tests/__init__.py   | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/unittests/_libimg_tests/__init__.py b/src/unittests/_libimg_tests/__init__.py
-index 3891290..cdc7dd6 100644
---- a/src/unittests/_libimg_tests/__init__.py
-+++ b/src/unittests/_libimg_tests/__init__.py
-@@ -84,7 +84,7 @@ class TestCoreLibImgFunctions(unittest.TestCase):
- 	def test07_image_type(self):
- 		names = []
- 		names.append(['type_bilevel.png', 'BilevelType'])
--		names.append(['type_grayscale.png', 'GrayscaleType'])
-+		names.append(['type_grayscale.png', 'BilevelType'])
- 		names.append(['type_palette.png', 'PaletteType'])
- 		names.append(['type_palettematte.png', 'PaletteMatteType'])
- 		names.append(['type_truecolor.png', 'TrueColorType'])
-diff --git a/src/unittests/image_tests/__init__.py b/src/unittests/image_tests/__init__.py
-index 031cd9f..265743a 100644
---- a/src/unittests/image_tests/__init__.py
-+++ b/src/unittests/image_tests/__init__.py
-@@ -42,6 +42,7 @@ class TestImageFunctions(unittest.TestCase):
- 	def tearDown(self):pass
- #		shutil.rmtree(self.save_dir)
- 
-+	@unittest.skip("Broken")
- 	def test01_create_new_image(self):
- 		for mode in MODES:
- 			image = Image.new(mode, (100, 100))
-@@ -77,6 +78,7 @@ class TestImageFunctions(unittest.TestCase):
- 				result = False
- 			self.assertNotEquals(False, result)
- 
-+	@unittest.skip("Broken")
- 	def test04_load_unsupported_images(self):
- 		for name in FILES2:
- 			filename = os.path.join(self.load_dir, name)

diff --git a/media-gfx/uniconvertor/metadata.xml b/media-gfx/uniconvertor/metadata.xml
deleted file mode 100644
index 1b2becffa26..00000000000
--- a/media-gfx/uniconvertor/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
deleted file mode 100644
index d3c2dfdf93f..00000000000
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 xdg-utils
-
-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=""
-
-RDEPEND="
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	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}-libimg.patch
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-abs.patch
-	)
-
-python_prepare_all() {
-	local wand
-	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")
-
-	distutils-r1_python_prepare_all
-
-	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
-
-	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
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index f9e25a7f4eb..3fef9eb212e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -853,12 +853,6 @@ dev-python/algopy
 # Bug #730640
 net-misc/termpkg
 
-# Michał Górny <mgorny@g.o> (2020-07-04)
-# Unmaintained.  Python 2 only.  Effectively depends on vulnerable
-# version of dev-python/pillow.  No revdeps.  Multiple bugs open.
-# Removal in 30 days.  Bug #715682.
-media-gfx/uniconvertor
-
 # Stephan Hartmann <stha09@××××××××××.com> (2020-06-29)
 # Dev channel releases are only for people who
 # are developers or want more experimental features