8 files changed, 4 insertions, 303 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 13ab679a6987..f318eb266d7a 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 7ada9f48cb86..bbbff523d450 100644
--- a/app-arch/createrepo_c/Manifest
+++ b/app-arch/createrepo_c/Manifest
@@ -1,7 +1,4 @@
-AUX createrepo_c-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch 547 BLAKE2B 5d7379d00759d693a1fca50c060b619a4d9c7696c00c8512fc06f52b1c9af34408106954d9dadfd6b88ac6f94e4de6c23cdba4b4a4c97952859ed32b024f315c SHA512 d9b6c315ac6591077b11574699196c7b1c671140f3278c075db6c5c4c46e2fc4b40ca33ced258e7439d0ce7039f422a0b528ba0d490cd04f9312324b001dd6c0
-AUX createrepo_c-0.20.1-use-gio-instead-of-cp.patch 7174 BLAKE2B 0c9c70cb137e749f15cc9b3ed905c09234c29ed6f5062278c542382be34fadec6430c3efe9d5baa0d0f76d9a004167a72caf388281fff621a0639ebf215786e8 SHA512 94e82ff327030ae72eb4f07010ef52b03cb0ac1830b176ce438adfec9c2bbacc94c9661ac362e758489e799dbd9b467799933cb77f1fbf6a7823798c7bbf2311
-DIST createrepo_c-0.20.1.tar.gz 614968 BLAKE2B 8eb35c121e1beaa960310d10bfe616799b3a6b13d99f1e8c9d4077975cc929c9f786dec7d26a17d7efbd1859e2e7d8a614147c36a0a82c87f1c1c1a652afa6f3 SHA512 54a2cc7c7cd3f3b9a0c23cd8c136ae1331e7fa7cc995189088e7e6f2276c78b2b84e21c2a2b93f4528b5e9e4018dd6525262c8aaba3bc8a1412a51dfafd101f7
-EBUILD createrepo_c-0.20.1-r1.ebuild 1566 BLAKE2B 32c67e483e2637deecfbb76233b8377571c59b530bfc5beb9df99c31fb85adeacfeaebbb9c042cd2e0bdbf3222c7818419bb36c0d17cc8f47033265b78143428 SHA512 1ad53fcdc729d1a1d61d47d1701b8f46a676384399a00d9e2c92667d21ff79f17037512e90ae4dc79f905d29f54b3aedac1bb19b2993346c3923aa09a20cccf0
-EBUILD createrepo_c-0.20.1.ebuild 978 BLAKE2B 0206efeb167f932d0565005e5d8e274d4251adf4dd8d46672a9652906b2f901d459103b3beac7eecf7f79a50d4c81afa19c27b3a989b4f45612f76a281bb7ddd SHA512 18e5a7aab9240fcb8026d0a25709dcccb57fe1c4781895e1e649b673a913b11f8dd7d3d2ff9c8347644707f0a4147bf47d7d99a8ad1a9af36ad3e3e4fe489c26
+DIST createrepo_c-0.21.1.tar.gz 626012 BLAKE2B 87e7fff68bb06c9552ea80eada625e58130d171db48b0a1aa4965150b136e62c656e368e1bc7cc057e5fad105fff620bb37e171e367eb688725d2089e4181db4 SHA512 453b857ecde5aa63f57e4a783855e4f4c32a041b68c0bfbb5d5b06bc0010d6cd043ba374cb880cce1d0de160a37df2df2688e9886bf9c8d92c09fe530aa36dfe
+EBUILD createrepo_c-0.21.1.ebuild 1441 BLAKE2B c0563513acd9ea5a2ae69db10cd540e820b7d79dc560a652123d7952b7d296884628f8156cdd1c39d464ebc005dcae99f143aa911934db30562828773841c3c7 SHA512 cf76abec9065ed2b9a98cb3a5e741ad898ae41b25f667157ecf2c3bb1d8df354b2d38dd04883747e1d800b8039eb73cd48b7293fd55e4c041eb532440a5f1b55
 EBUILD createrepo_c-9999.ebuild 1436 BLAKE2B 4383e35a05f083c7796646afb032d3c77e67aa002941c144ed86727a65f84cafbbc2d999d794220a41eb170b6f29f622f3c8aad2f16e5ad26ba36b5b515d76f8 SHA512 4076a55fa4c0a1fdc5f641453840a6255880f85323c322677ce781648713d586f8e694a5d75d061f57c4e3beb49185c9b98189cc399ab79073976ef658e153b5
 MISC metadata.xml 828 BLAKE2B 13ea8960341f448e8abb558701208a46dd0150ec12080efc456a51949120c46bf7621adb8591d6ed52be7ccee7572d924dfa764209ed442be74eb5b6a9f153db SHA512 9c6dbdad0aff7e4f2d309f1352848f75a4d59f7069bc7b46bc3d013e72d56bad6411051b2763e6dc644e6041ac291422de8afa6a2d4fcb49847f31267cb9f78d
diff --git a/app-arch/createrepo_c/createrepo_c-0.20.1.ebuild b/app-arch/createrepo_c/createrepo_c-0.20.1.ebuild
deleted file mode 100644
index 91a1e6965990..000000000000
--- a/app-arch/createrepo_c/createrepo_c-0.20.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 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"
-SRC_URI="https://github.com/rpm-software-management/createrepo_c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Notes: Help with enabling the python support would be great
-
-DEPEND="app-arch/bzip2:=
-	app-arch/rpm
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/openssl:=
-	net-misc/curl
-	sys-apps/file
-	sys-libs/zlib:="
-RDEPEND="${DEPEND}
-	app-arch/lzma"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch
-)
-
-src_configure() {
-	# Other than for python (where tests are failing) we have special no-in-tree dependencies.
-	local mycmakeargs=(
-		-DENABLE_DRPM=OFF
-		-DENABLE_PYTHON=OFF
-		-DWITH_ZCHUNK=OFF
-		-DWITH_LIBMODULEMD=OFF
-	)
-	cmake_src_configure
-}
diff --git a/app-arch/createrepo_c/createrepo_c-0.20.1-r1.ebuild b/app-arch/createrepo_c/createrepo_c-0.21.1.ebuild
index 9ee847323179..7433f2a6011f 100644
--- a/app-arch/createrepo_c/createrepo_c-0.20.1-r1.ebuild
+++ b/app-arch/createrepo_c/createrepo_c-0.21.1.ebuild
@@ -39,11 +39,6 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-Include-rpm-rpmstring.h-for-rasprintf.patch"
-	"${FILESDIR}/${P}-use-gio-instead-of-cp.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DRPM=ON
diff --git a/app-arch/createrepo_c/files/createrepo_c-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch b/app-arch/createrepo_c/files/createrepo_c-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch
deleted file mode 100644
index f7df38935aed..000000000000
--- a/app-arch/createrepo_c/files/createrepo_c-0.20.1-Include-rpm-rpmstring.h-for-rasprintf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/rpm-software-management/createrepo_c/pull/328
-
-From cddd4c161523cf4340aa59f832d130e7c34ffd14 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 19 Oct 2022 03:10:06 +0100
-Subject: [PATCH] Include <rpm/rpmstring.h> for rasprintf
-
-Fixes build with Clang 16.
-
-Bug: https://bugs.gentoo.org/875698
---- a/src/xml_file.c
-+++ b/src/xml_file.c
-@@ -20,6 +20,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <assert.h>
-+#include <rpm/rpmstring.h>
- #include "xml_file.h"
- #include <errno.h>
- #include "error.h"
diff --git a/app-arch/createrepo_c/files/createrepo_c-0.20.1-use-gio-instead-of-cp.patch b/app-arch/createrepo_c/files/createrepo_c-0.20.1-use-gio-instead-of-cp.patch
deleted file mode 100644
index c0b92d6b9994..000000000000
--- a/app-arch/createrepo_c/files/createrepo_c-0.20.1-use-gio-instead-of-cp.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-https://github.com/rpm-software-management/createrepo_c/pull/341
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Thu, 26 Jan 2023 01:48:16 +1100
-Subject: [PATCH 1/3] Add `cr_gio_cp` and deprecate `cr_cp`
-
-It's preferable to use glib gio to copy files rather than
-rely on the behaviour of the system cp binary.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
- SET(G_LOG_DOMAIN "C_CREATEREPOLIB")
- 
- # Find necessary libraries
--
-+find_package(PkgConfig)
- find_package(BZip2 REQUIRED)
- find_package(CURL REQUIRED)
- find_package(LibXml2 REQUIRED)
-@@ -40,6 +40,7 @@ find_package(OpenSSL REQUIRED)
- find_package(ZLIB REQUIRED)
- 
- pkg_check_modules(GLIB2 REQUIRED glib-2.0)
-+pkg_check_modules(GIO REQUIRED gio-2.0)
- pkg_check_modules(GTHREAD2 REQUIRED gthread-2.0)
- pkg_check_modules(LZMA REQUIRED liblzma)
- pkg_check_modules(SQLITE3 REQUIRED sqlite3)
-@@ -57,6 +58,7 @@ ENDIF()
- include_directories(${BZIP2_INCLUDE_DIRS})
- include_directories(${CURL_INCLUDE_DIRS})
- include_directories(${GLIB2_INCLUDE_DIRS})
-+include_directories(${GIO_INCLUDE_DIRS})
- include_directories(${LIBXML2_INCLUDE_DIR})
- include_directories(${OPENSSL_INCLUDE_DIR})
- include_directories(${ZLIB_INCLUDE_DIR})
-@@ -154,4 +156,3 @@ ADD_SUBDIRECTORY (src)
- ADD_SUBDIRECTORY (doc)
- ENABLE_TESTING()
- ADD_SUBDIRECTORY (tests EXCLUDE_FROM_ALL)
--
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -70,6 +70,7 @@ ADD_LIBRARY(libcreaterepo_c ${createrepo_c_library_type} ${createrepo_c_SRCS})
- TARGET_LINK_LIBRARIES(libcreaterepo_c ${BZIP2_LIBRARIES})
- TARGET_LINK_LIBRARIES(libcreaterepo_c ${CURL_LIBRARY})
- TARGET_LINK_LIBRARIES(libcreaterepo_c ${GLIB2_LIBRARIES})
-+TARGET_LINK_LIBRARIES(libcreaterepo_c ${GIO_LIBRARIES})
- TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBMAGIC_LIBRARIES})
- TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBMODULEMD_LIBRARIES})
- TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBXML2_LIBRARIES})
---- a/src/helpers.c
-+++ b/src/helpers.c
-@@ -19,6 +19,7 @@
- 
- #include <glib.h>
- #include <glib/gstdio.h>
-+#include <gio/gio.h>
- #include <errno.h>
- #include <string.h>
- #include <time.h>
-@@ -448,10 +449,9 @@ cr_old_metadata_retention(const char *old_repo,
-             continue;
-         }
- 
--        // COPY!
--        cr_cp(full_path,
--              new_full_path,
--              CR_CP_RECURSIVE|CR_CP_PRESERVE_ALL,
-+        cr_gio_cp(g_file_new_for_path(full_path),
-+              g_file_new_for_path(new_full_path),
-+              G_FILE_COPY_ALL_METADATA,
-               NULL,
-               &tmp_err);
- 
-@@ -476,5 +476,3 @@ cr_old_metadata_retention(const char *old_repo,
- 
-     return ret;
- }
--
--
---- a/src/misc.c
-+++ b/src/misc.c
-@@ -21,6 +21,7 @@
- 
- #include <glib/gstdio.h>
- #include <glib.h>
-+#include <gio/gio.h>
- #include <arpa/inet.h>
- #include <assert.h>
- #include <curl/curl.h>
-@@ -794,8 +795,6 @@ cr_download(CURL *in_handle,
-     return CRE_OK;
- }
- 
--
--
- gboolean
- cr_better_copy_file(const char *src, const char *in_dst, GError **err)
- {
-@@ -820,7 +819,6 @@ cr_better_copy_file(const char *src, const char *in_dst, GError **err)
-     return TRUE;
- }
- 
--
- int
- cr_remove_dir_cb(const char *fpath,
-                  G_GNUC_UNUSED const struct stat *sb,
-@@ -856,7 +854,7 @@ gboolean
- cr_move_recursive(const char *srcDir, const char *dstDir, GError **err)
- {
-     if (rename(srcDir, dstDir) == -1) {
--        if (!cr_cp(srcDir, dstDir, CR_CP_RECURSIVE, NULL, err))
-+        if (!cr_gio_cp(g_file_new_for_path(srcDir), g_file_new_for_path(dstDir), G_FILE_COPY_ALL_METADATA, NULL, err))
-             return FALSE;
-         return (cr_remove_dir(srcDir, err) == CRE_OK);
-     }
-@@ -1425,6 +1423,44 @@ cr_cp(const char *src,
-     return ret;
- }
- 
-+gboolean
-+cr_gio_cp(GFile *src,
-+      GFile *dst,
-+      GFileCopyFlags flags,
-+      GCancellable *cancellable,
-+      GError **err)
-+{
-+    assert(src);
-+    assert(dst);
-+    assert(!err || *err == NULL);
-+
-+    GFileType type = g_file_query_file_type(src, G_FILE_QUERY_INFO_NONE, NULL);
-+
-+    if (type == G_FILE_TYPE_DIRECTORY) {
-+        g_file_make_directory(dst, cancellable, err);
-+        g_file_copy_attributes(src, dst, flags, cancellable, err);
-+
-+        GFileEnumerator *enumerator = g_file_enumerate_children(src, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NONE, cancellable, err);
-+        for (GFileInfo *info = g_file_enumerator_next_file(enumerator, cancellable, err); info != NULL; info = g_file_enumerator_next_file(enumerator, cancellable, err)) {
-+            const char *relative_path = g_file_info_get_name(info);
-+            cr_gio_cp(
-+                g_file_resolve_relative_path(src, relative_path),
-+                g_file_resolve_relative_path(dst, relative_path),
-+                flags, cancellable, err);
-+        }
-+    } else if (type == G_FILE_TYPE_REGULAR) {
-+        g_file_copy(src, dst, flags, cancellable, NULL, NULL, err);
-+    }
-+
-+    if (err != NULL) {
-+        return TRUE;
-+    }
-+    else {
-+        return FALSE;
-+    }
-+
-+}
-+
- gboolean
- cr_rm(const char *path,
-       cr_RmFlags flags,
---- a/src/misc.h
-+++ b/src/misc.h
-@@ -26,6 +26,7 @@ extern "C" {
- 
- #include <glib.h>
- #include <string.h>
-+#include <gio/gio.h>
- #include <curl/curl.h>
- #include "compression_wrapper.h"
- #include "xml_parser.h"
-@@ -449,7 +450,7 @@ typedef enum {
-         preserve the all attributes (if possible) */
- } cr_CpFlags;
- 
--/** Recursive copy of directory (works on files as well)
-+/** Wrapper for cp
-  * @param src           Source (supports wildcards)
-  * @param dst           Destination (supports wildcards)
-  * @param flags         Flags
-@@ -461,6 +462,20 @@ cr_cp(const char *src,
-       const char *dst,
-       cr_CpFlags flags,
-       const char *working_directory,
-+      GError **err) __attribute__ ((deprecated ("please use `cr_gio_cp` instead")));
-+
-+/** Recursive copy of directory (works on files as well)
-+ * @param src           Source (supports wildcards)
-+ * @param dst           Destination (supports wildcards)
-+ * @param flags         Flags
-+ * @param cancellable   Can this be cancelled by another thread?
-+ * @param err           GError **
-+ */
-+gboolean
-+cr_gio_cp(GFile *src,
-+      GFile *dst,
-+      GFileCopyFlags flags,
-+      GCancellable *cancellable,
-       GError **err);
- 
- typedef enum {
-
-From 9fa5809150d2021186d4a822c38d5488cd4986dc Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Fri, 27 Jan 2023 18:17:23 +1100
-Subject: [PATCH 2/3] Add to AUTHORS
-
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -10,3 +10,4 @@ Neal Gompa <ngompa13@gmail.com>
- Ralph Bean <rbean@redhat.com>
- Frank Schreiner <schreiner@suse.de>
- Daniel Alley <dalley@redhat.com>
-+Matt Jolly <matt.jolly@footclan.ninja>
-
-From e6769f0e343cbeea1beee703b984307634691677 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Fri, 27 Jan 2023 20:06:21 +1100
-Subject: [PATCH 3/3] Update minimum CMake version
-
-Modern CMake warns of deprecation of <2.8.12, let's use that instead
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- PROJECT (createrepo_c C)
--CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10)
-+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)
- 
- include(GNUInstallDirs)
- 
diff --git a/app-arch/zchunk/Manifest b/app-arch/zchunk/Manifest
index 0dc785457e18..eb065be87d5d 100644
--- a/app-arch/zchunk/Manifest
+++ b/app-arch/zchunk/Manifest
@@ -1,4 +1,4 @@
-DIST zchunk-1.2.3.tar.gz 1508271 BLAKE2B 7432289f3730083d0634c32f03d1daf2570c21e94ebab0aabeee4527f7ba56aef5cc567dfdb8ede701bea5d0cda4f248f0cf0fdb04e4f5ee1effb888a2907ec9 SHA512 5e46d8c3e36034de8424937cdfac59acdfaf332203e6e5d8b290614cbbe0340998d53b0583b0ef93189f41dc89219a75f50572757ebcea9abd83bd9aad861a73
-EBUILD zchunk-1.2.3.ebuild 705 BLAKE2B c04697ec4edc4ad3f1f1ba772b7b5910b91a73e5c06a82db5547a88872ea807fb75eaae4a1ce1a34209ef3a8e5b7f7c17d11892b149523e6ed8992195c422606 SHA512 741d1dd28733df18d334eb4e05bf8628ac6186cd90ffb14a651ee4cc093c41012be3001741c3a8b73823ee4104a8c854b7c373ec294719aa4912d046e272e5b0
+DIST zchunk-1.3.1.tar.gz 1508699 BLAKE2B a0c6c277b8fd940602c6de680ee3418decdb0f83e3ea345f0c884f704bda67938539ec15a3b0fb1f5e498bb7fa1c420637091c752d8dea6094de3eb98503efb1 SHA512 5eec3ee084f3192291f5956dc797275986ebaa004df580be73de18ff22a781b6c5362bedc6263c9ae3569e5fa12cf5225d87aed7ec4ddfa6210f5c92763566e5
+EBUILD zchunk-1.3.1.ebuild 705 BLAKE2B c04697ec4edc4ad3f1f1ba772b7b5910b91a73e5c06a82db5547a88872ea807fb75eaae4a1ce1a34209ef3a8e5b7f7c17d11892b149523e6ed8992195c422606 SHA512 741d1dd28733df18d334eb4e05bf8628ac6186cd90ffb14a651ee4cc093c41012be3001741c3a8b73823ee4104a8c854b7c373ec294719aa4912d046e272e5b0
 EBUILD zchunk-9999.ebuild 705 BLAKE2B c04697ec4edc4ad3f1f1ba772b7b5910b91a73e5c06a82db5547a88872ea807fb75eaae4a1ce1a34209ef3a8e5b7f7c17d11892b149523e6ed8992195c422606 SHA512 741d1dd28733df18d334eb4e05bf8628ac6186cd90ffb14a651ee4cc093c41012be3001741c3a8b73823ee4104a8c854b7c373ec294719aa4912d046e272e5b0
 MISC metadata.xml 481 BLAKE2B f6888c5e64deafa0b7f52a0f1b4c611c610108d91b7f8fd831f49ebc5fe67e5fae1c57e7bef2c1a51510b9beab33ace6aaa25bf6f88ce0d10f39d7c8479b7d06 SHA512 16d3ff19941ec61f62377ea01af9cfa0bc428e05f21610105ab02b3f9ad9464a28e74f2709249014f1720e7c2dd13cc8b3b7d02a880d8a785231af29d7e7b5c2
diff --git a/app-arch/zchunk/zchunk-1.2.3.ebuild b/app-arch/zchunk/zchunk-1.3.1.ebuild
index e89d8926554d..e89d8926554d 100644
--- a/app-arch/zchunk/zchunk-1.2.3.ebuild
+++ b/app-arch/zchunk/zchunk-1.3.1.ebuild