gentoo resync : 12.05.2022

3 files changed, 95 insertions, 1 deletions

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 7956c9aa2272..266fc5edb393 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,5 +1,7 @@
 DIST imlib2-1.7.1.tar.bz2 893631 BLAKE2B 637bf70ea223a63c51def0fac4102683a090de41a1f5904d6232fd2fa004915e3dcde54eac51d16532d2df83a0f8df127266766ac3700ae2948d39fefef512b8 SHA512 36e457855da0f129c7e7ba3dfcb44162b6624b1d56df5f84448495a96fe9ad1ce3e6c628222630be7274476722c4feaa8e1648d1e463439ca758e66ce9645970
 DIST imlib2-1.7.5.tar.xz 793124 BLAKE2B bc47f81aeb635ca2f3d4962e1be5c53111a25a88ccbfcd8f9a7c87717b256966ca6b8cd78fb897287dab656ef2ade41a0955f7d3770d6d670e675954f000cebb SHA512 6e0a79359d6cac297b7a074a75bf577c8c1e3932d9993616834ea9076a7df544fafcfa960fe8ed7468f1291533f3c828260ccb809a882dadb3f3650ba9dd3f28
+DIST imlib2-1.9.0.tar.xz 807740 BLAKE2B 5fc1694a4a419434d2308f0bd76e7a2fe086a00159c5fe73a383bee4d0c721f2bf294e9a9e7cb86416f702d1991646b56fd3a876c573584c4a18c7bd5e5f5f88 SHA512 958fdabc938ec03ab48001ca4df72c8352cb261b12b09334d38348b22b8859cff16a1cda0d4447b73261723f223f62a799f80eb85a710ac5a44a3fa4f90734fd
 EBUILD imlib2-1.7.1-r2.ebuild 2284 BLAKE2B 2a28255e74bda9cc886d9d48d92da8bcdc9902d3a19c18278ed04985020a07c70f1ab766e2fecbeae2f229cb81ad87f05ac074d3d802d9f3f832fc0731135664 SHA512 6a2e1b5fdeb0a18c82232c576030b50856d7ff17a7176db10a9897e38f0a9da8c6c14177362e30c2c21c4c0d93792c8b91014ab366f1124b818fb260151c1d06
 EBUILD imlib2-1.7.5.ebuild 2318 BLAKE2B f3f1dc9bf3219b184b000f6238c9a18d9a62c66e2849ef5785547e0fd6e80b41f5a8f2cc21dbe66197b0ea8132c1dfd43170c845ae1a384dbb2286764091f5b2 SHA512 e1bc42489625c97160f896596704d89c89bf98165bd3c43aa2e42ab7c632ba577bd58f3ce9cfaca4c447b912ecdb120b10579e7c7c4726a5acd97ad942f32d52
-MISC metadata.xml 3008 BLAKE2B 42b78b02b69a368870d24358d98004198d7626296f1bc260e44db410a4eb75de7dabcb120473733957dfd92487f3191e2268317edb61c853e250be80ce24d3de SHA512 b106c8bc74a34815fcca8af4e6a7791c72e0693371154a426690d4263405aee1171e70bab5deb84b881d857400d9aa5a61ae97732f67fa1fbdb640f918fb4cf4
+EBUILD imlib2-1.9.0.ebuild 2734 BLAKE2B 8da7639474f6e9fc308ea14ca66413f484e12c2ff8e39e28ce78a34eb907f08b7c67e5ca5692fb2c8014014f3bb7cfd869fbc853019658b971a467614c162d1f SHA512 e49a3317da27fdf8d2e14f5412b8c49fd628d31774952c3573303ab76aff5ff7b6b189f86d4975255339e9cb5c4452e0389068b53ab5650fdf245bf4671bb5e0
+MISC metadata.xml 3175 BLAKE2B 23d595a150441ffba1f7dfde5948a44d08dbd72e6511c7a5358739d1b4f6cb8abcb33ae4e3b46482b11d6af6b4642435a3cdc42294efac9a5c8eee88b2ba2202 SHA512 2751efc349097390fe3f2ff821fa0a0d97bf2e5eaddbe0036368699a746ae7b3a3e7c66419931561d8ed7307f7c3f537e8cb878cd3cd104891912a159054bff6
diff --git a/media-libs/imlib2/imlib2-1.9.0.ebuild b/media-libs/imlib2/imlib2-1.9.0.ebuild
new file mode 100644
index 000000000000..9687be6e1dde
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.9.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="https://www.enlightenment.org/
+	https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug doc +gif +jpeg mp3 +png +shm
+	static-libs +tiff +webp zlib svg heif eps jpeg2k jpegxl"
+
+REQUIRED_USE="shm? ( X )"
+
+RDEPEND="
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	mp3? ( media-libs/libid3tag:=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	svg? ( >=gnome-base/librsvg-2.46.0:=[${MULTILIB_USEDEP}] )
+	heif? ( media-libs/libheif:=[${MULTILIB_USEDEP}] )
+	eps? ( app-text/libspectre )
+	jpeg2k? ( media-libs/openjpeg:=[${MULTILIB_USEDEP}] )
+	jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	!<media-plugins/imlib2_loaders-1.7.0
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with X x)
+		$(use_with bzip2 bz2)
+		$(use_enable debug)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mp3 id3)
+		$(use_with png)
+		$(use_with shm x-shm-fd)
+		$(use_enable static-libs static)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with zlib)
+		$(use_with svg)
+		$(use_with heif)
+		$(multilib_native_use_with eps ps)
+		$(use_with jpeg2k j2k)
+		$(use_with jpegxl jxl)
+	)
+
+	# imlib2 has different configure options for x86/amd64 assembly
+	if [[ $(tc-arch) == amd64 ]]; then
+		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
+	else
+		myeconfargs+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	V=1 emake install DESTDIR="${D}"
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doc/. )
+		rm "${S}"/doc/Makefile.{am,in} || die
+	fi
+	einstalldocs
+}
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 9194df3a2ef1..6129b2fd00f8 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -10,6 +10,9 @@
 		<flag name="bzip2">Bzip2 loader support</flag>
 		<flag name="gif">Gif image loader support</flag>
 		<flag name="jpeg">Jpeg image loader support</flag>
+		<flag name="heif">Heif and Avif image loader support</flag>
+		<flag name="eps">Eps image loader support</flag>
+		<flag name="jpegxl">Jxl image loader support</flag>
 		<flag name="mp3">ID3 loader support</flag>
 		<flag name="png">PNG image loader support</flag>
 		<flag name="shm">Use MIT shared memory support for X image transfer</flag>