gentoo resync : 09.03.2018

3 files changed, 2 insertions, 79 deletions

diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 18bab6b71771..201f9086eabd 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,6 +1,5 @@
 AUX simage-1.7.0-libpng15.patch 572 BLAKE2B 7f4eacdd5aac3e6634fd26824d0dfb7ec779fcf6be86e642f2870c62b1f0bd86b1ef767e19034e05fd62cba9904ef45e13a85be7657e00133febb67b0469c337 SHA512 0a867187b0dbc644182784e56dfd26b51f48c9355b01228fe3386fab05cee084e0066d4b18eb3f63110a25c0d2abf8f8b214d9b94e2e7dc7438e90308653e4e8
 AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb15743253294142a87f98d4043368f189dc4f5ee302de16e84572a69e3ea5755124326fb075b2e45d3574a1759c899d9e96eaf828 SHA512 791db9c02fc0dc7526ed43b340ab6f92baea91a5bf9005099f6adf1550a7ab73ef36790d2e761f0b50b88098e9124f3035ff21149cca00d819c2262d8e180618
 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
-EBUILD simage-1.7.0-r1.ebuild 1819 BLAKE2B bf3be9828da38712acf316dc1a44c8c093f019d9b2236aa16cfb55b3eefb4e7bbb8eea9012a9275f07f201ed0698560d52de67b0bbe71773d58e80b55c793565 SHA512 7a16ac76fe956c145983c18b2204b390a2bbb3e793ba556db06303204e763ccac6fa6cb5bb05e05b5f3972825a26b9c4253e2f5ff028052ae887fa78b4b43871
-EBUILD simage-1.7.0.ebuild 1797 BLAKE2B a59ec07def228a517d059b4b7bcb1ee1ec177feb681220c3bfc072ae73e3d431760b1b04c3cdeb75bac6d5840233a8ce7725ba243408be6bf659b0de5b421f49 SHA512 fee38faec0e6671220b7eda84c5639be3ea66d88384bda168296de2184e8cc38b45555801ab0c6988fc737af0b60c3d78a34984f48faad99c0236a3baf6182c3
+EBUILD simage-1.7.0-r1.ebuild 1818 BLAKE2B 1361730da3074b31a7c92ab77eee143c65feb422c4ea273184b13e544b9c11d7c065261df7791e717099e6a5217c96c2a752985383cda91b62582bbe84cb1d80 SHA512 e2b3be8b49a413ae5e81398fe46467c3c42548ebf695ad9cf26c37e1dd80165e8bd03f2470a225a2edad663d7a976a44acd6229541cc1d93e586ad642f82f929
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild
index b49018795d74..3b6e40d1cafa 100644
--- a/media-libs/simage/simage-1.7.0-r1.ebuild
+++ b/media-libs/simage/simage-1.7.0-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage"
 SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
 
 LICENSE="public-domain mpeg2enc"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 x86"
 SLOT="0"
 IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
 RESTRICT="mirror bindist" #465086
diff --git a/media-libs/simage/simage-1.7.0.ebuild b/media-libs/simage/simage-1.7.0.ebuild
deleted file mode 100644
index 52c69c5549a7..000000000000
--- a/media-libs/simage/simage-1.7.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit base
-
-DESCRIPTION="Image and video texturing library"
-HOMEPAGE="https://bitbucket.org/Coin3D/simage"
-SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
-
-LICENSE="public-domain mpeg2enc"
-KEYWORDS="amd64 ~arm ppc x86"
-SLOT="0"
-IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
-RESTRICT="mirror bindist" #465086
-
-RDEPEND="
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	png? ( media-libs/libpng:0 )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-pkgconfig-partial.patch
-	"${FILESDIR}"/${PN}-1.7.0-libpng15.patch
-)
-
-# --with-pic, two defined (PIC and one for image format, sillyt), no not pass
-# --enable-qimage, broken Qt checks, unable to locate FHS-compliant Qt install
-# --with-x, not used anywhere
-src_configure() {
-	econf \
-		--disable-qimage \
-		--disable-quicktime \
-		--with-eps \
-		--with-mpeg2enc \
-		--with-rgb \
-		--with-targa \
-		--with-xwd \
-		--without-x \
-		$(use_with gif) \
-		$(use_enable debug) \
-		$(use_enable debug symbols) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jasper) \
-		$(use_with png) \
-		$(use_with sndfile libsndfile) \
-		$(use_enable static-libs static) \
-		$(use_with tiff) \
-		$(use_with vorbis oggvorbis) \
-		$(use_with zlib)
-}
-
-src_install() {
-	# Remove simage from Libs.private
-	sed -e '/Libs.private/s/ -lsimage//' -i simage.pc || die
-
-	base_src_install
-
-	# Remove libtool files when not needed.
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
-}