gentoo resync : 10.02.2020

3 files changed, 2 insertions, 43 deletions

diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index c599ec2d87f6..d369556745af 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,5 +1,3 @@
-DIST imlib2_loaders-1.5.1.tar.gz 378169 BLAKE2B a65dabb8fb537489fe77fdc7c197ce4fa91dc13a86d1a5bf5aae4fbc9ac65a4194b57de8d49bb0dc2d906b20b7c79aa458d0ba668aa947a847414f377fd3b540 SHA512 a94996091a7f9f1271c19d24e6edebeb34977a4e67b8300897de0e5afd06bb9b209e404dd86ab3f397c6dec64f4985a515986b6b048d2c13416265eb2058a8a6
 DIST imlib2_loaders-1.6.0.tar.gz 375642 BLAKE2B cf1e8ad887d7b56ab828018e85d5fc635509eadd283ebc051671d8b9129adfded12449a5e8d7d52f4a8bd8e877a0585d62562e169be6176d93ded3dec0569e5d SHA512 948e85260ad9379f71d35ed8f98355f25878acef3bffc9add0419b6c3d3f7eec0dd504701d0bd2ad75a1aacba02e08965a5f0327f7a2832369af34b5d23d9179
-EBUILD imlib2_loaders-1.5.1.ebuild 807 BLAKE2B a2efdf32043ac6fa4e9158e05ceb3716861ea2ede0b9593f4c292f84e55bfd98678b5a56ce6aaf352a8f1773f983d45369307eafb3d352ed40a091a20ec7179f SHA512 997492faf9ad956235729970081a36dae05b45f24c88926634afeaeff6cce42e7d21dc4192cb4ba3ad828c2c0ec670f0ca7692738ef48466c6197f26f1f5fe72
-EBUILD imlib2_loaders-1.6.0.ebuild 876 BLAKE2B 6726b5bfd2d05818f9feca50319b95678e3f9119765821ea620c330f4734ea6ec470298b5de5fee0dc68af90bd01eebf818c6d84b3f277d993ddc74eb75ff909 SHA512 83097dd6c5838f648836bf3badb49602556368113712a39dc27e721f282e8a560131a38678567ccb14f9cbeb770b648f53a5156b4531aae47e024585d181f378
+EBUILD imlib2_loaders-1.6.0.ebuild 853 BLAKE2B d12d69f26e0849c721bcd518c5d48e159fabd803a31cd060fa99558b5a15918b436db25ab73669616b0165dfc34e98204930543ae55e2ca826efd5b057b12db6 SHA512 3277b69a70c8744d311f24016d78984440ba0eaa8a9c0277f0c7e6e5a4265dd9471ee9da1b5f9cca6c53ccd164d249d5335c83d9c785e4b95e7de7490c479b68
 MISC metadata.xml 828 BLAKE2B bb417b5233966162b782c8b9371fbc5b5d6fb3e36cb9d2ce3f3481b82dae184b1f754ad44d9b6275c24d4ff27f48278690eea38174f2ed2dde287fb5778c49fd SHA512 349cb0bbc1ac72e5de17a40b9e913c9fc2288692797255bbb1d48d5017daab8721c646aec489aca777d26a6f1fc5f641a2b30d1aaa2b6f6724678373d98f3e21
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
deleted file mode 100644
index a17b4de02399..000000000000
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Additional image loaders for Imlib2"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="eet xcf"
-
-RDEPEND="
-	>=media-libs/imlib2-${PV}
-	eet? ( dev-libs/efl[eet] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable eet)
-		$(use_enable xcf)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	V=1 emake install DESTDIR="${D}"
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
index 0b2ef19787d0..e8ee8565a1d4 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="eet xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}