gentoo resync : 24.12.2018

3 files changed, 2 insertions, 72 deletions

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 40fc00dc8750..d643c8adbfeb 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,4 +1,3 @@
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
-EBUILD imlib2-1.5.1-r1.ebuild 2125 BLAKE2B c4be879f903629b7f67767a61933dff8bb0ace51bf2c4b87badaf12b061a6a1e0774b8c03fe566fabc4a1d536d60c3852476fc40022047a5a218f7851513d982 SHA512 aad62f4be28c5e47986acdbaad80d52d530925bc982171ec92e32570c95a57acc32227302f51a69997c5f7858e740614bace4d4f7ae368422443ad62a9b4eb2e
-EBUILD imlib2-1.5.1.ebuild 1965 BLAKE2B 7da6e8ba071a76ac60fe4e84482c4755d2c73f6cd5239b72aeaee28937addd59d01b31c0f66b764a780d9159d89d1915a353f096bfa1a5dfb44c3ad7344f7ec0 SHA512 4ab5ded399a3df668baace65b1cecfe410fa25494ccd4e05badeda46ae671dd72891d42940711c3ef2448e18c715cb3d108ab475fc21d0af97007eed448d903c
+EBUILD imlib2-1.5.1-r1.ebuild 2128 BLAKE2B 70f1a854a6de3166b20ae8de3c04c54da364c62287baf821698e05c431122d22082727c21737e1594a92339872fa83f44cffd5761b0805851f3e9d458470c77b SHA512 d0e289668e9ae20f8b2ff8f8c6171f01d373a009e55bad6c826a2841517586424eee4bb14fe59da2b095a8469050dfb66f5e0ce7630c73b3fc47ba560c074780
 MISC metadata.xml 2534 BLAKE2B 5f49ea63a52648dc587ea6409cd8030efc1ed82a3bd8c77f4b37c388e17e0faddd2d841616bf073c63aaf5440a9954c62bff07d9e94a6302d9285cad211180c9 SHA512 fb6cdef2cce2f36b2c772f54c81353e319223f45bfff52490165905e03a6ffd2c36c86e199f4bfd99b0450c3c1a23af371a12bee9c230308751362d1627791e5
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
index 9583514993a6..cbd668d6ecfa 100644
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
 
 REQUIRED_USE="shm? ( X )"
diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
deleted file mode 100644
index 3cd615595e69..000000000000
--- a/media-libs/imlib2/imlib2-1.5.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 gif jpeg mp3 nls png static-libs tiff X zlib"
-
-RDEPEND="
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
-	jpeg? ( ~virtual/jpeg-0:0=[${MULTILIB_USEDEP}] )
-	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-"
-
-multilib_src_configure() {
-	local myconf_imlib2=(
-		$(use_with bzip2)
-		$(use_with gif)
-		$(use_with jpeg)
-		$(use_with mp3 id3)
-		$(use_with png)
-		$(use_enable static-libs static)
-		$(use_with tiff)
-		$(use_with X x)
-		$(use_with zlib)
-	)
-
-	# imlib2 has different configure options for x86/amd64 assembly
-	if [[ $(tc-arch) == amd64 ]]; then
-		myconf_imlib2+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
-	else
-		myconf_imlib2+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf_imlib2[@]}"
-}
-
-multilib_src_install() {
-	V=1 emake install DESTDIR="${D}"
-
-	local HTML_DOCS=( doc/. )
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-}