6 files changed, 246 insertions, 3 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 3b40bc652e39..72d26ed4f2e5 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/createrepo_c/Manifest b/app-arch/createrepo_c/Manifest
index bbbff523d450..25d55da4dcb1 100644
--- a/app-arch/createrepo_c/Manifest
+++ b/app-arch/createrepo_c/Manifest
@@ -1,4 +1,6 @@
 DIST createrepo_c-0.21.1.tar.gz 626012 BLAKE2B 87e7fff68bb06c9552ea80eada625e58130d171db48b0a1aa4965150b136e62c656e368e1bc7cc057e5fad105fff620bb37e171e367eb688725d2089e4181db4 SHA512 453b857ecde5aa63f57e4a783855e4f4c32a041b68c0bfbb5d5b06bc0010d6cd043ba374cb880cce1d0de160a37df2df2688e9886bf9c8d92c09fe530aa36dfe
+DIST createrepo_c-1.0.0.tar.gz 628628 BLAKE2B fed99e3eb7e2bb6dc9a045abb0c35c00bf4a733a1a70780109cda00b0db0bcf2ab96b466fcd4ce5b063642e900a6fb3d853870ea3af28da6c2b3af3655a49b2e SHA512 b412dd56c4e0b69467708a3646bf276b9c3a970b2f89f269b5c65a4efb961ed42769b9fca9d333588d2726e85fc80050a83a2e5b83e296f7e8b028ddd2bf9cf9
 EBUILD createrepo_c-0.21.1.ebuild 1441 BLAKE2B c0563513acd9ea5a2ae69db10cd540e820b7d79dc560a652123d7952b7d296884628f8156cdd1c39d464ebc005dcae99f143aa911934db30562828773841c3c7 SHA512 cf76abec9065ed2b9a98cb3a5e741ad898ae41b25f667157ecf2c3bb1d8df354b2d38dd04883747e1d800b8039eb73cd48b7293fd55e4c041eb532440a5f1b55
-EBUILD createrepo_c-9999.ebuild 1436 BLAKE2B 4383e35a05f083c7796646afb032d3c77e67aa002941c144ed86727a65f84cafbbc2d999d794220a41eb170b6f29f622f3c8aad2f16e5ad26ba36b5b515d76f8 SHA512 4076a55fa4c0a1fdc5f641453840a6255880f85323c322677ce781648713d586f8e694a5d75d061f57c4e3beb49185c9b98189cc399ab79073976ef658e153b5
+EBUILD createrepo_c-1.0.0.ebuild 1500 BLAKE2B 1d6c2fc12bbf9a7ca94e2d4ac778f68344281335bbecd800eb597fc7e66a25fbd710f8c6866fe431d2e745b284d42f5b95f94d95bd019d890c3c91d19ffe7cec SHA512 b525ccc209777258f80d91a686ba2255eeb6861590d52ad3d9a33ef95e52768068f854ff8526174b27f9d1091182e3311cec12a24fbe8503aef9be8a5ba6c2e8
+EBUILD createrepo_c-9999.ebuild 1500 BLAKE2B 1d6c2fc12bbf9a7ca94e2d4ac778f68344281335bbecd800eb597fc7e66a25fbd710f8c6866fe431d2e745b284d42f5b95f94d95bd019d890c3c91d19ffe7cec SHA512 b525ccc209777258f80d91a686ba2255eeb6861590d52ad3d9a33ef95e52768068f854ff8526174b27f9d1091182e3311cec12a24fbe8503aef9be8a5ba6c2e8
 MISC metadata.xml 828 BLAKE2B 13ea8960341f448e8abb558701208a46dd0150ec12080efc456a51949120c46bf7621adb8591d6ed52be7ccee7572d924dfa764209ed442be74eb5b6a9f153db SHA512 9c6dbdad0aff7e4f2d309f1352848f75a4d59f7069bc7b46bc3d013e72d56bad6411051b2763e6dc644e6041ac291422de8afa6a2d4fcb49847f31267cb9f78d
diff --git a/app-arch/createrepo_c/createrepo_c-1.0.0.ebuild b/app-arch/createrepo_c/createrepo_c-1.0.0.ebuild
new file mode 100644
index 000000000000..a9a502907e62
--- /dev/null
+++ b/app-arch/createrepo_c/createrepo_c-1.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C implementation of createrepo"
+HOMEPAGE="https://github.com/rpm-software-management/createrepo_c"
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rpm-software-management/createrepo_c.git"
+else
+	SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="legacy test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/drpm
+	app-arch/rpm
+	app-arch/xz-utils
+	app-arch/zchunk
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	net-misc/curl
+	sys-apps/file
+	sys-libs/libmodulemd
+	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DRPM=ON
+		# As best I can tell, this enables distribution as a wheel. No need for this on gentoo!
+		-DENABLE_PYTHON=OFF
+		# Upstream enables some 'Legacy' stuff by default, let's put that behind a USE flag
+		-DENABLE_LEGACY_WEAKDEPS=$(usex legacy ON OFF)
+		-DWITH_LEGACY_HASHES=$(usex legacy ON OFF)
+		-DWITH_LIBMODULEMD=ON
+		-DWITH_ZCHUNK=ON
+		-DWITH_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	# Tests have a magic target!
+	use test && cmake_src_compile tests
+}
+
+src_test() {
+	"${S}"_build/tests/run_tests.sh || die "Failed to run C library tests"
+}
diff --git a/app-arch/createrepo_c/createrepo_c-9999.ebuild b/app-arch/createrepo_c/createrepo_c-9999.ebuild
index da19ee9ac2f3..a9a502907e62 100644
--- a/app-arch/createrepo_c/createrepo_c-9999.ebuild
+++ b/app-arch/createrepo_c/createrepo_c-9999.ebuild
@@ -12,13 +12,13 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/rpm-software-management/createrepo_c.git"
 else
 	SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="legacy test"
+IUSE="legacy test zstd"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -35,6 +35,7 @@ DEPEND="
 	sys-apps/file
 	sys-libs/libmodulemd
 	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
 "
 
 RDEPEND="${DEPEND}"
@@ -49,6 +50,7 @@ src_configure() {
 		-DWITH_LEGACY_HASHES=$(usex legacy ON OFF)
 		-DWITH_LIBMODULEMD=ON
 		-DWITH_ZCHUNK=ON
+		-DWITH_ZSTD=$(usex zstd)
 	)
 
 	cmake_src_configure
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 1bcac4925c0f..5df55887e137 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,5 +1,7 @@
 AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec
+DIST rpm-4.18.1.tar.bz2 6396363 BLAKE2B 4bc582bdc34a89d83346a8e18133c4f1846f2e8741c85ae2d0fd3398166e5a5d81ed86869e34700d3ea414fbf8ccf6c918692e865b956b1e6b70830b64cd323e SHA512 0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c
 EBUILD rpm-4.18.0.ebuild 4096 BLAKE2B 371c8d3817a9d9046dd62dd333a6d95f93378fb5ae43cdf1ec51705caf85a94444b580f07cd32bdf9eb4779681f281328d8a651464975563c0d2291f676bd669 SHA512 91e71e8f963100fbafe72aa4b3119db70112398ed728e425df59e13dcf530c8856a55ac6d6ca9273a08588479765b669711b70d342bd7880b142e3c0eb5aef4d
+EBUILD rpm-4.18.1.ebuild 4086 BLAKE2B 22c280c3e628dab27b308b6d99f1e481043d1c978f69287e3608e6afeea34ab911c67f99774b479c0aeb3357647f5d369986f12ad29fd1e91dd1f2803774947c SHA512 5a5a4c42fd611c770a1d2b287e7d6d5048a0a62ef150f8bd7cb342737b662234f03d306b011b723eb2632b8596b7d0e55d7eb3385ee565ba8544fd388dabd4b0
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/rpm-4.18.1.ebuild b/app-arch/rpm/rpm-4.18.1.ebuild
new file mode 100644
index 000000000000..c503e5487ff0
--- /dev/null
+++ b/app-arch/rpm/rpm-4.18.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{3,4} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools lua-single perl-module python-single-r1 toolchain-funcs
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="https://rpm.org/ https://github.com/rpm-software-management/rpm"
+SRC_URI="
+	https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
+	http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl audit caps +berkdb doc dbus nls openmp python readline selinux +sqlite test +zstd"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+# Tests are broken. See bug #657500
+RESTRICT="test"
+
+DEPEND="
+	${LUA_DEPS}
+	!app-arch/rpm5
+	app-arch/libarchive:=
+	>=app-arch/bzip2-1.0.1
+	app-arch/xz-utils
+	>=app-crypt/gnupg-1.2
+	>=dev-lang/perl-5.8.8
+	dev-libs/elfutils
+	dev-libs/libgcrypt:=
+	>=dev-libs/popt-1.7
+	sys-apps/file
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/libintl
+	acl? ( virtual/acl )
+	audit? ( sys-process/audit )
+	caps? ( >=sys-libs/libcap-2.0 )
+	dbus? ( sys-apps/dbus )
+	readline? ( sys-libs/readline:= )
+	sqlite? ( dev-db/sqlite:3 )
+	python? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	zstd? ( app-arch/zstd:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( sys-apps/fakechroot )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-rpm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.1-db-path.patch
+	"${FILESDIR}"/${PN}-4.17.0-libdir.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	lua-single_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+
+	# bug #779769
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# bug #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+	# bug #492642
+	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+	# Prevent automake maintainer mode from kicking in (bug #450448).
+	#touch -r Makefile.am preinstall.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# rpm no longer supports berkdb, but has readonly support.
+	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
+	local myeconfargs=(
+		--enable-libelf
+		--without-selinux
+		--disable-inhibit-plugin
+		--with-crypto=libgcrypt
+		$(use_enable berkdb bdb-ro)
+		$(use_enable python)
+		$(use_enable nls)
+		$(use_enable openmp)
+		$(use_enable dbus inhibit-plugin)
+		$(use_enable sqlite)
+		$(use_with caps cap)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with readline)
+		$(use_enable zstd zstd $(usex zstd yes no))
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #657500)
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	emake check
+}
+
+src_install() {
+	default
+
+	# Remove la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Fix symlinks to /bin/rpm (bug #349840)
+	for binary in rpmquery rpmverify; do
+		ln -sf rpm "${ED}"/usr/bin/${binary} || die
+	done
+
+	if ! use nls; then
+		rm -rf "${ED}"/usr/share/man/?? || die
+	fi
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CREDITS README*
+	if use doc; then
+		local docname
+		for docname in librpm; do
+			docinto "html/${docname}"
+			dodoc -r "docs/${docname}/html/."
+		done
+	fi
+
+	# Fix perllocal.pod file collision
+	perl_delete_localpod
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
+	fi
+}