From d1f81cc463f614d713cb83351717e37dfd14c59c Mon Sep 17 00:00:00 2001 From: Eli Burch Date: Fri, 5 Jul 2024 08:11:40 -0700 Subject: [PATCH 1/4] profiles: Mask sys-block/partclone Signed-off-by: Eli Burch --- profiles/package.mask | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 55817cfa49..fca59c81a8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -18,6 +18,11 @@ # New entries go on top. +# Eli Burch (2024-07-05) +# Dependency sys-fs/reiser4progs was treecleaned in ::gentoo +# Removal on 2024-07-05 +sys-block/partclone + # Lucio Sauer (2024-07-04) # Package is unmaintained and out of date since 2021, has open bugs and # it doesn't compile From 7f2783be964247dc5fd03e3b920d7337e13d4d67 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sat, 6 Jul 2024 00:40:11 +0900 Subject: [PATCH 2/4] dev-libs/librepo: add 1.18.0 Closes: https://bugs.gentoo.org/934951 Signed-off-by: Takuya Wakazono --- dev-libs/librepo/Manifest | 1 + ...librepo-1.18.0-disable-checksum-test.patch | 12 ++++ dev-libs/librepo/librepo-1.18.0.ebuild | 57 +++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100644 dev-libs/librepo/files/librepo-1.18.0-disable-checksum-test.patch create mode 100644 dev-libs/librepo/librepo-1.18.0.ebuild diff --git a/dev-libs/librepo/Manifest b/dev-libs/librepo/Manifest index 4d39167cf2..cde31ca6aa 100644 --- a/dev-libs/librepo/Manifest +++ b/dev-libs/librepo/Manifest @@ -1 +1,2 @@ DIST librepo-1.17.2.tar.gz 840645 BLAKE2B 89d7b222131a89177802a4ef9c6d22a65059c985a664871a8d2cbe2ab7c8edfee8e7489e2370a24935c57e41456211eb384ff4a063477ea1f9dc0eff15344441 SHA512 5b6197e7a3fc8b5b11405c6106116309960d108073c71eb04d894e122b1611b1b5c427a9b1daad852aaf3cbbd1811d9bf5e8f664bde18eacfd432b661be8f006 +DIST librepo-1.18.0.tar.gz 841303 BLAKE2B 57288ee8bf9e77009b1c169ffafb4d59dcc3ecf836870abb7fce78d5d0e381d4377d6de67eb7240a87d1124d32fe1f51a26e6e8168f7557285502595aff69d17 SHA512 6630b4751163ff6a34c32b94f6d0ecdc34926ade6aa92342c99eef9a514edd25405e051c58f6630615dd9cd04ef5c0404ebc4805708356477b97d351baa19a73 diff --git a/dev-libs/librepo/files/librepo-1.18.0-disable-checksum-test.patch b/dev-libs/librepo/files/librepo-1.18.0-disable-checksum-test.patch new file mode 100644 index 0000000000..a8d3351999 --- /dev/null +++ b/dev-libs/librepo/files/librepo-1.18.0-disable-checksum-test.patch @@ -0,0 +1,12 @@ +getxattr does not seem to work well under QA box. +https://bugs.gentoo.org/934951 +--- a/tests/test_checksum.c ++++ b/tests/test_checksum.c +@@ -301,7 +301,6 @@ checksum_suite(void) + Suite *s = suite_create("checksum"); + TCase *tc = tcase_create("Main"); + tcase_add_test(tc, test_checksum_fd); +- tcase_add_test(tc, test_cached_checksum_matches); + tcase_add_test(tc, test_cached_checksum_value); + tcase_add_test(tc, test_cached_checksum_clear); + suite_add_tcase(s, tc); diff --git a/dev-libs/librepo/librepo-1.18.0.ebuild b/dev-libs/librepo/librepo-1.18.0.ebuild new file mode 100644 index 0000000000..4d43a97dcf --- /dev/null +++ b/dev-libs/librepo/librepo-1.18.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Repodata downloading library" +HOMEPAGE="https://github.com/rpm-software-management/librepo" +SRC_URI="https://github.com/rpm-software-management/librepo/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc gpgme test +zchunk" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.66:2 + dev-libs/libxml2 + dev-libs/openssl:= + >=net-misc/curl-7.52.0 + gpgme? ( app-crypt/gpgme:1= ) + !gpgme? ( >=app-arch/rpm-4.18.0 ) + zchunk? ( >=app-arch/zchunk-0.9.11 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) + test? ( dev-libs/check ) +" + +PATCHES=( + # getxattr does not seem to work well under QA box. bug #934951 + "${FILESDIR}/${P}-disable-checksum-test.patch" +) + +src_prepare() { + cmake_src_prepare + + # respect temp directory during tests, bug #924463 + sed -i "s|/tmp/|${T}/|" tests/testsys.h || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_EXAMPLES=OFF + -DENABLE_PYTHON=OFF + -DENABLE_SELINUX=OFF + -DUSE_GPGME=$(usex gpgme) + -DENABLE_DOCS=$(usex doc) + -DENABLE_TESTS=$(usex test) + -DWITH_ZCHUNK=$(usex zchunk) + ) + cmake_src_configure +} From c79c66c0e37ca9fe41b6182b2a1abebc1cd864c6 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Sat, 6 Jul 2024 00:40:35 +0900 Subject: [PATCH 3/4] dev-libs/librepo: drop 1.17.2 Signed-off-by: Takuya Wakazono --- dev-libs/librepo/Manifest | 1 - .../files/librepo-1.17.2-verbose-error.patch | 13 ----- dev-libs/librepo/librepo-1.17.2.ebuild | 57 ------------------- 3 files changed, 71 deletions(-) delete mode 100644 dev-libs/librepo/files/librepo-1.17.2-verbose-error.patch delete mode 100644 dev-libs/librepo/librepo-1.17.2.ebuild diff --git a/dev-libs/librepo/Manifest b/dev-libs/librepo/Manifest index cde31ca6aa..3b2c1aced3 100644 --- a/dev-libs/librepo/Manifest +++ b/dev-libs/librepo/Manifest @@ -1,2 +1 @@ -DIST librepo-1.17.2.tar.gz 840645 BLAKE2B 89d7b222131a89177802a4ef9c6d22a65059c985a664871a8d2cbe2ab7c8edfee8e7489e2370a24935c57e41456211eb384ff4a063477ea1f9dc0eff15344441 SHA512 5b6197e7a3fc8b5b11405c6106116309960d108073c71eb04d894e122b1611b1b5c427a9b1daad852aaf3cbbd1811d9bf5e8f664bde18eacfd432b661be8f006 DIST librepo-1.18.0.tar.gz 841303 BLAKE2B 57288ee8bf9e77009b1c169ffafb4d59dcc3ecf836870abb7fce78d5d0e381d4377d6de67eb7240a87d1124d32fe1f51a26e6e8168f7557285502595aff69d17 SHA512 6630b4751163ff6a34c32b94f6d0ecdc34926ade6aa92342c99eef9a514edd25405e051c58f6630615dd9cd04ef5c0404ebc4805708356477b97d351baa19a73 diff --git a/dev-libs/librepo/files/librepo-1.17.2-verbose-error.patch b/dev-libs/librepo/files/librepo-1.17.2-verbose-error.patch deleted file mode 100644 index bb968cbf45..0000000000 --- a/dev-libs/librepo/files/librepo-1.17.2-verbose-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -Make a test failure verbose. -https://bugs.gentoo.org/928159 ---- a/tests/test_checksum.c -+++ b/tests/test_checksum.c -@@ -141,7 +141,7 @@ START_TEST(test_cached_checksum_matches) - goto exit_label; - } - // Any other errno means fail -- ck_assert(attr_ret != -1); -+ ck_assert_msg(attr_ret == -1, "getxattr failed: %s", strerror(errno)); - } else { - buf[attr_ret] = 0; - ck_assert_str_eq(buf, expected); diff --git a/dev-libs/librepo/librepo-1.17.2.ebuild b/dev-libs/librepo/librepo-1.17.2.ebuild deleted file mode 100644 index d3a84b635e..0000000000 --- a/dev-libs/librepo/librepo-1.17.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Repodata downloading library" -HOMEPAGE="https://github.com/rpm-software-management/librepo" -SRC_URI="https://github.com/rpm-software-management/librepo/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc gpgme test +zchunk" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.66:2 - dev-libs/libxml2 - dev-libs/openssl:= - >=net-misc/curl-7.52.0 - gpgme? ( app-crypt/gpgme:1= ) - !gpgme? ( >=app-arch/rpm-4.18.0 ) - zchunk? ( >=app-arch/zchunk-0.9.11 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/doxygen ) - test? ( dev-libs/check ) -" - -PATCHES=( - # make a test failure verbose, bug #928159 - "${FILESDIR}/${P}-verbose-error.patch" -) - -src_prepare() { - cmake_src_prepare - - # respect temp directory during tests, bug #924463 - sed -i "s|/tmp/|${T}/|" tests/testsys.h || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_EXAMPLES=OFF - -DENABLE_PYTHON=OFF - -DENABLE_SELINUX=OFF - -DUSE_GPGME=$(usex gpgme) - -DENABLE_DOCS=$(usex doc) - -DENABLE_TESTS=$(usex test) - -DWITH_ZCHUNK=$(usex zchunk) - ) - cmake_src_configure -} From 677a58a0c4a15f976f16519994dbbbfc17773698 Mon Sep 17 00:00:00 2001 From: Eli Burch Date: Fri, 5 Jul 2024 09:01:52 -0700 Subject: [PATCH 4/4] profiles: Fix removal date for sys-block/partclone Signed-off-by: Eli Burch --- profiles/package.mask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/package.mask b/profiles/package.mask index fca59c81a8..8b6d74b73c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -20,7 +20,7 @@ # Eli Burch (2024-07-05) # Dependency sys-fs/reiser4progs was treecleaned in ::gentoo -# Removal on 2024-07-05 +# Removal on 2024-08-05 sys-block/partclone # Lucio Sauer (2024-07-04)