gentoo auto-resync : 20:06:2023 - 01:14:49

7 files changed, 163 insertions, 74 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e47e90f82a4f..d173d51bf4cd 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 4f126403a49d..0bce5b83c941 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,8 +1,6 @@
 AUX gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch 1417 BLAKE2B 203701b5535b338283b99aad63e3577d3abb295c005d2e2ac908e2f8abdb24e8f7b9ef311bcf35889a93804583f13ac65f1d9453111b5195320aab9442237b2e SHA512 e2f7ed4c5f15cec6a6a7d3303779a217716ca3d8fa5d3128f4e7e685c47284fd95b9e416d50b28ca34bd06a9c469ebb3f317db88526cdc2ba1088381871da9a4
 DIST gjs-1.76.0.tar.xz 645364 BLAKE2B 9987033883e466c983af007c870cba4f2ef70ee08e276777e1b52103ddcebd1285ca9f3ce64c8ef52437a829157f58902cfb921eed06442e53fd9778d9cd9f2b SHA512 fa44431f431f14b82c648c388046b83722808db52d2bbe2deeb8d270d6fbeee9c4ee27feaa4fef425e1ab5ac65a1e68d7aa9457d543044362752810128064ea6
-DIST gjs-1.76.1.tar.xz 645888 BLAKE2B 8d37a23080cbacec616af66b482685a05d0dbbf481b6b8f16ac319da0630597aaee223098aea3866644a99bfc28f55933c8f1a6458d82e902c53d0f6dc957fa6 SHA512 30d1da0296a3ae4ec7e7a67a850d10dbc1bf6ac699d2a9d58280b98ee5506bc76b801d62a3c5f964b38995ceda669946df26af51c96417374ff283def7bc7bc1
 DIST gjs-1.76.2.tar.xz 646232 BLAKE2B 66466eeb5f956d5041f4e63ba977dc9a688455770c39bcedd63576f56fde9821ed3c827c470f7e3befbbf7828fbd197706637da458876ec129d6c16323e414e8 SHA512 26b024874ce69a6f58b5fabe006b8d5417971db9de00e21ecd352715b4535f405d162bb81c0cf6b20313f0f78833962080ac1cb9bd42cfff9cf6a74340458540
 EBUILD gjs-1.76.0.ebuild 2039 BLAKE2B 08c1a70563f99022397c2bcf8c8a89fceba5390041c8c470389120411b7a7e5f6d94141e7c5667082e272eee952957c7bbaed4d3af77285f18d5933ccb475c0d SHA512 99a876eb920e1dfff03241ca5afee9a46c0f24880b97fa8d7fe85a361994c35e17fc47d047ad5bd018884792dfd187bc99cb2b73488dd4231ff2146d8d3b4962
-EBUILD gjs-1.76.1.ebuild 2053 BLAKE2B 09090e0f60daa36993954a6e38b1de54a6b5687236f17bc7cf047ec03c63795eddddb1e2953ea36ac5b223b797535febb3e26753154bb8798fbafe69888786b0 SHA512 17b354fe75e9339e11628dec476027659a68798437d20f721ab442c49f7b38728c2c6d86b6e5cf1a921402e1576b76d7404865b3098b03394e904e9aa2976abe
 EBUILD gjs-1.76.2.ebuild 2053 BLAKE2B 09090e0f60daa36993954a6e38b1de54a6b5687236f17bc7cf047ec03c63795eddddb1e2953ea36ac5b223b797535febb3e26753154bb8798fbafe69888786b0 SHA512 17b354fe75e9339e11628dec476027659a68798437d20f721ab442c49f7b38728c2c6d86b6e5cf1a921402e1576b76d7404865b3098b03394e904e9aa2976abe
 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2
diff --git a/dev-libs/gjs/gjs-1.76.1.ebuild b/dev-libs/gjs/gjs-1.76.1.ebuild
deleted file mode 100644
index 1806edd6bfdd..000000000000
--- a/dev-libs/gjs/gjs-1.76.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.71.1:=
-	>=dev-lang/spidermonkey-102.2.0:102
-	cairo? ( x11-libs/cairo[X,glib] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? (
-		sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.76.0-move_have_gtk4_to_the_appropriate_place.patch"
-)
-
-src_configure() {
-	append-cppflags -DG_DISABLE_CAST_CHECKS
-
-	# On musl, it's required that either gjs, pixman or gnome-shell to be built
-	# with a larger stack otherwise librsvg fails to render a particular SVG, as
-	# a result we fail to get gdm or gnome-shell running (greeted with a fail
-	# whale screen). The bug has been reported to librsvg. This is ideally just
-	# a temporary workaround until we understand what exactly needs a larger
-	# stack size, as it's not sufficient to do just librsvg.
-	#
-	# Please refer to:
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
-	#
-	# TODO: Find an actual fix instead of increasing the stack
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-		-Db_pch=True # TODO this has to go
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 5279a5d9164b..a0db87e23032 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,5 +1,8 @@
 AUX libintl-0.21.1-java-autoconf.patch 2280 BLAKE2B 79605c0ea6c5a56be1a6d586210ed40d913e30fd56c955c49a796a78e2f7d068ccdfdeb2b13ee68458612a40e6a7130e4e8d30661136cee888e7319cecce6899 SHA512 60948e0e45ea8628d6041448d4152696e3026e9d8d7dd4441977a0f8496976fb16cb8578d549287ab9d1a783cc764c9d7c3041d1e47bf1c789b5ff9a34a66dc1
 DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
+DIST gettext-0.22.tar.xz 10008808 BLAKE2B e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5 SHA512 c6368344aa4e0f6fd7c4a93023a5f7b377c7bb97b8ea688fd54f4c385c069d9ff27611d8763b1aed6328b6d3c4db7b34bd89bfbf6525ecaef11eb58434a4d4fa
+DIST gettext-0.22.tar.xz.sig 833 BLAKE2B d1718f02100abc2c7c67e5c6a49000baee5244030fcef33f099fac255562211332b0c7838d329e2cdd2c99c5b4e5d4bfed6da81cdddd86a4adf9f24f626c8704 SHA512 2d4f0ea68150aa9f7da315545bd782f0c74d581ec89f60ca5138d069cc6ef0296f85df6e05f0c7f030dc8660a8db32529d237497473f6cef7c72034adcc58a9b
 EBUILD libintl-0.21.1.ebuild 2725 BLAKE2B 6213eda4c30383cbcd8d90f4041af79b92377dbd719243ef0b6ddd31d182e42730b2ad4c556f3e4549a5cde49264cffcaae147fc36de7fb4f7475d9786680234 SHA512 e91a802db10a0ece6710644928e7bc4050b5f0e63da0001166c7f6b827fb1d155edcc252fb1a9310d1b2e6855bf8ea0585711437684fc6cfcd5ed7fb6b240407
+EBUILD libintl-0.22.ebuild 2689 BLAKE2B d7f85353c207cdec98e91b70a74366c73c970f15beae19d6a0ea4042b29b66bd088f2c09ff647c008aad82607ed7415358e9ec1fbbe98dfd4755aa5b4ea31170 SHA512 3449396a3fce924abe11e0dec32ad11a18d0a9f7876765c18e9ef9959e7d08959ef7d7add4d5073ec3b0d540511db9c13b88b2518433e1473203b11f6a0c97ed
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.22.ebuild b/dev-libs/libintl/libintl-0.22.ebuild
new file mode 100644
index 000000000000..e27a8e2c642e
--- /dev/null
+++ b/dev-libs/libintl/libintl-0.22.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: Keep version bumps in sync with sys-devel/gettext.
+
+EAPI=8
+
+MY_P="gettext-${PV}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc
+inherit multilib-minimal libtool usr-ldscript verify-sig
+
+DESCRIPTION="the GNU international library (split out of gettext)"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( mirror://gnu/gettext/${MY_P}.tar.xz.sig )"
+S="${WORKDIR}/${MY_P}/gettext-runtime"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs +threads"
+
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
+# Block C libraries known to provide libintl.
+RDEPEND="
+	${DEPEND}
+	!sys-libs/glibc
+	!sys-libs/musl
+	!<sys-devel/gettext-0.19.6-r1
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gettext )"
+
+src_prepare() {
+	default
+
+	cd "${WORKDIR}/${MY_P}" || die
+
+	# gettext-0.21.1-java-autoconf.patch changes
+	# gettext-{runtime,tools}/configure.ac and the corresponding
+	# configure scripts. Avoid regenerating other autotools output.
+	#touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die
+	# Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac
+	#touch -c configure || die
+
+	cd "${S}" || die
+
+	# The libtool files are stored higher up, so make sure we run in the
+	# whole tree and not just the subdir we build.
+	elibtoolize "${WORKDIR}"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--cache-file="${BUILD_DIR}"/config.cache
+
+		# Emacs support is now in a separate package.
+		--without-emacs
+		--without-lispdir
+		# Normally this controls nls behavior in general, but the libintl
+		# subdir is skipped unless this is explicitly set.  ugh.
+		--enable-nls
+		# This magic flag enables libintl.
+		--with-included-gettext
+		# The gettext package provides this library.
+		--disable-c++
+		--disable-libasprintf
+		# No Java until someone cares.
+		--disable-java
+
+		$(use_enable static-libs static)
+		$(use_enable threads)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	# We only need things in the intl/ subdir.
+	emake -C intl
+}
+
+multilib_src_install() {
+	# We only need things in the intl/ subdir.
+	emake DESTDIR="${D}" install -C intl
+
+	gen_usr_ldscript -a intl
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${ED}" -type f -name "*.la" -delete || die
+	fi
+
+	rm -r "${ED}"/usr/share/locale || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 1feb4846ac97..63ce9c9028a2 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,5 +1,8 @@
 AUX libksba-1.6.0-no-fgrep-ksba-config.patch 636 BLAKE2B 5a24f231225d77835b62c3acc1fe5f36b9c9cc8d99d0ab0e86c3de34d49211f660105a8f9b4fe9e3b0ba0fec5ce9a6bceaebb31bbcbd80d7e623be69f17aa8a4 SHA512 8393052c0d1338e51cac150db5aa4f6b9607f437a13c0d58be22e9f7975f031d757790accb053db0c621a76ebc1b1603721f6d79f90f0d515aecf525e5b65999
 DIST libksba-1.6.3.tar.bz2 668287 BLAKE2B a2b474aa5ea8eb387a2d9a459ec1e3daf36bbe7fd9d41a6f4c663ab443f46b98f12064cd6b2f039f5b30e1e2c9cbc4d01b43f8e125d13494c87f5b2d0f973d3b SHA512 188f6d27b4904c10cd54ba949c1132dd6c167f53dd1b77eae39c5b8e3ac8b15e87b2a54cdfddac95ac4ed41ee83c3d4e1b17d95126f245b6c204fade6739a2ce
 DIST libksba-1.6.3.tar.bz2.sig 119 BLAKE2B c6ab01889e7d7efa6117b388c8bf8e1916a3d5c174659b01a34a60bcf8e04181aaf60c79ebd8ab423300f19de084a7968db9b9afd8aa5980246d9ce3f91d66d2 SHA512 57081497e32af41abbe84678dfb2379318ae75fdde1f871f3960b7dce7270b952a832b64accbb2a1f19fbef8db9f4d35ac59890ac6cbe45215a65f6971ba43f1
+DIST libksba-1.6.4.tar.bz2 668445 BLAKE2B 639be954727e2c3a74e075c52090bc2d9998a149f168ede376520d83a7dfd776212ba2948270096b303803e9f41381747f73c8ec97117a4d743b8df49defef9a SHA512 07bc26584d1901b2975a02012d90084e3c247a7aeab56d7bcc7197ef0210ece0c4ffd5cb468b998ef696deadfcfdc5fa5dc367077863926503e8f7a8d06856a5
+DIST libksba-1.6.4.tar.bz2.sig 119 BLAKE2B 5b9edcf65eb7b46182144a8d17a1656ada93a8a7ce3106ea5f525ab3e892b078f9c723544c13702d6d3b40fefd2bff78dc0cfbc3b1a3c156ba18740ecfc42ce6 SHA512 fbf75e03b9e0e771027acfef8cc702744a0d1fe37ef285fcf6475d4a58f7936d3bc890ee3ffe923195152bbcede807ba721ac3fdfdd6d05a1a523416f64ff8c1
 EBUILD libksba-1.6.3.ebuild 1701 BLAKE2B 24f2400de001198cd1f0b0677df57c5e9eaf1c9f5c0fc42dea1b5f3cd572476fd096f2c16de5670806e6fee425bcd1f72c5292d98b8ea190cc82c6c7cdf55025 SHA512 59b4d9a3f7dfb92b5f58072acee93f975674dfee740e3302f4d4da2719352ee8f170c3768743f9b8f8d5ae89d6562934d903a1e21c042ec7a9436d938b10de5d
+EBUILD libksba-1.6.4.ebuild 1710 BLAKE2B c95fc371e9ef8bf2f7741669fe8922b56ef30cc7a68e3c85d4916e7fb1a4500c1376f7a0a3a379b46673bdb87f85153162ea41d80759cbf21bab1fc134285d5d SHA512 5b9f3d04fb5a3b853f751c5d96f49663f14ac1b1bb52da7b7f4782d8d8ca2aa050eed558df749cfa77ebd77e3dffdcb1b442eebdf6d2f26951ed546f8a7eab1c
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.6.4.ebuild b/dev-libs/libksba/libksba-1.6.4.ebuild
new file mode 100644
index 000000000000..3edea2dadd89
--- /dev/null
+++ b/dev-libs/libksba/libksba-1.6.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit toolchain-funcs verify-sig libtool
+
+DESCRIPTION="X.509 and CMS (PKCS#7) library"
+HOMEPAGE="https://www.gnupg.org/related_software/libksba"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="LGPL-3+ GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.33"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize  # necessary on Solaris for shared lib support
+}
+
+src_configure() {
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	local myeconfargs=(
+		--disable-valgrind-tests
+		$(use_enable static-libs static)
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# People need to use ksba-config for --cflags and --libs
+	find "${ED}" -type f -name '*.la' -delete || die
+}