gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 87 deletions

diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index c843a90d723c..956ed4f7b141 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -3,8 +3,6 @@ AUX simage-1.7.1-disable-examples.patch 1803 BLAKE2B 93c4ef68fa3e2e1db406c7fd3fe
 AUX simage-1.7.1-disable-gif-quantize-buffer.patch 1054 BLAKE2B 15c0cf6c1ca78798e3c93034e7e4d17e1bf5ba5f9921f307e52b87f9d3e02babfac83e40eed401f98db8a225f404fa248957f41b03e360541e46bc62c893d099 SHA512 4a25f0f54a609c613e4f7baaf87a694e246b0c283cf85195e6d272826deb95dda9106125925188e785a2c64c2ed9633465ceb76b2b816e463cfa063ec16dffdc
 AUX simage-1.7.1-tests-conditional.patch 1757 BLAKE2B 59bb06980457f85c68670d02efdb3ddf149576d9f8728a33e7a0e97e736454b3858ba3eb123e6239f89006c836cb640b49238ffa733fe97ea65a5ca871712005 SHA512 3063e47ac6a7e90ce27f93d8046d897d203756b52008ed867061260378858b2b0c6b0cf6cb87a846f2f98cf2e595f2e4b4a468a32e34e9676d16848c387cd46e
 AUX simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch 790 BLAKE2B 117b907b783404e4e8d03d09ca66496e0fede9bac5ea056ca4489140e9b0532ba585ebb4e75aec47a85e16b88a027fc7ec95297df4fed44a880ad4f0855b17a8 SHA512 692d3741b059148ce1190425319862fdc4299d7efc3a392aee91b60b5575f4702c5f72a066a70984afb14d68fd561f03c76f3ff76894aae36036579272f0f9e8
-DIST simage-1.7.1-src.zip 4145907 BLAKE2B 99f5f5f46530c2600d47ab0bb080d69281447ee96a2bb9b63ebe5a5c56e235f34ca8bd97b0d6adedf061fe221a61d144d4ccce00123941a9c74d72b1f190030d SHA512 b3c81fa363cd570b3512cd2984f154b83876353ec389dc35afcac4e4ddf8d301eef5b0f8df93c38b9caa6afd81fbe53d3943ad05e041b77734f03c26d2e12867
 DIST simage-1.8.0.tar.gz 791151 BLAKE2B 0a5720c06501c8212b5a148ad790ff60d6d9fc507868a66d40dbe3b6b089e47dca21828fee96ef708a03651d02843c9e6b6db7856088ddf7e487b4b5eeafbccd SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c
-EBUILD simage-1.7.1-r1.ebuild 2171 BLAKE2B b9601d5a9e1435935b0f275440443de886b81bc3ffa4fbfc6569827a8f78ada80d7bb051a064fcc370c58d07c3a96a2847c5ca3f0c552043e13a64cba762288e SHA512 c6929402f3fb600842bce7fbca0541a518c3708b500c18999736437611e5c49e16bf17dc4a06ba1eb2d051b84ba5639cabcbd28b0e5dbf4132c5c9ad825a1542
-EBUILD simage-1.8.0.ebuild 2232 BLAKE2B 85cb03874a1dcfb784aedf6726873ae5a99842c1c19f3b194ab0418878b4a5271e3e0656ea34791306a5699beeea18fe62a517b4613fb880a6e871cecd06e1b6 SHA512 800797bec59dabdb1f84a7f9b88f90026d4048d51b8edd7db54c15a315e48afd8dd9c6a893397cefebc8cf3ee980a3c873195144f3270ba8b0b74d641c6b38fb
+EBUILD simage-1.8.0.ebuild 2228 BLAKE2B e6c6e060d3f0856f857c9a0742ab68ecfb8d78d8da2151386cf76798d9ec36587acf9f13b399f1715b95582f6570108032caf9c1029c7d652a463ef521cc791a SHA512 cea88cc357960cd26ce2d44ff46ad2b5116b04122f132bc671d61ff7847b6ead3065b8cbba06896b4e4fdb3c87dd30b12d9d6494c6af654e6f2015eef3affa66
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild
deleted file mode 100644
index d71968b640f5..000000000000
--- a/media-libs/simage/simage-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Image and video texturing library"
-HOMEPAGE="https://bitbucket.org/Coin3D/simage"
-SRC_URI="https://bitbucket.org/Coin3D/simage/downloads/${P}-src.zip"
-
-LICENSE="public-domain mpeg2enc"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
-SLOT="0"
-IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/unzip
-"
-RDEPEND="
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg:0= )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0= )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( media-libs/libsndfile )
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake-automagic-deps.patch"
-	# examples need to link against libsndfile unconditionally so either we could
-	# make the dep unconditional or not build the examples. i chose the latter way.
-	# btw, examples are not installed anyway, they are just compiled.
-	"${FILESDIR}/${P}-disable-examples.patch"
-	"${FILESDIR}/${P}-tests-conditional.patch"
-	"${FILESDIR}/${P}-disable-gif-quantize-buffer.patch"
-)
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-src_configure() {
-	use debug && append-cppflags -DSIMAGE_DEBUG=1
-
-	local mycmakeargs=(
-		-DSIMAGE_AVIENC_SUPPORT=OFF # Windows only
-		-DSIMAGE_BUILD_SHARED_LIBS=ON
-		-DSIMAGE_CGIMAGE_SUPPORT=OFF # OS X only
-		-DSIMAGE_EPS_SUPPORT=ON
-		-DSIMAGE_GDIPLUS_SUPPORT=OFF # Windows only
-		-DSIMAGE_GIF_SUPPORT=$(usex gif)
-		-DSIMAGE_JASPER_SUPPORT=OFF
-		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
-		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
-		-DSIMAGE_MPEG2ENC_SUPPORT=ON
-		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
-		-DSIMAGE_PIC_SUPPORT=ON
-		-DSIMAGE_PNG_SUPPORT=$(usex png)
-		-DSIMAGE_QIMAGE_SUPPORT=$(usex qt5)
-		-DSIMAGE_QUICKTIME_SUPPORT=OFF # OS X only
-		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
-		-DSIMAGE_USE_QT5=ON
-		-DSIMAGE_RGB_SUPPORT=ON
-		-DSIMAGE_TGA_SUPPORT=ON
-		-DSIMAGE_XWD_SUPPORT=ON
-		-DTESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/simage/simage-1.8.0.ebuild b/media-libs/simage/simage-1.8.0.ebuild
index 8d8e6434e9ba..53eb51da0470 100644
--- a/media-libs/simage/simage-1.8.0.ebuild
+++ b/media-libs/simage/simage-1.8.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/coin3d/simage/"
 SRC_URI="https://github.com/coin3d/simage/archive/${P}.tar.gz"
 
 LICENSE="BSD-1"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis"
 RESTRICT="!test? ( test )"