gentoo resync : 21.09.2018

4 files changed, 2 insertions, 126 deletions

diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 6f7c6977ad88..9a748e3f39d7 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,7 +1,3 @@
-DIST SDL2_image-2.0.1.tar.gz 7797848 BLAKE2B 2be5fd9714c56040987a66107b49cac60659811fd95bc5b8f9e47196905870793bd258a75b8dad3a83bab50294a8ff5eac0f2132118d9f154019d884ce9cb184 SHA512 99ed5f7b69966cea5fcf9173e7270167c24b55ab459774f10dbf90f26dcb9d5f118971ffd4e583a83148976f44ca166474669398a561169d24ffba80f852306f
-DIST SDL2_image-2.0.2.tar.gz 8680980 BLAKE2B e8930872b572f296744a7a90cb61ee6d8b708b99cde19c2c354f5a3f8a16c3ec7669e21f54632fc4cd69d926e7e18066c89e3099061289999e6ed96c56a2bda0 SHA512 468f1a5aaee0b6920adb80df21aaaa41bfc5c642b4a00ac60244a90c5e9f27b092b73bcdd2c5520aa1de2759e8b174686b186a51f2d07e7e188ce2cd10519724
 DIST SDL2_image-2.0.3.tar.gz 8685512 BLAKE2B c54114f6573632561443bc57af8fe3ddbccc0bfcf027939685add7b06cb6999a5bc41119c474481047a7216ce6110a58a08571fefa6b5c80322f15f0c528ad6f SHA512 869cf3485cc850a91dc1d7f0023f0497bc7bbfd63e721365358b19d19d4da850e52667731d0e5ec80f4a11d7687aa6cfbdd5ceaec956af0e7f5567e87535977a
-EBUILD sdl2-image-2.0.1.ebuild 1513 BLAKE2B 22829c449c686770ea9f7dff2dd32d50db973dc202598008eb83acd9c4c72cd12e8490e8ea4ddba0c996ddac5c127de54007226165fcbfc8fe497e4b25c0b814 SHA512 f3da0090838a632b6a6999671e1c89b907f601d80f7c9e09c98480ed117d7f8c5e210c3febb492cb0df9e47c5b5beae01d0bcee60aaef3e53a31588f959d5266
-EBUILD sdl2-image-2.0.2.ebuild 1526 BLAKE2B ef48f1bb77814177af8a4274b0e7af969077b5b167c4368475635e868b831e748347c0c7b68f27126b15981eab39c9ed789ced0fa3df065be73f81c4af792de9 SHA512 23bce8ebe254a12f4b10b71c8b1429d7b7c58225f5b59d8dd69e90be51d73ee9c8406066909601e0a802d4be14c0792d5ab6254f59def37da6f1d524fccfa8ea
-EBUILD sdl2-image-2.0.3.ebuild 1525 BLAKE2B 917b40753c8b6385895642470a3d2b289a7f9a3cca8cd726ef7aef8f1aa867c543f19e264850464ce5e2bb5b55b3d99ac8ef5860217bd567563b6e84f0261526 SHA512 c84decf93016f1be8390682978712039aea59ff016cc72d26a8d9b7309e9c2a7fdbafa0dd7c45e2cd5c1580c4e9a905f1828c56e691f93b56b8be63248d9f93a
+EBUILD sdl2-image-2.0.3.ebuild 1524 BLAKE2B 3bd4371703ad10beca949c54d87094e52ff1d6a0a0c5423d75eefa355e9bb0700082c5df94dcba93a5fe497efbbba6239eea4932c4e40dceec4d206d8c80e010 SHA512 316594122cb65267148c7478bdd40a52af21021992a6335a8b030152f24320b1f1a096aec5c0e5c23e446c1adeea62d51432a9f5d7ccb63255a07d2af2607439
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
deleted file mode 100644
index 2a8330c5f9d1..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib multilib-minimal
-
-MY_P=SDL2_image-${PV}
-DESCRIPTION="Image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--disable-sdltest \
-		--enable-bmp \
-		$(use_enable gif) \
-		$(use_enable jpeg jpg) \
-		--disable-jpg-shared \
-		--enable-lbm \
-		--enable-pcx \
-		$(use_enable png) \
-		--disable-png-shared \
-		--enable-pnm \
-		--enable-tga \
-		$(use_enable tiff tif) \
-		--disable-tif-shared \
-		--enable-xcf \
-		--enable-xpm \
-		--enable-xv \
-		$(use_enable webp) \
-		--disable-webp-shared
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	prune_libtool_files
-}
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild
deleted file mode 100644
index c3b1db990775..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune multilib multilib-minimal
-
-MY_P="SDL2_image-${PV}"
-DESCRIPTION="Image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-bmp
-		$(use_enable gif)
-		$(use_enable jpeg jpg)
-		--disable-jpg-shared
-		--enable-lbm
-		--enable-pcx
-		$(use_enable png)
-		--disable-png-shared
-		--enable-pnm
-		--enable-tga
-		$(use_enable tiff tif)
-		--disable-tif-shared
-		--enable-xcf
-		--enable-xpm
-		--enable-xv
-		$(use_enable webp)
-		--disable-webp-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	prune_libtool_files
-}
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
index 6a2f4bd02d22..f3a5ccfcb4bb 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="