[gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/, media-libs/lcms/files/

[Andreas Sturmlechner]

commit:     32549db87950e4b96ecb107d9e4389006b94d831
Author:     John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Sun Dec 27 09:28:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 09:46:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32549db8

media-libs/lcms: security cleanup (drop <2.11)

Bug: https://bugs.gentoo.org/761418
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18829
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/lcms/Manifest                     |  2 --
 media-libs/lcms/files/lcms-2.9-BE-test.patch | 54 ----------------------------
 media-libs/lcms/lcms-2.10.ebuild             | 49 -------------------------
 media-libs/lcms/lcms-2.9.ebuild              | 52 ---------------------------
 4 files changed, 157 deletions(-)

diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index f550dd4dfb8..aab4938215f 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,3 +1 @@
-DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824aa1a083f258f72a63553c0576ba8ec29fe8c3bc46cb80047818bb8ac97765ae7de85b689ac2eb950516531c6 SHA512 3c068e7b2aff4a9aee720ced7afc6bc8b6ec6bf1f2bf0697d486cd68648104882f36b94201dccbf8cb448282998d27986b881c6b784fd9fef86ae72325fcf20d
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
-DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b

diff --git a/media-libs/lcms/files/lcms-2.9-BE-test.patch b/media-libs/lcms/files/lcms-2.9-BE-test.patch
deleted file mode 100644
index 577c77cc2b8..00000000000
--- a/media-libs/lcms/files/lcms-2.9-BE-test.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/638192
-
-From 8aca404f486429e2304bd6572c2a6fb89e43cf2d Mon Sep 17 00:00:00 2001
-From: Marti Maria <info@×××××××××.com>
-Date: Mon, 20 Nov 2017 21:59:38 +0100
-Subject: [PATCH] fix for big endian MLU bug
-
-Thanks to Sergei Trofimovic for the fix
----
- AUTHORS        |  1 +
- src/cmsnamed.c | 20 ++++++--------------
- 2 files changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/src/cmsnamed.c b/src/cmsnamed.c
-index 95dc18b..773e4d2 100644
---- a/src/cmsnamed.c
-+++ b/src/cmsnamed.c
-@@ -183,27 +183,19 @@ cmsBool AddMLUBlock(cmsMLU* mlu, cmsUInt32Number size, const wchar_t *Block,
- 
- static
- cmsUInt16Number strTo16(const char str[3])
--{
-+{   
-     const cmsUInt8Number* ptr8 = (const cmsUInt8Number*)str;
--    cmsUInt16Number n = (cmsUInt16Number) (((cmsUInt16Number) ptr8[1] << 8) | ptr8[0]);
-+    cmsUInt16Number n = (cmsUInt16Number)(((cmsUInt16Number)ptr8[0] << 8) | ptr8[1]);
- 
--    return _cmsAdjustEndianess16(n);
-+    return n;
- }
- 
- static
- void strFrom16(char str[3], cmsUInt16Number n)
- {
--    // Assuming this would be aligned
--    union {
--
--       cmsUInt16Number n;
--       cmsUInt8Number str[2];
--       
--    } c;
--
--    c.n = _cmsAdjustEndianess16(n);  
--
--    str[0] = (char) c.str[0]; str[1] = (char) c.str[1]; str[2] = (char) 0;
-+    str[0] = (char)(n >> 8);
-+    str[1] = (char)n;
-+    str[2] = (char)0;
- 
- }
- 
--- 
-2.15.0
-

diff --git a/media-libs/lcms/lcms-2.10.ebuild b/media-libs/lcms/lcms-2.10.ebuild
deleted file mode 100644
index ad5b020df94..00000000000
--- a/media-libs/lcms/lcms-2.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jpeg static-libs test +threads tiff"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lcms2-${PV}"
-
-src_prepare() {
-	default
-	elibtoolize  # for Prefix/Solaris
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with jpeg)
-		$(use_enable static-libs static)
-		$(use_with threads)
-		$(use_with tiff)
-		--without-zlib
-	)
-	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	if use doc; then
-		docinto pdf
-		dodoc doc/*.pdf
-	fi
-}

diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
deleted file mode 100644
index ba47e182ac4..00000000000
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jpeg static-libs test +threads tiff"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lcms2-${PV}"
-
-PATCHES=("${FILESDIR}"/${P}-BE-test.patch)
-
-src_prepare() {
-	default
-	elibtoolize  # for Prefix/Solaris
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_with jpeg)
-		$(use_enable static-libs static)
-		$(use_with threads)
-		$(use_with tiff)
-		--without-zlib
-	)
-	ECONF_SOURCE="${S}" \
-	econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	if use doc; then
-		docinto pdf
-		dodoc doc/*.pdf
-	fi
-}