From a2148b9fab4c83209816a49f091d70873b19881d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Nov 2024 02:00:16 +0000 Subject: gentoo auto-resync : 28:11:2024 - 02:00:16 --- sys-libs/Manifest.gz | Bin 14410 -> 14412 bytes sys-libs/glibc/Manifest | 2 +- sys-libs/glibc/glibc-9999.ebuild | 4 ++ sys-libs/libmodulemd/Manifest | 4 +- sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild | 68 ++++++++++++++++++++++ sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild | 68 ---------------------- sys-libs/libmodulemd/libmodulemd-9999.ebuild | 8 +-- 7 files changed, 79 insertions(+), 75 deletions(-) create mode 100644 sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild delete mode 100644 sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index 86cec92573aa..10b0024bde9b 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index a378e7bbf609..8bd6088c873a 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -53,5 +53,5 @@ EBUILD glibc-2.38-r13.ebuild 55028 BLAKE2B fcee988603b8bcec9cf184c54e040c9190a98 EBUILD glibc-2.39-r11.ebuild 54663 BLAKE2B ef95a8014c990f42738c5b66b73416a55fab1b433af10d879a60d4d798ed3b9fca747242fb09d110f6a258e37bdbb384a85cc59dd8dc80f375c6faaa30ab4932 SHA512 3e8c216ac02f129a37de9d475980d911fb1ff77d09949f87ff6c5ffa666afdc6a35004d32d60d8a78b1abc17a823083442a68cbea6df35d4409897648ce8783f EBUILD glibc-2.39-r6.ebuild 55012 BLAKE2B 1e9bb36ab2bbf8c0333dc7e7110830b72aab75f3caed9ee5c9f910455c40645999330f919ef67e4e3a1fabc9c4a15ec187877bd365df7dfe476a5bad61c3cc62 SHA512 cd7d5abaf050b8967b23888b832b341f87e1ffd12abd0aa6cf7c4418ca8a6c22804a7f59624480a7e04abb73655e2e1d2df98bc15ee05aaa1311687042439f23 EBUILD glibc-2.40-r5.ebuild 54662 BLAKE2B 62dd423d70cd8598bc4e69dc49e9b5442d283af497b80c58a99fcc6d4977936b0171c0c76325978fd43ddccd7e3c6496984c90a171bfd7b27ce5296bd204f7e9 SHA512 4daab8f45afa47660e9edce14ce5733702a5c229e1dea24e702858425d30201686eb62b0fd2d6a9c99343e4c6e138352f18eacde24d99aada8ce610f001c5b33 -EBUILD glibc-9999.ebuild 54671 BLAKE2B fecbf8270a6d47d23491208f6c9da312a9a98cad00eec6e67197a43eee010b331168a74b6fffbcef5d478e610bed56a148981daf04c8e86edc1e14381f482063 SHA512 64da9826e980ae3e95838e6194f546543843d824fd274fa8db90f08b3dd6fe6c9a8e913d30b435368b43b50dd576f93907a92a50cebab5be1edc51b5a16586ce +EBUILD glibc-9999.ebuild 54755 BLAKE2B 4649c49ee37b7304c5b4882027f2cc112678ffe0a58599bbc9524a80768d7f139ad1ec7068a979b5ef86ecb61bb474478430608353504fd3850bf5c88f37780e SHA512 2adb4979c332e8b2426a1913e8c26cd3f0ad208cdf4cd6bf36de7168d99be29a081bdf3a6ac2d39edf19fe7e371372d97f04846cad39690f580f8b4a50d86a7a MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index dee2d1b66c49..978e6bb9e6b4 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -309,9 +309,13 @@ do_run_test() { # ignore build failures when installing a binary package #324685 do_compile_test "" "$@" 2>/dev/null || return 0 else + ebegin "Performing simple compile test for ABI=${ABI}" if ! do_compile_test "" "$@" ; then ewarn "Simple build failed ... assuming this is desired #324685" + eend 1 return 0 + else + eend 0 fi fi diff --git a/sys-libs/libmodulemd/Manifest b/sys-libs/libmodulemd/Manifest index c6f8f88869b7..06d3c12da26b 100644 --- a/sys-libs/libmodulemd/Manifest +++ b/sys-libs/libmodulemd/Manifest @@ -1,4 +1,4 @@ DIST libmodulemd-2.15.0.tar.gz 572396 BLAKE2B 39e9240deb4e1a3278bf323e111b137b980ac5a3069598b7306390d27623730ac1bc826c91ed049257c0d5de8c6a05c3bbc22ac8e9435b5c38c147f0f077ec41 SHA512 6e890952bf6b6fe3ee5790ff71866938627134eaa2d6c6e3bf1940dcf21203dc0101f487801d62f3698e5a50402eb089665c99723aeffd831e5f0b341a63aace -EBUILD libmodulemd-2.15.0.ebuild 1457 BLAKE2B ca7b04cdb2bf16828de1f4226e732b210a1092e69688ff7d213b92d12363a0bfd4f940363af4cdb589834a720e14cd50820cb06b82faf20fdc9b23a742cdbd2f SHA512 01da2bcece604246d6374da743efd2868101b14ba964fe2f78fce0695c478ea576f20416d67f993b26ae7a4e8236b87dfc9a326cc8fef786761d5a4eb6c3256b -EBUILD libmodulemd-9999.ebuild 1452 BLAKE2B 80b2b41c0519989eaa32b164d60a5b754c34dccb07823536007dd7b3ba9bbe600107d35eefe866184549946d6060273e3236a302e41a9dc6b30be1be9a8ca9bb SHA512 e0cd4cf8de49c1d529814abe4357f8558a9be3755632e6097a61e81f896027a980e985cba8ce6daa3d44bbb4d697f973e677fe5497184b30b200a169076f580e +EBUILD libmodulemd-2.15.0-r1.ebuild 1455 BLAKE2B bdf6a41fd531b4b0b126059d4775dd0c85e1815075b91e1deb349eef47fbf9d30b58616d8a283069bfe4628d9d8436153662cb38bb73781df9102886f4f21a19 SHA512 8d0d641cb00eab50479a670e50b878287f05f7d6f5abe52753419cde3ff0f71fa481d39b881b16928f837f1a11d34b44f7f70a66830927a8a9808e04d61a3cde +EBUILD libmodulemd-9999.ebuild 1450 BLAKE2B 01d3cddff4c278f8f0f122cc1cf16fbe07d8bc735f5f2c4fce50b78a3e3566879f76fd19c9effa47d0ee0ce12ca42fd74acbc76052a7c8f1b440bf09b4172bab SHA512 167f9d4ad70e72014208074ac5dfc9ffe1d384973c65b8cb2b97adc696433b502a584ff86bbeffbbbbe90ddb8facd440d664168af8fc88329099fcbb6c45c336 MISC metadata.xml 340 BLAKE2B 051251d010c8d4dc48ce40383c19609ed6de9a9dee7220bf116d719600b1864ca4918ea53ac5a2f491350bf6ffe5528c2f98974c147dd4e7be83f1646b1d17eb SHA512 e5efb6c891911de2ab7af8ea47c4a195d8016be333a827981754ea263eb03d8e1b727aba6f819c07993d0eec1b38feb3441f808464f2ef7558e6a5b48e9bb89d diff --git a/sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild b/sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild new file mode 100644 index 000000000000..a2fa165df018 --- /dev/null +++ b/sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit meson python-single-r1 + +DESCRIPTION="C Library for manipulating Fedora Modularity metadata files" +HOMEPAGE="https://github.com/fedora-modularity/libmodulemd" +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fedora-modularity/libmodulemd.git" +else + SRC_URI="https://github.com/fedora-modularity/libmodulemd/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +IUSE="doc test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + app-arch/rpm + sys-apps/file + dev-libs/glib:2 + dev-libs/libyaml + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') +" +RDEPEND="${DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/gobject-introspection + dev-util/glib-utils + doc? ( + dev-libs/glib[gtk-doc(+),doc(+)] + dev-util/gtk-doc + ) + test? ( + sys-libs/libmodulemd + ) +" + +src_configure() { + local emesonargs=( + $(meson_use doc with_docs) + ) + meson_src_configure +} + +src_test() { + meson_src_test --no-suite ci_valgrind +} + +src_install() { + meson_src_install + # We need to compile the gobject introspection overrides to prevent QA warnings + local PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die) + python_optimize "${D}${PYTHON_GI_OVERRIDESDIR}/" + +} diff --git a/sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild b/sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild deleted file mode 100644 index 41aeaa2985e0..000000000000 --- a/sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit meson python-single-r1 - -DESCRIPTION="C Library for manipulating Fedora Modularity metadata files" -HOMEPAGE="https://github.com/fedora-modularity/libmodulemd" -if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fedora-modularity/libmodulemd.git" -else - SRC_URI="https://github.com/fedora-modularity/libmodulemd/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" - -IUSE="gtk-doc test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - app-arch/rpm - sys-apps/file - dev-libs/glib:2 - dev-libs/libyaml - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" -RDEPEND="${DEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - dev-libs/gobject-introspection - dev-util/glib-utils - gtk-doc? ( - dev-libs/glib[gtk-doc] - dev-util/gtk-doc - ) - test? ( - sys-libs/libmodulemd - ) -" - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc with_docs) - ) - meson_src_configure -} - -src_test() { - meson_src_test --no-suite ci_valgrind -} - -src_install() { - meson_src_install - # We need to compile the gobject introspection overrides to prevent QA warnings - local PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die) - python_optimize "${D}${PYTHON_GI_OVERRIDESDIR}/" - -} diff --git a/sys-libs/libmodulemd/libmodulemd-9999.ebuild b/sys-libs/libmodulemd/libmodulemd-9999.ebuild index 8070c2e20bed..c49191ef1399 100644 --- a/sys-libs/libmodulemd/libmodulemd-9999.ebuild +++ b/sys-libs/libmodulemd/libmodulemd-9999.ebuild @@ -20,7 +20,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="gtk-doc test" +IUSE="doc test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -39,8 +39,8 @@ BDEPEND=" ${PYTHON_DEPS} dev-libs/gobject-introspection dev-util/glib-utils - gtk-doc? ( - dev-libs/glib[gtk-doc] + doc? ( + dev-libs/glib[gtk-doc(+),doc(+)] dev-util/gtk-doc ) test? ( @@ -50,7 +50,7 @@ BDEPEND=" src_configure() { local emesonargs=( - $(meson_use gtk-doc with_docs) + $(meson_use doc with_docs) ) meson_src_configure } -- cgit v1.2.3