gentoo auto-resync : 17:05:2023 - 04:08:35

3 files changed, 2 insertions, 66 deletions

diff --git a/sys-libs/libmodulemd/Manifest b/sys-libs/libmodulemd/Manifest
index 695730663af5..564839001d88 100644
--- a/sys-libs/libmodulemd/Manifest
+++ b/sys-libs/libmodulemd/Manifest
@@ -1,5 +1,4 @@
-AUX libmodulemd-2.14.0-meson-version.patch 2515 BLAKE2B 962d041738a7b34e2ca5427f9205374f3b674f1c077fe46e28ac563da372deafd2b964502c3f4df447d48cc3b9da3514a3054d1a9389cb2fbab2421db77398c6 SHA512 69ac775c19c1506863e4dbd53e2a816ada5e8f3d497843f067ab7e1cf186a994d98741d378be3380cbf5ff7c0756e067472c8c22da7496b93ab8b81bd51224af
-DIST libmodulemd-2.14.0.tar.gz 531166 BLAKE2B 18c3693ef9f74c57c71c7bd80b16d60d0fc2c8732994acae9b8461af5776bfcf8b856eef65222470d070fd256c6ee1468f961ba20b4425502f946d3368e5708c SHA512 dee8e08ada4e246179f88342cd3d3d6736f430b362e36ab1a3605971033ad306a5bf415141a09180a7ea6e70d1532d63d815ca07f208222447b455b9ff0e6f75
-EBUILD libmodulemd-2.14.0.ebuild 1503 BLAKE2B cfd2d21b4e466ff28be8ee1c2f29467d31a7ea75ddecf4a1db2c5f66f7aec302d82e056911a556e9de4ec5bc6f680baff6497caf67298496892dd5f52a17cffb SHA512 1d61f0ff88315d5545524c29223eaf937ca0f399127dbf896b0cc7b763452b166dbb1d2045f53f17ba24b2b15b3a937c19e4f15a284fcff706b188d76e8731f6
+DIST libmodulemd-2.15.0.tar.gz 572396 BLAKE2B 39e9240deb4e1a3278bf323e111b137b980ac5a3069598b7306390d27623730ac1bc826c91ed049257c0d5de8c6a05c3bbc22ac8e9435b5c38c147f0f077ec41 SHA512 6e890952bf6b6fe3ee5790ff71866938627134eaa2d6c6e3bf1940dcf21203dc0101f487801d62f3698e5a50402eb089665c99723aeffd831e5f0b341a63aace
+EBUILD libmodulemd-2.15.0.ebuild 1451 BLAKE2B 7ad6f0b1b5a83d84ba5be83a6cb5fe56c7b508201abf501a67043799de4e48cf0c04da1bbd0ddbbadfc1af50550aaa783f5141329398cf0c6c6a963449335af4 SHA512 d3f08ec3f2f681b45d1363a5713079fbd82cdbb132a01d7e6b0bc798638272bcf1d4bd8f2b85f9857d87db471b3ec52befea15904f62eaddd07dfdc1574b9143
 EBUILD libmodulemd-9999.ebuild 1446 BLAKE2B a87a066975aa2c64c7ecf99c713602d56d25d80e55bd4f34002311ec0369e2d58000b408237ff138fff20855dd4280ebd87f6e1fea74780fd266912c663999ce SHA512 1427785e18b464b02ee8f636701e08f40fe8a85630ff1d0d2d5bb412e5956ae5365e3c31c50d55ccffbee1920b213e06cfe4511569d514f82fa8040c90023137
 MISC metadata.xml 497 BLAKE2B 177b48e70f6f07c00184dad0d1571f72f35e37cc76253d0d86d0a85688705d5f108b14f3a8cd356614c0bbf7fad34af89c560c1e0801cf495802a2a72334d558 SHA512 4660fcb35515d0df20e19da1f2d69d966f36f0ddad1b6008507289ce6741d5a83a519c933991d4bb65cc29a15eaa34106a93cd6cdb7362f3ac287e3184eda37e
diff --git a/sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch b/sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch
deleted file mode 100644
index bd006f66310c..000000000000
--- a/sys-libs/libmodulemd/files/libmodulemd-2.14.0-meson-version.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://github.com/fedora-modularity/libmodulemd/pull/604
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Fri, 27 Jan 2023 16:03:09 +1100
-Subject: [PATCH] Meson build tidyup
-
-- Set meson_version to actual required version
-- Update deprecated functions to supported equivalents
---- a/meson.build
-+++ b/meson.build
-@@ -15,7 +15,7 @@ project(
- version : '2.14.1',
- default_options : ['buildtype=debugoptimized', 'c_std=c11', 'warning_level=1', 'b_asneeded=true'],
- license : 'MIT',
--meson_version : '>=0.47.0'
-+meson_version : '>=0.58.0'
- )
- 
- libmodulemd_version = meson.project_version()
-@@ -58,7 +58,7 @@ rpm = dependency('rpm', required : with_rpmio)
- magic = cc.find_library('magic', required : with_libmagic)
- 
- glib = dependency('glib-2.0')
--glib_prefix = glib.get_pkgconfig_variable('prefix')
-+glib_prefix = glib.get_variable(pkgconfig: 'prefix')
- 
- bash = find_program('bash')
- sed = find_program('sed')
---- a/modulemd/meson.build
-+++ b/modulemd/meson.build
-@@ -286,9 +286,9 @@ endif
- # Test env with release values
- test_release_env = environment()
- test_release_env.set('LC_ALL', 'C')
--test_release_env.set ('MESON_SOURCE_ROOT', meson.source_root())
--test_release_env.set ('MESON_BUILD_ROOT', meson.build_root())
--test_release_env.set ('TEST_DATA_PATH', meson.source_root() + '/modulemd/tests/test_data')
-+test_release_env.set ('MESON_SOURCE_ROOT', meson.project_source_root())
-+test_release_env.set ('MESON_BUILD_ROOT', meson.project_build_root())
-+test_release_env.set ('TEST_DATA_PATH', meson.project_source_root() + '/modulemd/tests/test_data')
- 
- # Test env with fatal warnings and criticals
- test_env = test_release_env
-@@ -304,9 +304,9 @@ py_test_env = test_env
- if not test_installed_lib
-     # If we're testing an installed version, we want to use the default
-     # locations for these paths.
--    py_test_env.set ('GI_TYPELIB_PATH', meson.build_root() + '/modulemd')
--    py_test_env.set ('LD_LIBRARY_PATH', meson.build_root() + '/modulemd')
--    py_test_env.set ('PYTHONPATH', meson.source_root())
-+    py_test_env.set ('GI_TYPELIB_PATH', meson.project_build_root() + '/modulemd')
-+    py_test_env.set ('LD_LIBRARY_PATH', meson.project_build_root() + '/modulemd')
-+    py_test_env.set ('PYTHONPATH', meson.project_source_root())
- 
-     # This test is just to catch whether we are accidentally not testing
-     # the built version.
-@@ -558,5 +558,3 @@ test('test_import_headers', import_header_script,
-       args : modulemd_hdrs,
-       timeout : 300,
-       suite : ['smoketest', 'ci'])
--
--
diff --git a/sys-libs/libmodulemd/libmodulemd-2.14.0.ebuild b/sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild
index 73c64f917ae4..72b02229c8f2 100644
--- a/sys-libs/libmodulemd/libmodulemd-2.14.0.ebuild
+++ b/sys-libs/libmodulemd/libmodulemd-2.15.0.ebuild
@@ -48,8 +48,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-meson-version.patch )
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use gtk-doc with_docs)