gentoo resync : 02.08.2019

5 files changed, 3 insertions, 139 deletions

diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 93d4c5cb7070..3d0426a3e7e8 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,9 +1,3 @@
-DIST LibRaw-0.18.13.tar.gz 1287631 BLAKE2B cb335dd21b897222a80ae7b486d751a080dafe93d9c4ce72ad337bc724707831a70428323027f5f343c4b0ff08820b6f68553436240a85d115eaaa30b6b0c269 SHA512 80e6ca48b00176e7c4dd21d8249c60e71e987c01e719abc3bda8b859645301b9dee4bb365bbcb79cbe0067220d3b966add4757b35d4b6ada0a59bbdb29925254
-DIST LibRaw-0.19.2.tar.gz 553780 BLAKE2B 45cf88208a902fff476a51cc95434d1033caa9162278db64bc610d63bafa5a29f7281ebf353bea7242fc1aef2ce315f45e34e91a4079d4b6da5217e46a04fdaa SHA512 a1472720ca40a86e19fab7579e37246ad7f512249594c2162d7d6bd5a29bb756f1e4d7948fb8f23137661aea8a9423d7b8c7672834102155ead5546155f6be88
 DIST LibRaw-0.19.3.tar.gz 1302745 BLAKE2B 3db3a07c5535a325c69d65ccc75e6a8c7d04e7b1c1d87506fd1c56a0d8f4a7c581467f6350922a4c62d4bc49372f31c86ae2a26a087c4ec11c3ab69763403a0b SHA512 e025695fb7f0016aeec76c0843a94387633457eee838cc48e65d1e84e703c8530b3fdd1e31d85dc322d3f2f6092b7c313fa6d1c3009fe1257c3d9411128b6fe2
-DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
-DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
-EBUILD libraw-0.18.13.ebuild 1840 BLAKE2B 7b86c52d8ae048f2287455ab34ed05a69192ceded8f8a68b97fda2647517afd90983b5b45991809d87cd7d219e11087bc6a506f00749d0a4719d2451ab85b562 SHA512 9681595927e116f9b97815745b097219c3dfac4fa3020ddaf2ff320a9315327d3e02fa2964b468dde2f981035516e2ad49e8e6cdd69221841011f54764dfa90c
-EBUILD libraw-0.19.2.ebuild 1495 BLAKE2B 8d447b1613e72790cf2e3c556741b3eec0f331ebbf140416cad2595125f757d4c5ce32131b54f954e5dfba3758ab5ca4d41719e2be6bf23cc0b64d039edbc858 SHA512 658dbcdecfed69773dea274a272afa0232a080ce4e21921a528efd2de6bb43ff26a1e2b0010acfa113f3c2b631ba1800bb6ef8ed0a6e1bb4c7ee7858cfbaf28e
-EBUILD libraw-0.19.3.ebuild 1490 BLAKE2B 054b70c3f99ef69baad79df141cb6e43136f6c52b5d00ecc5502692fba8f7562683e96e31c7a5b57512de1ae1f879dae6c63cb6370a1cb3fc68652e2b54b7ca6 SHA512 cf8e92dcc205e05ebfd09eacc9d249ef872ecf89fd39a7f1e34df94c3807f8e5aaa02408647db2ddcd343d8d7238abcf7666110e03e4a963b59928654818480d
-MISC metadata.xml 437 BLAKE2B d43c89433ab4eff6a760dce4f7fc83253cb572ab048af7fb1df5bca74db8d7fde84cf147f5941e65407776d281edc4c0297006c75f83c285a5febc37625d6265 SHA512 b06d476afa85710b25dc7d1c1567ba30469ce6d08d278aaa64413611edf95433df315a5a77670d74ca5341be3b96fa0f4451e48f544783f031178b8cf73cd388
+EBUILD libraw-0.19.3.ebuild 1488 BLAKE2B 1b47f7da7acc3011b7557ab3c724d1dd5fd6195557a3d928dad9885252e5761064f2b03cb4ec746537951cf8d007cbf7af11ca9fa69f56129aeeca8fdb4746db SHA512 e2fc80e686eced406f1bfa55836c645510c84a8fdb9a372e431fc6646fd5e76adb2580189ac3b4cae527ab90fddcf6d43a0e598eaf7a5fa33aa11819d4c7647d
+MISC metadata.xml 337 BLAKE2B 895688be926ca12497ac0fa00495cdecb0cbc5547e495bc52b394a3ed8fe6e27dce2e891daa46aa5caff8b710e680d1f54e3035a5cd89af504b2d1005950a434 SHA512 982fc145a755a52aba352b0cac94f6d32caf2b74f86d24da90466955330177f94d2e9135e9bda4a17d9e9a554c7dab9ac6e5b3a8a042434989c5dbf7975c9062
diff --git a/media-libs/libraw/libraw-0.18.13.ebuild b/media-libs/libraw/libraw-0.18.13.ebuild
deleted file mode 100644
index 1510fc0e5b09..000000000000
--- a/media-libs/libraw/libraw-0.18.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-# demosaic package sometimes doesn't get bumped.
-# Otherwise you can set it to ${PV}.
-DEMOSAIC_PV="0.18.8"
-
-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-${DEMOSAIC_PV}.tar.gz
-		https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_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
-}
diff --git a/media-libs/libraw/libraw-0.19.2.ebuild b/media-libs/libraw/libraw-0.19.2.ebuild
deleted file mode 100644
index e173c4608942..000000000000
--- a/media-libs/libraw/libraw-0.19.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0/19" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="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.md )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(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.19.3.ebuild b/media-libs/libraw/libraw-0.19.3.ebuild
index 36fc208c4875..dac5a5a9ced5 100644
--- a/media-libs/libraw/libraw-0.19.3.ebuild
+++ b/media-libs/libraw/libraw-0.19.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/19" # subslot = libraw soname version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libraw/metadata.xml b/media-libs/libraw/metadata.xml
index a09979d7f181..270c52dee7d9 100644
--- a/media-libs/libraw/metadata.xml
+++ b/media-libs/libraw/metadata.xml
@@ -5,9 +5,6 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<use>
-		<flag name="demosaic">Enable support for external interpolation algorithms</flag> 
-	</use>
 	<upstream>
 		<remote-id type="github">LibRaw/LibRaw</remote-id>
 	</upstream>