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

[Andreas Sturmlechner]

commit:     11672b476e8d21c6485b89119a9179d899ccbaab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 18:50:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 02:30:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11672b47

media-libs/libraw: Security cleanup

Bug: https://bugs.gentoo.org/654376
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/libraw/Manifest                         |  4 --
 .../libraw/files/libraw-0.18.4-glibc-2.27.patch    | 14 -----
 media-libs/libraw/libraw-0.18.4.ebuild             | 67 ----------------------
 media-libs/libraw/libraw-0.18.8.ebuild             | 63 --------------------
 4 files changed, 148 deletions(-)

diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 100f9a05b70..10ce62fd346 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,10 +1,6 @@
 DIST LibRaw-0.18.11.tar.gz 1283643 BLAKE2B cd217a0c40d0f30ff95968c5238ad349d32f6ae44aca3847b32c236e8e82e7ff25ba5d6bb0cffe8d73b288239830982d074a306b682160bfe8c73b0df9fcff09 SHA512 4d114bdb589c96d95f646b1d016cfb9546ea7a53b9f23af1dc5d0e38cb4d1b2aa7270f2d4dbe7c6c323fb7f21403914a0bb75afa7b6204d0a99c72ecf0c812c9
 DIST LibRaw-0.18.12.tar.gz 1283491 BLAKE2B a0e23bf58ecf331ef52e529be5dd27acf8458d1a6de700b36df6172b7cfde2da62561e29c197bc360237b12c7a427b1d07a0c64862fe1cead461a6989e488218 SHA512 8fcf1e24295457f09a654a14d77869ca401a21e9f4386d91fb0fd5bc9aa20a882bf490a64c183108e645b5fa70401f97868c83837a057cb707f58fa31a417d44
 DIST LibRaw-0.18.13.tar.gz 1287631 BLAKE2B cb335dd21b897222a80ae7b486d751a080dafe93d9c4ce72ad337bc724707831a70428323027f5f343c4b0ff08820b6f68553436240a85d115eaaa30b6b0c269 SHA512 80e6ca48b00176e7c4dd21d8249c60e71e987c01e719abc3bda8b859645301b9dee4bb365bbcb79cbe0067220d3b966add4757b35d4b6ada0a59bbdb29925254
-DIST LibRaw-0.18.4.tar.gz 1281104 BLAKE2B dc6c2b594f0897eea509d3122bd7f41bccd89182a5e294b331544ad626631f18637660e1de7ea1c8b5e1c0b59678189d06f9fd12e27016e2ea3ec736cabfbbe4 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776
-DIST LibRaw-0.18.8.tar.gz 1281773 BLAKE2B 755d17ee4c08e26b04d20cc6284f43e1a87d2bc1b41499d175c6ebfc39684732a4407b990115818553c7b815c66bb04ad451d478ed2c084c443871de8ea221e4 SHA512 48871a5e43c89a17962fae426a962d11a6ce40cb8e7d8abc90e98c899dc42b7e1711398c075901ddbc710fe7e916ba6d507bee7e18975779caa8f5d512b1d580
 DIST LibRaw-0.19.0.tar.gz 1300662 BLAKE2B f182f1fd7d02eaa34f8b8e2336cbc59cd8c3345cddeace2ed305d048d160bf8d6ecdf04129829b3202a16e70d987a5b2a83c036ec95d1b7b6c748dbb5b46271b SHA512 33d0e9a031add901bdd10ffcde6a0f7837a4f4bec0bbbd21ad661e518dadcb1699133f17b3b2f6cd6cefe87ef3017cb7e1b816c4ce3dfebaaf5d9b2ff6b65238
-DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e7730f750c65f4a58ca385227a7c9d5c8ab2926ef2fb74a798bd09b78e6f9c1c5cdd39de712ec05a49412087f3b889f3ff76dbb0fbe8 SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d
 DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
-DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
 DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500

diff --git a/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch b/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch
deleted file mode 100644
index 3e33cc62acc..00000000000
--- a/media-libs/libraw/files/libraw-0.18.4-glibc-2.27.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build failure on glibc-2.27 caused by pow64 symbol collision.
-
-https://github.com/LibRaw/LibRaw/pull/115
-https://bugs.gentoo.org/647556
-diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp
-index 18bcdbc..8cec744 100644
---- a/internal/dcraw_common.cpp
-+++ b/internal/dcraw_common.cpp
-@@ -5770,4 +5770,5 @@ static float powf_lim(float a, float b, float limup)
-   return (b>limup || b < -limup)?0.f:powf(a,b);
- }
-+#define powf64 powf_lim64 /* workaround symbol collision */
- static float powf64(float a, float b)
- {

diff --git a/media-libs/libraw/libraw-0.18.4.ebuild b/media-libs/libraw/libraw-0.18.4.ebuild
deleted file mode 100644
index 3d180fb60a2..00000000000
--- a/media-libs/libraw/libraw-0.18.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV=${PV/_b/-B}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
-	)"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( Changelog.txt README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.4-glibc-2.27.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable demosaic demosaic-pack-gpl2)
-		$(use_enable demosaic demosaic-pack-gpl3)
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/media-libs/libraw/libraw-0.18.8.ebuild b/media-libs/libraw/libraw-0.18.8.ebuild
deleted file mode 100644
index 1c3d0a2783d..00000000000
--- a/media-libs/libraw/libraw-0.18.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
-	)"
-
-LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
-SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog.txt README )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable demosaic demosaic-pack-gpl2)
-		$(use_enable demosaic demosaic-pack-gpl3)
-		$(use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
-		$(use_enable lcms)
-		$(use_enable openmp)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}