gentoo auto-resync : 12:11:2023 - 10:27:42

6 files changed, 98 insertions, 4 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5a0bdcec4960..97b42b0d7692 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/pkgcraft/Manifest b/sys-libs/pkgcraft/Manifest
index c5c495117390..2f16bc9f3566 100644
--- a/sys-libs/pkgcraft/Manifest
+++ b/sys-libs/pkgcraft/Manifest
@@ -1,6 +1,8 @@
 DIST pkgcraft-c-0.0.11.tar.xz 31609776 BLAKE2B 9e341ddedebbfab61543e86eafa074700c9b1e9b415704eb1286419f88257d8c56a40f725855d4c92d7e0223dfe0fb645d4aa4a3849e9684b96943d65d174061 SHA512 75cd8d07c550fb6c60b7743918ff0b462ce3c39adedb537a9b12325ba6e1aab5fe7b138ffecd37bdcc2d94a810f6c9651311d5810f4fe0014410622c36233442
 DIST pkgcraft-c-0.0.12.tar.xz 30086644 BLAKE2B 29f80a345e31c222feb8489635f060d5097f32b010401e71d00603d30532bf90dde8eb79f243c634b3efba2a85c3c284507eda30d69e2e6444cfbd9ddcff503b SHA512 879793b1dfc5a67e7bc24477d9fe74e2c5e81c5c199ba9cf130b395b61cf41f53228269d85a06163ec7f1cc8dcb07f5c7ae51abc964083fbdd46b928b6dc9888
+DIST pkgcraft-c-0.0.13.tar.xz 29526760 BLAKE2B 5d87fcd427fcf5022bd5d9e24a80f52815d8c472b8eccc2d4b916be3b15faed868761c327d49693d6512807cefabd6120ce96772def99e81df0f87933a49caad SHA512 45bb65003ede7d9ae06a97360c5311e9ca75d5718d5107336e9c3511ad766bcda9ef87901bc57142b6d019aa95ebaf2f351fd69bf60a799aa1f904c452234168
 EBUILD pkgcraft-0.0.11-r1.ebuild 1985 BLAKE2B 13922fc7fec4b49b800c07e00ff386648ac88aadb890c5e845c94bc25d0a24b09c9356c9ee035aed516ab6e51961422b3a8fa40c9e2d91e00e780e9cc7a35722 SHA512 2d5f6660d0693a6255987e45f2900d2613e0f90c598446cd87efa3af946b23e77fccdcffa6dc2c06d8cc2b1843a2272fe14cbf6ab5c55db9c8988ad96faffa78
 EBUILD pkgcraft-0.0.12.ebuild 1985 BLAKE2B 13922fc7fec4b49b800c07e00ff386648ac88aadb890c5e845c94bc25d0a24b09c9356c9ee035aed516ab6e51961422b3a8fa40c9e2d91e00e780e9cc7a35722 SHA512 2d5f6660d0693a6255987e45f2900d2613e0f90c598446cd87efa3af946b23e77fccdcffa6dc2c06d8cc2b1843a2272fe14cbf6ab5c55db9c8988ad96faffa78
-EBUILD pkgcraft-9999.ebuild 1985 BLAKE2B 13922fc7fec4b49b800c07e00ff386648ac88aadb890c5e845c94bc25d0a24b09c9356c9ee035aed516ab6e51961422b3a8fa40c9e2d91e00e780e9cc7a35722 SHA512 2d5f6660d0693a6255987e45f2900d2613e0f90c598446cd87efa3af946b23e77fccdcffa6dc2c06d8cc2b1843a2272fe14cbf6ab5c55db9c8988ad96faffa78
+EBUILD pkgcraft-0.0.13.ebuild 1985 BLAKE2B a072516fe65c900e77267d06fbe8d68bc9a73adcb5f26c375975e4dae724ffb8cc55cf41eb2999ba3b4fba9a9372c5b95d3e1402f0eaad5a7838dcc9be73d458 SHA512 70e2491943f670d56f4cefd0d31636b43b919d69403d47a17385885734fd136b459f58e9678c34762cb130016f395e225c0c58ac9ce65d64da9bba1d66e817b0
+EBUILD pkgcraft-9999.ebuild 1985 BLAKE2B a072516fe65c900e77267d06fbe8d68bc9a73adcb5f26c375975e4dae724ffb8cc55cf41eb2999ba3b4fba9a9372c5b95d3e1402f0eaad5a7838dcc9be73d458 SHA512 70e2491943f670d56f4cefd0d31636b43b919d69403d47a17385885734fd136b459f58e9678c34762cb130016f395e225c0c58ac9ce65d64da9bba1d66e817b0
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.13.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.13.ebuild
new file mode 100644
index 000000000000..6e2d264fc8fa
--- /dev/null
+++ b/sys-libs/pkgcraft/pkgcraft-0.0.13.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+inherit edo cargo toolchain-funcs
+
+DESCRIPTION="C library for pkgcraft"
+HOMEPAGE="https://pkgcraft.github.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"
+	inherit git-r3
+
+	S="${WORKDIR}"/${P}/crates/pkgcraft-c
+
+	BDEPEND="test? ( dev-util/cargo-nextest )"
+else
+	MY_P=${PN}-c-${PV}
+	SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${MY_P}/${MY_P}.tar.xz"
+	S="${WORKDIR}"/${MY_P}
+
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0/${PV}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# clang needed for bindgen
+BDEPEND+="
+	dev-util/cargo-c
+	sys-devel/clang
+	>=virtual/rust-1.71
+"
+
+QA_FLAGS_IGNORED="usr/lib.*/libpkgcraft.so.*"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_compile() {
+	local cargoargs=(
+		--library-type=cdylib
+		--prefix=/usr
+		--libdir="/usr/$(get_libdir)"
+		$(usev !debug '--release')
+	)
+
+	# For scallop building bash
+	tc-export AR CC
+
+	# Can pass -vv if need more output from e.g. scallop configure
+	edo cargo cbuild "${cargoargs[@]}"
+}
+
+src_test() {
+	if [[ ${PV} == 9999 ]] ; then
+		# It's interesting to test the whole thing rather than just
+		# pkgcraft-c.
+		cd "${WORKDIR}"/${P} || die
+
+		# Need nextest per README (separate processes required)
+		# Invocation from https://github.com/pkgcraft/pkgcraft/blob/main/.github/workflows/ci.yml#L56
+		edo cargo nextest run $(usev !debug '--release') --color always --all-features --tests
+	else
+		# There are no tests for pkgcraft-c. Test via e.g. dev-python/pkgcraft.
+		:;
+	fi
+}
+
+src_install() {
+	local cargoargs=(
+		--library-type=cdylib
+		--prefix=/usr
+		--libdir="/usr/$(get_libdir)"
+		--destdir="${ED}"
+		$(usev !debug '--release')
+	)
+
+	edo cargo cinstall "${cargoargs[@]}"
+}
diff --git a/sys-libs/pkgcraft/pkgcraft-9999.ebuild b/sys-libs/pkgcraft/pkgcraft-9999.ebuild
index 544df0ae2420..6e2d264fc8fa 100644
--- a/sys-libs/pkgcraft/pkgcraft-9999.ebuild
+++ b/sys-libs/pkgcraft/pkgcraft-9999.ebuild
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 BDEPEND+="
 	dev-util/cargo-c
 	sys-devel/clang
-	>=virtual/rust-1.70
+	>=virtual/rust-1.71
 "
 
 QA_FLAGS_IGNORED="usr/lib.*/libpkgcraft.so.*"
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index 20a841514c39..28f691e6c4ce 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -9,6 +9,6 @@ DIST zlib-1.3.tar.xz 1295740 BLAKE2B 5fe0f32339267348a313f23a21e9588bdb180b7415b
 DIST zlib-1.3.tar.xz.asc 235 BLAKE2B 5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb SHA512 8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6
 EBUILD zlib-1.2.13-r1.ebuild 4668 BLAKE2B a5d0fbbf6d5248157b97fbbcc6ad6b9bf282483d982b288008774e156361120180e572bb793641f892f8c3b998fc15ef6583120af62115838880232f64cb3bc4 SHA512 ae5fcf58a7712464a90a894126e35e68426c3739e8827bb085144b73496b119af7990d3569641b36b09ae9ae97441f057f1f4c7b0a57fe9e397e17651fa3bf45
 EBUILD zlib-1.2.13-r2.ebuild 4750 BLAKE2B d1f29e99bd4671ef6ebfe941f21cc010e4b81ba6c3355c38c3dddcd2dfe395af8d4061b2940dd868d552bdaa8881149570fbef4da3eefbfbfbe8f20fec7d0f30 SHA512 c459dec39b307a52ac6c137a7bb77ec761bc0fc7b5b827731ccd177fa6f24b0dc77c16ce1eb9b9b99d3dda3c51fc0b16eeeadd6e8b053d31edcc12ad612caf18
-EBUILD zlib-1.3-r1.ebuild 4547 BLAKE2B ff4b9b1751202c6748034f5853f3a3d14292f13360bd92fdf1def5001664dba5996ff470539bcd08869460da1dc8cd4138fa27efe480dc397886988cb9019168 SHA512 4102fb0a4ce78c0d668e13b1ab81f35005074e1856af295849053eda4b7f39a7f34a7219368d16eb7dab147206b6fb84afc06147cd907fd4cbba5aa76d2014ca
+EBUILD zlib-1.3-r1.ebuild 4541 BLAKE2B ab38ad6965bb60bc2caed561d3a5c37cda70b04b0ec9e452d618aa11d5e009ddc5a234e1d6414b736fc7048ddf62747709bcb44f6c35d609ea22c434a167b3de SHA512 bbe81ea8deaa665f9056a99525da03af1f2a9128d0b5b0cea99d51d4b8848e235e2cf8024f0db96a0c285b66a45a2805e8b743eab4b266475c308752c0122068
 EBUILD zlib-1.3-r2.ebuild 4629 BLAKE2B 485ffda1e3a8a14995cff29ca1fcced3701c947d0c379185d106a295cd4b372d6b21b1978d54dd2f8d309834442625021ec70979505fd7122e57bc08e7d62ab3 SHA512 3c310c84d55fadd2c67c48012d228b439fc4e6e29a721f1d2941e298cfbb2d68797692833c1962625428e3b497f21fb48817431259e4585d0e1e3dd606e1a962
 MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9
diff --git a/sys-libs/zlib/zlib-1.3-r1.ebuild b/sys-libs/zlib/zlib-1.3-r1.ebuild
index e8da1bdeb307..4a2a1852d9f7 100644
--- a/sys-libs/zlib/zlib-1.3-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.3-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-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"
+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="minizip static-libs"
 
 RDEPEND="!sys-libs/zlib-ng[compat]"