summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-10-06 17:57:58 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-10-06 17:57:58 +0100
commit8368c614e6a1232f34a14cd6495cf2f68933030d (patch)
treefb445ed1110e0361c9c25136c00c4fb948bb46c4 /sys-apps
parent2b03b0d9c5ca3890c219ebd24721133e766e9bb9 (diff)
gentoo auto-resync : 06:10:2023 - 17:57:58
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49700 -> 49697 bytes
-rw-r--r--sys-apps/kbd/Manifest4
-rw-r--r--sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch126
-rw-r--r--sys-apps/kbd/kbd-2.6.3-r1.ebuild2
-rw-r--r--sys-apps/system-monitoring-center/Manifest12
-rw-r--r--sys-apps/system-monitoring-center/system-monitoring-center-2.21.2-r1.ebuild (renamed from sys-apps/system-monitoring-center/system-monitoring-center-2.21.1.ebuild)10
-rw-r--r--sys-apps/system-monitoring-center/system-monitoring-center-2.23.0-r1.ebuild (renamed from sys-apps/system-monitoring-center/system-monitoring-center-2.21.2.ebuild)10
-rw-r--r--sys-apps/system-monitoring-center/system-monitoring-center-2.23.0.ebuild43
-rw-r--r--sys-apps/system-monitoring-center/system-monitoring-center-2.24.0-r1.ebuild (renamed from sys-apps/system-monitoring-center/system-monitoring-center-2.22.1.ebuild)10
-rw-r--r--sys-apps/system-monitoring-center/system-monitoring-center-9999.ebuild10
10 files changed, 41 insertions, 186 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c865a3a1473c..9753e6305e13 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index ab35989c1101..286c0f8e9499 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,4 +1,4 @@
-AUX kbd-2.6.3-no-redefine-fortify-source.patch 5516 BLAKE2B ed6532cf047b3bc4bfe24ba8abeacc03088b21c8e356eb4891ad700ec23e8c785a832d131c2181b491f68bdf5cc8a8ebb713e07b6855f579e4e58713f6f51416 SHA512 d22db84d282d3231b2891745bd6f249ce65e17fcfed46e10fccdc8289ad182fe0b0b847c4a10739f95f250bd50e506fc12dfaf97db3b3d83e33cfce3bf62edf2
+AUX kbd-2.6.3-no-redefine-fortify-source.patch 1425 BLAKE2B 4e3323b8ed75b449f17f925139f51a106a5fb06ae76285fc715aa93b54006cf417bc003f8518a2b02b32ff187cae9dfa75a1932a4cb035234680071e8cfefb90 SHA512 193331ebb9da168d639bfcc192c31afd947928a8031b27214a7db8bb07ca42704a457122a579067621f6cf6645bcf65a70543a176396ea3022ad8e98db20f2ce
DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91
DIST kbd-2.6.2.tar.xz 1503532 BLAKE2B aa146177b2ffd9d6d396c253ce54d0ee42e1a1a2ba471ae0f8950a72b49f2f83aa4660337a581150cfd9fae0b9a4415725f4d152e83c0bdf26b833a31f6e2696 SHA512 afcac33e2e8eecd6f9cfa20bb39254deffc4d8924c4f722d003bdfaf286dac7d87f55ed0a5a35d341ae88fc48162966d5aa1ab8125b11e845bf3c2589a17c8d2
@@ -6,7 +6,7 @@ DIST kbd-2.6.3.tar.xz 1503048 BLAKE2B 9c3f9e2ec9abd3a18bd4159b3a223deee6aee74610
EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B 66c55f1296812b9a197460a8a90bf237def618d6fc9d00ad6e26ff543b1918c7274aae2627c836925099ed37645bf6fa5c05ebfc392077b265b46f0d31d0b1c9 SHA512 9734368dac398812fee31c31a29f6ec8b4819181a8a0a711ceadb64c825aaf515aa35d767185bf9379e5287facda5f53c923ef64aeb3f45ea054b5a5c97f2dd2
EBUILD kbd-2.6.1.ebuild 2080 BLAKE2B 0606f8e5722854c0aeb9e389079d016eaeab9d3d5b35d973c78f5e1d96242e443b6ddd50684288d3fbbc2d1e901e5648fb2396401b443b561154a9cd1f97b754 SHA512 6f07c4c1c64c445fc2014a857005c8b4a8d070f387d57b24377c15669f75b19e56a1c17278935a2418db5fe317ed734c3c2e36fb3d96a1a6ff6d84287b721124
EBUILD kbd-2.6.2.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
-EBUILD kbd-2.6.3-r1.ebuild 2208 BLAKE2B 77a373d748301d2a4ccd36de5907c24a31a2116168ba6fd64e3a282f4bd54f1fff2a1d14bc720c826684dc128d1603cc2cf998ff8f5a0e2541c53645a03c33fa SHA512 5845863c0adf411da2f3259ca18b244c0bff48804e70373f3ba91375c5eb99d3971b6638c984623130987ed498a8fbdaf8cedf88453ee0420fe47094ec35402c
+EBUILD kbd-2.6.3-r1.ebuild 2269 BLAKE2B 8299c666b12f216d98c322bbbf36afdf0e04efca6c3bd89f319c2fce29219b5061502b31a530ea4f05dd0fdb59af59a89dcd563925624a6c8f0bbf0a1be00b9b SHA512 8df18437d152702c8daf554abced83d5940662f1691463824c2e85196080326bc4ed2de8a330cd90ea5558b3568da69434b9aee76b2e212f196643573c344d26
EBUILD kbd-2.6.3.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
EBUILD kbd-9999.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch
index b18fb9f751cf..2edd547d1ed2 100644
--- a/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch
+++ b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch
@@ -43,129 +43,3 @@ index 66023ff8..7fdbe7d6 100644
fi
case "$GCC,$ac_cv_prog_cc_g" in
-diff --git a/m4/ax_add_fortify_source.m4 b/m4/ax_add_fortify_source.m4
-new file mode 100644
-index 00000000..860c1598
---- /dev/null
-+++ b/m4/ax_add_fortify_source.m4
-@@ -0,0 +1,119 @@
-+# ===========================================================================
-+# https://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AX_ADD_FORTIFY_SOURCE
-+#
-+# DESCRIPTION
-+#
-+# Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro
-+# redefinition warnings, other cpp warnings or linker. Some distributions
-+# (such as Ubuntu or Gentoo Linux) enable _FORTIFY_SOURCE globally in
-+# their compilers, leading to unnecessary warnings in the form of
-+#
-+# <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
-+# <built-in>: note: this is the location of the previous definition
-+#
-+# which is a problem if -Werror is enabled. This macro checks whether
-+# _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2
-+# to CPPFLAGS.
-+#
-+# Newer mingw-w64 msys2 package comes with a bug in
-+# headers-git-7.0.0.5546.d200317d-1. It broke -D_FORTIFY_SOURCE support,
-+# and would need -lssp or -fstack-protector. See
-+# https://github.com/msys2/MINGW-packages/issues/5803. Try to actually
-+# link it.
-+#
-+# LICENSE
-+#
-+# Copyright (c) 2017 David Seifert <soap@gentoo.org>
-+# Copyright (c) 2019, 2023 Reini Urban <rurban@cpan.org>
-+#
-+# Copying and distribution of this file, with or without modification, are
-+# permitted in any medium without royalty provided the copyright notice
-+# and this notice are preserved. This file is offered as-is, without any
-+# warranty.
-+
-+#serial 10
-+
-+AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
-+ ac_save_cflags=$CFLAGS
-+ ac_cwerror_flag=yes
-+ AX_CHECK_COMPILE_FLAG([-Werror],[CFLAGS="$CFLAGS -Werror"])
-+ ax_add_fortify_3_failed=
-+ AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=3 to CPPFLAGS])
-+ AC_LINK_IFELSE([
-+ AC_LANG_PROGRAM([],
-+ [[
-+ #ifndef _FORTIFY_SOURCE
-+ return 0;
-+ #else
-+ _FORTIFY_SOURCE_already_defined;
-+ #endif
-+ ]]
-+ )],
-+ AC_LINK_IFELSE([
-+ AC_LANG_SOURCE([[
-+ #define _FORTIFY_SOURCE 3
-+ #include <string.h>
-+ int main(void) {
-+ char *s = " ";
-+ strcpy(s, "x");
-+ return strlen(s)-1;
-+ }
-+ ]]
-+ )],
-+ [
-+ AC_MSG_RESULT([yes])
-+ CFLAGS=$ac_save_cflags
-+ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=3"
-+ ], [
-+ AC_MSG_RESULT([no])
-+ ax_add_fortify_3_failed=1
-+ ],
-+ ),
-+ [
-+ AC_MSG_RESULT([no])
-+ ax_add_fortify_3_failed=1
-+ ])
-+ if test -n "$ax_add_fortify_3_failed"
-+ then
-+ AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS])
-+ AC_LINK_IFELSE([
-+ AC_LANG_PROGRAM([],
-+ [[
-+ #ifndef _FORTIFY_SOURCE
-+ return 0;
-+ #else
-+ _FORTIFY_SOURCE_already_defined;
-+ #endif
-+ ]]
-+ )],
-+ AC_LINK_IFELSE([
-+ AC_LANG_SOURCE([[
-+ #define _FORTIFY_SOURCE 2
-+ #include <string.h>
-+ int main(void) {
-+ char *s = " ";
-+ strcpy(s, "x");
-+ return strlen(s)-1;
-+ }
-+ ]]
-+ )],
-+ [
-+ AC_MSG_RESULT([yes])
-+ CFLAGS=$ac_save_cflags
-+ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
-+ ], [
-+ AC_MSG_RESULT([no])
-+ CFLAGS=$ac_save_cflags
-+ ],
-+ ),
-+ [
-+ AC_MSG_RESULT([no])
-+ CFLAGS=$ac_save_cflags
-+ ])
-+ fi
-+])
-
diff --git a/sys-apps/kbd/kbd-2.6.3-r1.ebuild b/sys-apps/kbd/kbd-2.6.3-r1.ebuild
index 8109218a18e0..0bacea6493e4 100644
--- a/sys-apps/kbd/kbd-2.6.3-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.6.3-r1.ebuild
@@ -42,7 +42,9 @@ RDEPEND="
${DEPEND}
selinux? ( sec-policy/selinux-loadkeys )
"
+# autoconf-archive for F_S patch
BDEPEND="
+ sys-devel/autoconf-archive
virtual/pkgconfig
test? ( dev-libs/check )
"
diff --git a/sys-apps/system-monitoring-center/Manifest b/sys-apps/system-monitoring-center/Manifest
index fb3d26236aa3..979ec7a164d4 100644
--- a/sys-apps/system-monitoring-center/Manifest
+++ b/sys-apps/system-monitoring-center/Manifest
@@ -1,10 +1,8 @@
-DIST system-monitoring-center-2.21.1.tar.gz 1505833 BLAKE2B a2270f20e745191eb72c299d2d4f9a28d5a06ec538813ed60afa628bc4cc053a5ca3e0a5daacc60008d46de55a03d7403e2dbec1f3d62fa67361661bc0101ace SHA512 acc3ea1623407aec703efdd8461a67bb858446b6dbcecfddbf26e0edea1c39ca0cd64d0f81d662340d540cf4fe855bcbc8eb20b48af7f2caea2e7b39169c8c53
DIST system-monitoring-center-2.21.2.tar.gz 1511509 BLAKE2B 44c573a83cc8eb3288543e5ab69c334d0d47dbc1fe05d64f6197a870f7df9c81cd3c57fb67c4219e04bd889554a057276af388e8374de15d02e83ec7ff487ae2 SHA512 95d7622079aa2fa89b1f7e98c886e2c215a204b6cc2b52d4e2892964350639004514fbbd1244df9c70acc7238308071b459997dacc7fa997aae840c9cc95e817
-DIST system-monitoring-center-2.22.1.tar.gz 1741958 BLAKE2B 152e8d461219449bee1950172d52807fdf752503cc7446053cd76916fc8cf8045bb5a0e73ba75bdfc9c20f06a1ca0924366a31cb05f724e84fa14dcc3bae0ca0 SHA512 3a5e38d5e81a354442ba304e4b30faf5d1848fd7ec876508858a1dcf69bba2abfcea87191a5facab01bc02db79fbea9c992ae9b749812d30346c1024b2f35745
DIST system-monitoring-center-2.23.0.tar.gz 1753271 BLAKE2B 1426aa8c639f4958ba7e9dbbaba062a1b6768cfe32308888c3d92395a2861b3e3aca7ccd838f89e2c224ea94c6acd9e2c9a904e07e8bc64c31f8d88a2faed7ad SHA512 14347644fe7d5ff112c3b0ad09d394c9c0d70fe75b1fd092d3d4b0e9f6f8de3387c362d546f3272ba645cb9dba9b08089a9361cd7463bd4e3765c9df7338fd17
-EBUILD system-monitoring-center-2.21.1.ebuild 1008 BLAKE2B 0cfc5f22af64d9e22282245ce947124448705bbf0a6785ba988cf394ad1b0af820f8ed878233bf88166b4a6eb14c347df6ff5375670f7795f1024f8cfb327e84 SHA512 2683a2a50ffcfedcc45af6f21b2527406047621f0a6ece52b1075e60a598f855277ab6fb66ac6af24a3fe26795f9b9ca443c5df581fc9165d180db82a5b9930d
-EBUILD system-monitoring-center-2.21.2.ebuild 1009 BLAKE2B 4be408efef2d904c8735400dd1e35005b58adffe05a81b1164f9bffa595b94ebb13370a0883e33da1ed6a59b2a4aa51d41d2a7d790c8129c943074aaa19ec85b SHA512 24ffa6417e55c025f127cc4fab700fe2d8f3e11c2555a0c27a0adebaf960533626886907f22ba9932f7768b17d7d16568d4cd04964b0c8bba08c9992b6ec2e2f
-EBUILD system-monitoring-center-2.22.1.ebuild 1009 BLAKE2B 4be408efef2d904c8735400dd1e35005b58adffe05a81b1164f9bffa595b94ebb13370a0883e33da1ed6a59b2a4aa51d41d2a7d790c8129c943074aaa19ec85b SHA512 24ffa6417e55c025f127cc4fab700fe2d8f3e11c2555a0c27a0adebaf960533626886907f22ba9932f7768b17d7d16568d4cd04964b0c8bba08c9992b6ec2e2f
-EBUILD system-monitoring-center-2.23.0.ebuild 1009 BLAKE2B 4be408efef2d904c8735400dd1e35005b58adffe05a81b1164f9bffa595b94ebb13370a0883e33da1ed6a59b2a4aa51d41d2a7d790c8129c943074aaa19ec85b SHA512 24ffa6417e55c025f127cc4fab700fe2d8f3e11c2555a0c27a0adebaf960533626886907f22ba9932f7768b17d7d16568d4cd04964b0c8bba08c9992b6ec2e2f
-EBUILD system-monitoring-center-9999.ebuild 1009 BLAKE2B 4be408efef2d904c8735400dd1e35005b58adffe05a81b1164f9bffa595b94ebb13370a0883e33da1ed6a59b2a4aa51d41d2a7d790c8129c943074aaa19ec85b SHA512 24ffa6417e55c025f127cc4fab700fe2d8f3e11c2555a0c27a0adebaf960533626886907f22ba9932f7768b17d7d16568d4cd04964b0c8bba08c9992b6ec2e2f
+DIST system-monitoring-center-2.24.0.tar.gz 1756467 BLAKE2B a0a477292b66cdffad5b2909a118381191e605bcf6b633362d4356cba309fbc6836c99ca46e1043c9398d97f85ca2df19afe0b2cede83d5c3bf7adf18fa50700 SHA512 54b80fb91d6845e2d13b42b27ab7c1f1c2379e2ff415f57c81ab1dc82b8e73783cf1aa151a096be5ce810cc001164f18c46e405f7acff318755ec358f7c299d8
+EBUILD system-monitoring-center-2.21.2-r1.ebuild 1096 BLAKE2B 3eaff22ba1a4902b9fe0262db8eceb52607f00ea3b829e0d9e519241165b5dbb5de7d8894abdd014dc0bcb927801de878162b33c98f9ad28af9c8fcaceebca59 SHA512 2f3fb9aac39daeffc1004d5af289b664c02b4d0fbae2ad49c83f05de26a76aea41278d6ea0056a45e60d58e3449320bb70779cb17c339d5d3ad77d404e19a717
+EBUILD system-monitoring-center-2.23.0-r1.ebuild 1097 BLAKE2B 866c6ee680b8e6e7b077f35f9586136578c831882ebb7323e0fa2e94139d12e2d25f5be5cb0c0b967dd0abe8534d3e7b249cafb4eae4c2c93efe26733eab88db SHA512 71f4a1d40bf398eecfefe2b2cda93422894d99062f7aa2a9d5c5baab107c317a2f6a3f6a1e1ad59e4668eece11ef32e100349902731d54c7d3d3c897aa0b55c4
+EBUILD system-monitoring-center-2.24.0-r1.ebuild 1097 BLAKE2B 866c6ee680b8e6e7b077f35f9586136578c831882ebb7323e0fa2e94139d12e2d25f5be5cb0c0b967dd0abe8534d3e7b249cafb4eae4c2c93efe26733eab88db SHA512 71f4a1d40bf398eecfefe2b2cda93422894d99062f7aa2a9d5c5baab107c317a2f6a3f6a1e1ad59e4668eece11ef32e100349902731d54c7d3d3c897aa0b55c4
+EBUILD system-monitoring-center-9999.ebuild 1097 BLAKE2B 866c6ee680b8e6e7b077f35f9586136578c831882ebb7323e0fa2e94139d12e2d25f5be5cb0c0b967dd0abe8534d3e7b249cafb4eae4c2c93efe26733eab88db SHA512 71f4a1d40bf398eecfefe2b2cda93422894d99062f7aa2a9d5c5baab107c317a2f6a3f6a1e1ad59e4668eece11ef32e100349902731d54c7d3d3c897aa0b55c4
MISC metadata.xml 1342 BLAKE2B 2c160c0ee614f2badb06264876c618b6d652adfa42fa7eab484fb1ff367e7c8e849d25e7f6969e06623c4b58b2b062159600a0c8d5a778d1d238692816a1fa74 SHA512 8f8a6149401e3b32e967cc1f5c77a65cb607957d9375cc8d69741e95e627337bc4d8c59b4afd22ea6ff2e03e3ec31b519d7cf8aab6061d89d3d8b9bc2a2ecead
diff --git a/sys-apps/system-monitoring-center/system-monitoring-center-2.21.1.ebuild b/sys-apps/system-monitoring-center/system-monitoring-center-2.21.2-r1.ebuild
index da1003cb4f3f..e15e8abaa8d1 100644
--- a/sys-apps/system-monitoring-center/system-monitoring-center-2.21.1.ebuild
+++ b/sys-apps/system-monitoring-center/system-monitoring-center-2.21.2-r1.ebuild
@@ -35,9 +35,15 @@ RDEPEND="
')
"
+src_prepare() {
+ sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die
+
+ default
+}
+
src_install() {
meson_src_install
- python_optimize "${ED}"/usr/share/${PN}
+ python_optimize "${ED}/usr/share/${PN}"
- mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+ mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die
}
diff --git a/sys-apps/system-monitoring-center/system-monitoring-center-2.21.2.ebuild b/sys-apps/system-monitoring-center/system-monitoring-center-2.23.0-r1.ebuild
index 0d57d2200134..8a65a073a3e7 100644
--- a/sys-apps/system-monitoring-center/system-monitoring-center-2.21.2.ebuild
+++ b/sys-apps/system-monitoring-center/system-monitoring-center-2.23.0-r1.ebuild
@@ -35,9 +35,15 @@ RDEPEND="
')
"
+src_prepare() {
+ sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die
+
+ default
+}
+
src_install() {
meson_src_install
- python_optimize "${ED}"/usr/share/${PN}
+ python_optimize "${ED}/usr/share/${PN}"
- mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+ mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die
}
diff --git a/sys-apps/system-monitoring-center/system-monitoring-center-2.23.0.ebuild b/sys-apps/system-monitoring-center/system-monitoring-center-2.23.0.ebuild
deleted file mode 100644
index 0d57d2200134..000000000000
--- a/sys-apps/system-monitoring-center/system-monitoring-center-2.23.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 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 xdg
-
-DESCRIPTION="Multi-featured system monitor GUI written in Python"
-HOMEPAGE="https://github.com/hakandundar34coding/system-monitoring-center/"
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hakandundar34coding/${PN}.git"
-else
- SRC_URI="https://github.com/hakandundar34coding/${PN}/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- gui-libs/gtk:4[introspection]
- gui-libs/libadwaita:1
- sys-apps/dmidecode
- sys-apps/hwdata
- $(python_gen_cond_dep '
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
-"
-
-src_install() {
- meson_src_install
- python_optimize "${ED}"/usr/share/${PN}
-
- mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
-}
diff --git a/sys-apps/system-monitoring-center/system-monitoring-center-2.22.1.ebuild b/sys-apps/system-monitoring-center/system-monitoring-center-2.24.0-r1.ebuild
index 0d57d2200134..8a65a073a3e7 100644
--- a/sys-apps/system-monitoring-center/system-monitoring-center-2.22.1.ebuild
+++ b/sys-apps/system-monitoring-center/system-monitoring-center-2.24.0-r1.ebuild
@@ -35,9 +35,15 @@ RDEPEND="
')
"
+src_prepare() {
+ sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die
+
+ default
+}
+
src_install() {
meson_src_install
- python_optimize "${ED}"/usr/share/${PN}
+ python_optimize "${ED}/usr/share/${PN}"
- mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+ mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die
}
diff --git a/sys-apps/system-monitoring-center/system-monitoring-center-9999.ebuild b/sys-apps/system-monitoring-center/system-monitoring-center-9999.ebuild
index 0d57d2200134..8a65a073a3e7 100644
--- a/sys-apps/system-monitoring-center/system-monitoring-center-9999.ebuild
+++ b/sys-apps/system-monitoring-center/system-monitoring-center-9999.ebuild
@@ -35,9 +35,15 @@ RDEPEND="
')
"
+src_prepare() {
+ sed -i "s|@PYTHON@|${PYTHON}|" "${S}/src/${PN}.in" || die
+
+ default
+}
+
src_install() {
meson_src_install
- python_optimize "${ED}"/usr/share/${PN}
+ python_optimize "${ED}/usr/share/${PN}"
- mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+ mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die
}