[gentoo-commits] repo/gentoo:master commit in: profiles/arch/hppa/, profiles/arch/alpha/, profiles/arch/ia64/, ...

[Sam James]

commit:     28babcba3e2340e58afb04916c17952f51091af4
Author:     Nickolas Raymond Kaczynski <nrk <AT> disroot <DOT> org>
AuthorDate: Sun Apr 24 02:42:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 05:13:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28babcba

media-libs/imlib2: add v1.9.0

some of the new dependencies are missing keywords. mask them
accordingly.

change deprecated `virtual/jpeg` to `media-libs/jpeg-turbo`

also fixes the following issue, which should've been `bz2`
instead of `bzip2`.

	* QA Notice: Unrecognized configure options:
	*      --with-bzip2

Closes: https://bugs.gentoo.org/833490
Signed-off-by: Nickolas Raymond Kaczynski <nrk <AT> disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/25174
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/imlib2/Manifest                   |  1 +
 media-libs/imlib2/imlib2-1.9.0.ebuild        | 89 ++++++++++++++++++++++++++++
 media-libs/imlib2/metadata.xml               |  3 +
 profiles/arch/alpha/package.use.mask         |  4 ++
 profiles/arch/arm/armv4/package.use.mask     |  1 +
 profiles/arch/arm/armv4t/package.use.mask    |  1 +
 profiles/arch/arm/armv5te/package.use.mask   |  1 +
 profiles/arch/hppa/package.use.mask          |  4 ++
 profiles/arch/ia64/package.use.mask          |  4 ++
 profiles/arch/powerpc/ppc32/package.use.mask |  4 ++
 profiles/arch/sparc/package.use.mask         |  4 ++
 11 files changed, 116 insertions(+)

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 94d9d49aa726..53c2c96ce9c2 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,2 +1,3 @@
 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

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..78c8baa4b8cc
--- /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)
+		$(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..67e82bb6cd24 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">Hief 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>

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 631eabb1f5e9..d373ed4fe667 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nickolas Raymond Kaczynski <nrk@×××××××.org> (2022-04-24)
+# Dependencies are missing keywords
+media-libs/imlib2 svg heif jpegxl
+
 # Matt Turner <mattst88@g.o> (2022-04-18)
 # app-text/nuspell is not keyworded
 app-text/enchant nuspell

diff --git a/profiles/arch/arm/armv4/package.use.mask b/profiles/arch/arm/armv4/package.use.mask
index e507c3a3eca6..4ee82d31442a 100644
--- a/profiles/arch/arm/armv4/package.use.mask
+++ b/profiles/arch/arm/armv4/package.use.mask
@@ -4,6 +4,7 @@
 # Sam James <sam@g.o> (2022-04-22)
 # Needs Rustified librsvg
 >=media-libs/freetype-2.12.0 svg
+media-libs/imlib2 svg
 
 # Matt Turner <mattst88@g.o> (2021-07-25)
 # gdm requires gnome-shell requires rustified librsvg.

diff --git a/profiles/arch/arm/armv4t/package.use.mask b/profiles/arch/arm/armv4t/package.use.mask
index e507c3a3eca6..4ee82d31442a 100644
--- a/profiles/arch/arm/armv4t/package.use.mask
+++ b/profiles/arch/arm/armv4t/package.use.mask
@@ -4,6 +4,7 @@
 # Sam James <sam@g.o> (2022-04-22)
 # Needs Rustified librsvg
 >=media-libs/freetype-2.12.0 svg
+media-libs/imlib2 svg
 
 # Matt Turner <mattst88@g.o> (2021-07-25)
 # gdm requires gnome-shell requires rustified librsvg.

diff --git a/profiles/arch/arm/armv5te/package.use.mask b/profiles/arch/arm/armv5te/package.use.mask
index e507c3a3eca6..4ee82d31442a 100644
--- a/profiles/arch/arm/armv5te/package.use.mask
+++ b/profiles/arch/arm/armv5te/package.use.mask
@@ -4,6 +4,7 @@
 # Sam James <sam@g.o> (2022-04-22)
 # Needs Rustified librsvg
 >=media-libs/freetype-2.12.0 svg
+media-libs/imlib2 svg
 
 # Matt Turner <mattst88@g.o> (2021-07-25)
 # gdm requires gnome-shell requires rustified librsvg.

diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index c87f9a065595..3bfe1340a150 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Nickolas Raymond Kaczynski <nrk@×××××××.org> (2022-04-24)
+# Dependencies are missing keywords
+media-libs/imlib2 svg heif jpegxl
+
 # Sam James <sam@g.o> (2022-04-24)
 # Requires dev-util/pahole.
 sys-kernel/gentoo-kernel debug

diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 3302882b0146..b6add3eb6241 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nickolas Raymond Kaczynski <nrk@×××××××.org> (2022-04-24)
+# Dependencies are missing keywords
+media-libs/imlib2 svg heif jpegxl
+
 # Matt Turner <mattst88@g.o> (2022-04-18)
 # app-text/nuspell is not keyworded
 app-text/enchant nuspell

diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 6e8d8216b88e..fd0efe2b6bd3 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nickolas Raymond Kaczynski <nrk@×××××××.org> (2022-04-24)
+# Dependencies are missing keywords
+media-libs/imlib2 heif
+
 # Lars Wendler <polynomial-c@g.o> (2022-04-22)
 # gnome-base/librsvg missing keywords
 media-libs/freetype svg

diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index e7b2542e7273..430204b80ce4 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nickolas Raymond Kaczynski <nrk@×××××××.org> (2022-04-24)
+# Dependencies are missing keywords
+media-libs/imlib2 svg heif
+
 # Matt Turner <mattst88@g.o> (2022-04-18)
 # app-text/nuspell is not keyworded
 app-text/enchant nuspell