gentoo resync : 16.06.2018

3 files changed, 2 insertions, 68 deletions

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 9976ceb7a84c..f0e21e482540 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -3,6 +3,5 @@ DIST imlib2-1.4.9.tar.gz 1028872 BLAKE2B 8c92cd9bb5b7ba43412fdb499e35e09f901538a
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 EBUILD imlib2-1.4.10.ebuild 2005 BLAKE2B b0792ae68d5ac1c4d0a17415d4614bfa35b7ea8e4293b55399abc897dbd98f04375efc2e60d349e968ddfd8757614689d2b6dd0b4d8ce18c6e7c882b0d26cdc4 SHA512 fcb939157b9e7d840c00af3700f2e119875bcfbeef2b48bc72aea6a835c66936c747de350894702abc8159c9925b7e6ec4f1c27eb2be773abff3fca396875801
 EBUILD imlib2-1.4.9.ebuild 1988 BLAKE2B 17390f940f2381e276754f332fa6d68e69dd2e34f5edf950c04dbeb62f4e2fec806a7756765f60334b8ee2cb0e7dd4584fb2c46ba533a47cd9e107eb6027669e SHA512 8b2310e639ce77034448dc4d917d5ab67b75c1dc835370f5975ef82e973099bcdef538612ca7ff4a1f32a83c49cd440d24c721a27de4c961ac3fdc60c4fbb92e
-EBUILD imlib2-1.5.1.ebuild 1820 BLAKE2B 1c779d00926860fae3725f16f263f2146b77f91cb1a04b3554696b8bfc88615b5e3c76ee581c9cc934899879b5bb98c0314368df24a83b25d4b3fc8314093e74 SHA512 2c8fb5a87025fa284abb18c1c9b57e045ae6ff60dd43d03b4600471ae3bb669bfee112fda8934233d4f3b41388391d0445123d5f71206f5343907cdf20a97394
-EBUILD imlib2-9999.ebuild 1821 BLAKE2B 27418d8106be818a679ca03d8789baf4b467499fd57213925043b382c091b51d5cd06d1d255e8f5958883792421638bb44c85786f3253230388251c417e63d9a SHA512 e581cda5453333395dc65795ab17b6c3978bab2dab3adfd2cb0a4c713b33f41472864f57c2e822799132d7b62960fae9aced754e59f37e8669f99ed5e876c954
+EBUILD imlib2-1.5.1.ebuild 1833 BLAKE2B c127957a4830eea853e4a8b8e08336dc0507b54331cd908b3c3663bba30ea5623016bae3d968961cec199f65edfaeb4f63b45e522273b6039b06863d6837ae1d SHA512 6d1241bafa47df489f5c0e53dfb81ae9b95c192a62939da47dbfc552d9d98748e5a83209c2664a3cef9c67b811f261941072e0d01c8ec58ed3883619ec480d4e
 MISC metadata.xml 2278 BLAKE2B 7461b5d38509f5908d239712947f2f9d3ba91d5dcac79cb82f78ba74c0f8b51b54740cf734b0cf70acaf450f22b8c926ef5661631ac99269f3037d00ace553f8 SHA512 c9ac86bfc0e1cc55096dfb4f99321fa5c5efec65c7beb6d14955b7359ec362f8f41b15adf5e511ed88c1080bd568b59bad2c258fa98d6b89ba5a9dcbcf5b6c67
diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
index 20c6dc888539..e54e1665b9d6 100644
--- a/media-libs/imlib2/imlib2-1.5.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 gif jpeg mp3 nls png static-libs tiff X zlib"
 
 RDEPEND="
diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
deleted file mode 100644
index d615b8dd8ead..000000000000
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-EGIT_SUB_PROJECT="legacy"
-EGIT_URI_APPEND=${PN}
-
-if [[ ${PV} != "9999" ]] ; then
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment toolchain-funcs multilib-minimal
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx cpu_flags_x86_sse2 mp3 png static-libs tiff X zlib"
-
-RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	gif? ( >=media-libs/giflib-4.1.6-r3:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	)
-	mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-"
-
-multilib_src_configure() {
-	# imlib2 has diff configure options for x86/amd64 assembly
-	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
-	else
-		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
-
-	ECONF_SOURCE="${S}" \
-	E_ECONF+=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with gif)
-		$(use_with zlib)
-		$(use_with bzip2)
-		$(use_with mp3 id3)
-	)
-
-	enlightenment_src_configure
-}
-
-multilib_src_install() {
-	enlightenment_src_install
-}