gentoo auto-resync : 18:03:2023 - 00:29:05

5 files changed, 44 insertions, 141 deletions

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index a73b406df17f..d30f76af1cb5 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,8 +1,5 @@
-AUX 7d60151ba9.patch 1505 BLAKE2B 96b9d503e5282a9862f51d89ff0a9ced3e9caa175e46beae7d82e1e9b6088230dc59065147650a00a7e4cc24929e460ee2a3c5637c2f78d479700a4109e7cf88 SHA512 3312ccb6d562bd28ab7f432eb7a0417ebec90388d3a43a79a33189ba68b06349d51f0fd28b203f4dfae039af67ec3bb772a4ab010b9bf26ed175089b91ef8b1b
-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.11.0.tar.xz 820368 BLAKE2B 2e1dec04c44ce14429910c0dd6b7b5173bc70e8968912c9c25e8b47d38fdfd6753c29de2e5a2ae0b0e6498550e207989ae927682b09032b637baf759744dfbec SHA512 2727b217ae18e1015591f2587f885a5a8d59471d6051f1aefb761329fd0fc979163e228154b2bff8728a3a2acc28437f189989d24a4d6e37bfc6f69445bd47e7
 DIST imlib2-1.9.1.tar.xz 813104 BLAKE2B ef7369d2285bd5b207f646ebb12492323203306c95786d8561a1191dbe489a8efe61975e4deed7bc9c8ed0ac24cf9bd826fa5a24095bc3d254e6f6d6379c8c8b SHA512 00eb8804a32e1403614e9f899f358dd9797f4bcfa7e9fdecd37992731019933e39834a60bd20be8fb69a35161ba1e784bd638b5ecb626d01a4f69c70c330e5f1
-EBUILD imlib2-1.7.1-r4.ebuild 2295 BLAKE2B 1d6612d07b69331190fa7ef38407f859ddc7667da9d07b1c9ec2f1b8ef8b06318d3cd3dc330a08e02752c5405cda196adb9eff93a2e8339e213251be9c74dc77 SHA512 8904e5d7aad7916795bc36d34e685446688b92bc717aa30d7323d851b136189a4872a0a04972112c9b70e11898ad37cd389e10b81d5022269d3ca04f9c04b3b3
-EBUILD imlib2-1.7.5-r1.ebuild 2365 BLAKE2B e5bd166d0d6f0d1ce93812db4fc4e13bd4273472a1010a7afd4ac908e3ad9e2446d02d018b24892690d9ea1515aac3bbc8f4c80080262fd6515605dfddf65320 SHA512 7c40263b1c5266a0792ed2fbc60717bc6e237f08cc5a5ea195e739e8876f90b1aa930ab4c9866cd2c160c72f6937db8350207830ce8e469c23a0d7c98e40ee7e
+EBUILD imlib2-1.11.0.ebuild 3080 BLAKE2B 166a6e93a2476c40dd519892532bc46b6897802c1e1873b245a524a6daea2fc010aeab0aeb3552f13130076b30bff367bc2658b784a8b4ddbfaebdd3411e5b3f SHA512 391d0f52db433b936bdbc8e8aba588febec87fc56a08bb3c7849c9fad657e892898e1a8f67ecaad752f8f0b37a61b19482904b664127f0fee7f5d3a3f8280d5b
 EBUILD imlib2-1.9.1-r1.ebuild 2980 BLAKE2B 7fec7cd010fba797109029d3d73ed4ace75a488e42df7dec858fb9bbddc1b02888556e3224ad2ab9a3f9157f7060ca0a6728349affeb37bb8e33af8b36e8108f SHA512 f7af62c45e0962699214b468ef0ceb09e3bd9554002a2cfc041b3c84d55250a8b856c16cbf2fa494d24a36415f0f8f8e3ad48044a4ed9e391d60bb88cc5017cc
-MISC metadata.xml 3239 BLAKE2B c9f5fc4da42d70d17c90ebb4752029dfb25347c1efa3383a123bccbb3b0340d4ae5840d8a5e6f430c3320e902e4de02aa4078e49a0466145697f319b2ab218fb SHA512 e66ee16c627990f3b60408103e536bc9a458ed052df39107bd4db13ab203df9e4d45b91603e9c11ac202f40b00f7fb7d693c130ed7e1ebc415142deaf4d81d26
+MISC metadata.xml 3506 BLAKE2B 11be2b129e049cadb6e24ba9d52aa9623704f3c5c3613958b0775867d0617d705004d13320e3e0346eedf98866f81f8ad12e706a1ee6e6038bdece875619429e SHA512 a16f85e251257f0547074d86d9e1dc4cf0679a9bc8652df8ed88c26e96b6727e0383e288b0a77412cbf67b628f4101e8dd53a17453bc76495e7dcc5a15fb59f6
diff --git a/media-libs/imlib2/files/7d60151ba9.patch b/media-libs/imlib2/files/7d60151ba9.patch
deleted file mode 100644
index 33709d83849f..000000000000
--- a/media-libs/imlib2/files/7d60151ba9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/877777
-https://git.enlightenment.org/old/legacy-imlib2/commit/7d60151ba9696ef07be79af68d5c631a97c63906
-
-From 7d60151ba9696ef07be79af68d5c631a97c63906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 3 Jan 2022 10:56:03 +0100
-Subject: [PATCH] ICO loader: Fix compilation on big endian architectures
-
-Commit ff79901a071a76ec73cc98c7ff15102c514afb7b refactors the
-ico_read_idir function and removed the local nr variable. Unfortunately,
-this variable is still used within an `#ifdef WORDS_BIGENDIAN` block on
-big endian architectures as a for loop index variable. As such, the code
-does presently not compile since the aforementioned commit. This patch
-fixes this issue by re-introducing the variable conditionally on big
-endian architectures.
-
-Note: It would likely be cleaner to declare the nr variable as part of
-the loop declaration, however, this C99 feature does not seem to be used
-anywhere in the code base, hence I refrained from using it here.
----
- src/modules/loaders/loader_ico.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c
-index e8cef41..66c3643 100644
---- a/src/modules/loaders/loader_ico.c
-+++ b/src/modules/loaders/loader_ico.c
-@@ -139,6 +139,9 @@ ico_read_icon(ico_t * ico, int ino)
- {
-    ie_t               *ie;
-    unsigned int        size;
-+#ifdef WORDS_BIGENDIAN
-+   unsigned int        nr;
-+#endif
- 
-    ie = &ico->ie[ino];
- 
diff --git a/media-libs/imlib2/imlib2-1.7.5-r1.ebuild b/media-libs/imlib2/imlib2-1.11.0.ebuild
index 51cc24ffa142..ec610580a755 100644
--- a/media-libs/imlib2/imlib2-1.7.5-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.11.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# Must be bumped with media-plugins/imlib2_loaders!
+
 inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
@@ -12,44 +14,66 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 apidoc bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 debug
+eps +filters +gif +jpeg jpeg2k jpegxl heif lzma mp3 packing +png
++shm static-libs svg +text +tiff +webp zlib"
 
 REQUIRED_USE="shm? ( X )"
 
 RDEPEND="
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	eps? ( app-text/libspectre )
 	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	heif? ( media-libs/libheif:=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:=[${MULTILIB_USEDEP}] )
 	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
 	mp3? ( media-libs/libid3tag:=[${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	svg? ( >=gnome-base/librsvg-2.46.0:=[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-4.0.4:=[${MULTILIB_USEDEP}] )
 	webp? ( media-libs/libwebp:=[${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
+	!<media-plugins/imlib2_loaders-1.10.0
 "
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/7d60151ba9.patch" )
+BDEPEND="
+	virtual/pkgconfig
+	apidoc? ( app-doc/doxygen )
+"
+
+# default DOCS will haul README.in we do not need
+DOCS=( AUTHORS ChangeLog README TODO )
 
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_with X x)
-		$(use_with bzip2)
+		$(multilib_native_use_enable apidoc doc-build)
+		$(use_with bzip2 bz2)
 		$(use_enable debug)
+		$(multilib_native_use_with eps ps)
+		$(use_enable filters)
 		$(use_with gif)
+		$(use_with heif)
 		$(use_with jpeg)
+		$(use_with jpeg2k j2k)
+		$(use_with jpegxl jxl)
+		$(use_with lzma)
 		$(use_with mp3 id3)
+		$(use_enable packing)
 		$(use_with png)
 		$(use_with shm x-shm-fd)
 		$(use_enable static-libs static)
+		$(use_with svg)
+		$(use_enable text)
 		$(use_with tiff)
 		$(use_with webp)
 		$(use_with zlib)
@@ -69,12 +93,6 @@ multilib_src_configure() {
 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
+	multilib_is_native_abi && use apidoc &&
+		export HTML_DOCS=( "${BUILD_DIR}/doc/html/"* )
 }
diff --git a/media-libs/imlib2/imlib2-1.7.1-r4.ebuild b/media-libs/imlib2/imlib2-1.7.1-r4.ebuild
deleted file mode 100644
index 7914bb93ddd5..000000000000
--- a/media-libs/imlib2/imlib2-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.bz2"
-
-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 doc +gif +jpeg mp3 +png +shm
-	static-libs +tiff +webp zlib"
-
-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:=[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${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)
-		$(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)
-	)
-
-	# 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 37e69c4d644c..a2de3cbe50f6 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -9,14 +9,17 @@
 		<flag name="X">Use the X window system</flag>
 		<flag name="apidoc">Provide doxygen generated API docs</flag>
 		<flag name="bzip2">Bzip2 loader support</flag>
+		<flag name="filters">Build filter functions (blur, sharpen, etc)</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="packing">Enable structure packing. This will reduce memory footprint at the cost of unaligned memory access</flag>
 		<flag name="png">PNG image loader support</flag>
 		<flag name="shm">Use MIT shared memory support for X image transfer</flag>
+		<flag name="text">Build text (TrueType font) functions</flag>
 		<flag name="tiff">TIFF image loader support</flag>
 		<flag name="webp">WEBP image loader support</flag>
 		<flag name="zlib">Zlib loader support</flag>