gentoo auto-resync : 25:11:2022 - 13:12:41

4 files changed, 14 insertions, 71 deletions

diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 7c3829f04990..582ff3fe9a84 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,9 +1,9 @@
 AUX babl-0.1.92_universal_nonlinear_rgb_u8_converter_sse2.patch 687 BLAKE2B 5e582c0731ad659977111ad6d7c5ae85c756ff0c98aab94f8a7d06ffed25444654b2e63cf129207429d6f4bf1b6c4451026e30ce6d0fdf5fa1060fe3e6e2e2f7 SHA512 a938c501a20ffe7669c101196b3855d8cb97fa2277d9a8f36167a13e80880a970cf3b697aa262cff092cc3b726108ecd76459c24c1f481cb236717a3371e64d3
 DIST babl-0.1.92.tar.xz 309784 BLAKE2B c3c716ba1b54082743ba6ea33da99fb458dc971ab78ae72170af9840eadbc7f2aeb0a26d3270ede2a6e0d7b55489fc8f700b1c69731a4612ba4106f9672762d0 SHA512 c2baf39f576bf7f57786c59f2de0818257f4d1d62cadf44fdd802c9a534ed94390dd1616e7e72fcc9de1fb85a24a10fbacdbbabbe376a45ae598be46817e3bc0
 DIST babl-0.1.96.tar.xz 312184 BLAKE2B 6ee307054cf4d1e0f434a6070189ed143c60056decb59184f880b26863c8177d0c69294254651923f7dfb897555939602e6f4384e7561a839a3cf80ae9468859 SHA512 771d68b80f1123baa38256e4b1d7946284cd88997b2ab7c7092a74120e91ea5ee7ab4c001686ae4b3e363b6465484f185a64f9c75515a55d3ffb81fecbeaca42
+DIST babl-0.1.98.tar.xz 312516 BLAKE2B c12626e4b8127a5b2e17507e20cf6ce324834a58d64fa54b80fbe00ef2468d3d29c870d44a22f08f7e74404cf6f47321084c854a4ba017cf0c8c199d8210849f SHA512 33b2e3f8fbcd6602bb82d6242dd2911bb2232e69350f7a0e70e14b1472052e27b0e2a1fa6a2b6d0449fc9796353336e311c8d4007c532447cd61f95b684a3120
 EBUILD babl-0.1.92-r1.ebuild 1923 BLAKE2B 6d1c10dee304bfd6c40d431ec1fc0db206668a38ac2fdcbea816cd6fa75889f773d781b85e87043f246a81d9b2c51625c8201b291c38c80474d7ed940b412d03 SHA512 45679b51b69ae403bda0753af41f4890702dff5b530daaf763c8fb95f634f56c9dd5c56bcc69b86c670dd4dc838539ade13597616ed6c84423463e3af800b134
-EBUILD babl-0.1.92.ebuild 1829 BLAKE2B 6b63020df7b902a92183e79000d342c13821ad3e87f005159cae04071750abe2f82f7fa7fd09a0cec6f94a65d6481522f08703ed6d1049133de3fbd2984ac2a4 SHA512 cad47bf1d01849165c502789f232d46c23c0d9bebec5725881ec1bc7cf0f1086f5f7bca804e0833bc06ab7a177e8ae754fe75670e0e8b602ee16932125480606
 EBUILD babl-0.1.96-r1.ebuild 1906 BLAKE2B d30f79801b2435ff81739026965a5fa72fcd7f7d26e906126625272c6948ffa1b647a511394b0c56f8d7a72d68e6fda28ffc0f1b77612cabcb7cad9f3d483162 SHA512 1dbde75f4ac91a78e413bc5906c6a94defa345e98b32329445b24b938bc55feef64f992b9bb6841a25b945061e08a57ccf25924adfb3d2811c96f40758759f3f
-EBUILD babl-0.1.96.ebuild 1765 BLAKE2B ec23a9899c545e20f64a56f5d3b73be99790c449a2ff4e6ae7bd2cd084a5f7a11a9c099958db0bcd74691b87ab81e2b2197c4a4cfbc59f93f4bde1300c885db3 SHA512 2f25c45d9c5b06f8e6e4d51d20df1a466177087a2fe89eae3b14ca58df68a64206eb3ec131604e5bea90c0c87afeb6cf9ba4467df5c3c15a54bf43245c5dfaf7
-EBUILD babl-9999.ebuild 1765 BLAKE2B ec23a9899c545e20f64a56f5d3b73be99790c449a2ff4e6ae7bd2cd084a5f7a11a9c099958db0bcd74691b87ab81e2b2197c4a4cfbc59f93f4bde1300c885db3 SHA512 2f25c45d9c5b06f8e6e4d51d20df1a466177087a2fe89eae3b14ca58df68a64206eb3ec131604e5bea90c0c87afeb6cf9ba4467df5c3c15a54bf43245c5dfaf7
+EBUILD babl-0.1.98.ebuild 1913 BLAKE2B bac2f699574d723d41f8425a97e7effba5405e457ac1f341351188b19677b209d6ac33139ccffe6c298ade66467cd8facdede30d3d54f022107c9f219c7c66a2 SHA512 5aad05d05de6249f29dfa303164a82f219d84b392aa28396cb1002dc0af7172c2cef49671a0c16e80148b289fc103e694df4bb388fa4bc39e532968c2a2efcf9
+EBUILD babl-9999.ebuild 1768 BLAKE2B 06e15bedd34ca86198a759f664afd31fc6abf3609da2ea8f685b9c319c9a6ab58b1ba49d21a21f19a32e9d3fd084ab5228d80469fb2827f6b65fafd555832ba9 SHA512 1ce5acb7bd4d2b9f2995628ab03833d05047463629456ba64f4d3f9af6b85929a2127d5d8d5ed184a4986d833b18e43db9879a59e4657692d16eb24d0cb5b962
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
diff --git a/media-libs/babl/babl-0.1.92.ebuild b/media-libs/babl/babl-0.1.92.ebuild
deleted file mode 100644
index 45ebcbe8290e..000000000000
--- a/media-libs/babl/babl-0.1.92.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils vala
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
-	SRC_URI=""
-else
-	SRC_URI="https://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="https://gegl.org/babl/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-REQUIRED_USE="vala? ( introspection )"
-
-BDEPEND="
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-RDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-
-	sed -i -e 's/Description/description/' meson.build || die # bug 843266
-}
-
-src_configure() {
-	use vala && vala_setup
-
-	# Automagic rsvg support is just for website generation we do not call,
-	#     so we don't need to fix it
-	# w3m is used for dist target thus no issue for us that it is automagically
-	#     detected
-	local emesonargs=(
-		-Dwith-docs=false
-		$(meson_use introspection enable-gir)
-		$(meson_use lcms with-lcms)
-		$(meson_use vala enable-vapi)
-		$(meson_use cpu_flags_x86_avx2 enable-avx2)
-		$(meson_use cpu_flags_x86_f16c enable-f16c)
-		$(meson_use cpu_flags_x86_mmx enable-mmx)
-		$(meson_use cpu_flags_x86_sse enable-sse)
-		$(meson_use cpu_flags_x86_sse2 enable-sse2)
-		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/babl/babl-0.1.96.ebuild b/media-libs/babl/babl-0.1.98.ebuild
index d97d11c00c37..b0809b33eff6 100644
--- a/media-libs/babl/babl-0.1.96.ebuild
+++ b/media-libs/babl/babl-0.1.98.ebuild
@@ -29,8 +29,8 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 RDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	lcms? ( >=media-libs/lcms-2.13.1:2 )
 "
 DEPEND="${RDEPEND}"
 
@@ -60,3 +60,10 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+
+	# Bug 871690
+	dosym -r /usr/"$(get_libdir)"/pkgconfig/babl.pc /usr/"$(get_libdir)"/pkgconfig/babl-0.1.pc
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index d97d11c00c37..c2f6e632a595 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -29,8 +29,8 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 RDEPEND="
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	lcms? ( >=media-libs/lcms-2.8:2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	lcms? ( >=media-libs/lcms-2.13.1:2 )
 "
 DEPEND="${RDEPEND}"