diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-11 03:29:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-11 03:29:03 +0000 |
| commit | b4899ed9fc78f45325ef4e2ebd460869e53a605d (patch) | |
| tree | 22eb729a14c18edf4c1a015ec26189729e9c6272 /app-metrics/collectd | |
| parent | c020d9e9432cd0e36fe47ad14216d6048adb49fc (diff) | |
gentoo auto-resync : 11:11:2022 - 03:29:03
Diffstat (limited to 'app-metrics/collectd')
| -rw-r--r-- | app-metrics/collectd/Manifest | 3 | ||||
| -rw-r--r-- | app-metrics/collectd/collectd-5.12.0-r7.ebuild | 5 | ||||
| -rw-r--r-- | app-metrics/collectd/files/collectd-5.12.0-python3_11.patch | 33 |
3 files changed, 39 insertions, 2 deletions
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest index 857ebcfc34df..4cc0e3687e78 100644 --- a/app-metrics/collectd/Manifest +++ b/app-metrics/collectd/Manifest @@ -1,8 +1,9 @@ AUX collectd-5.11.0-libsigrok-0.4+.patch 5447 BLAKE2B 6de12feb7226ae3a16a89f3282b54d363cc64e176fe4f9cc9a6bfef0874bca0447a8d21689f8d3c91b2840d12ba4abd3c6f38cfc0b4e885582cc42c81865a1f8 SHA512 a7c99664f632eaff35eef18a0bd8da5bfa39812d223eb6449acd0fa871c5d43a401ed48b1003275a2ae0362b92c69ab52b46af39fa69dd7e4cc2b2969dc4b2de +AUX collectd-5.12.0-python3_11.patch 1022 BLAKE2B 5317cd8f13eb7d657c1dc2041e23e3335a00f4ed781376cf942f74ffd7b57ca3be64e159b59bfeae2d7f3d7b76cf4ed9d9f1f71c890f6e3d86bb57399d31e03d SHA512 7a3b9d42910cd88ecc767a57c085410ee6c664f9e8c993591e2ef1a169723553dc1224b295623363af1a473b0d22cf2a937bee5d93d64c8c59651cff3f08a5e0 AUX collectd.confd-r2 2005 BLAKE2B 1f68f769d06b1f486c33f76060cf13f784d5b45ff7a04c209a6e23b8a9af94b3db54744532c74f8c95dae4fccb7f89a4e9a5f5353575c7099da0a2db3c1f8f37 SHA512 89fd2d60e1e0c7f4145d0791d65e29821e7f585015f1ba6bf94f80f47ffcefb7bdd75b2ba3e0acb18f0ee27f64100b3c4737ad30ce516785571d277a6923666f AUX collectd.initd-r3 1877 BLAKE2B 8e81c314abdd366a7583dd18bdad10c9d7da14589c030b9c3121090f9ee74b300f1bb919168117ce84aec3af6f0708f14fa6a71c5be049b099d5221656ac7dac SHA512 0dd1541bf6a17f7b26e8671ba236b11a599c07b30be6700d2e37ee2d6f59114d95c83b3ca8ddcb98d6a8e0d7321d994682411aff815c1b1f792314a6a17de4b5 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668 DIST collectd-5.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70 -EBUILD collectd-5.12.0-r7.ebuild 19947 BLAKE2B c0bcd824576ecba911be3c0b2ff58aca8f64281a986bfa4282d853a78046a1a36e9abd9b33e5c97d16dcc7c316690e75f5751a2d57022b4c658c9091098e61d2 SHA512 27d4da2e232487788bdab8982b32d0dfe514176fa90ca1090d65d711424833a2f484f831be149a40a5758d10e31e74efa9987d1a6e66a85d8dffe44774fb80f4 +EBUILD collectd-5.12.0-r7.ebuild 19993 BLAKE2B f7eca57698e6c020a39db723b01485333ae5ec962d4b70357c23a3f45aef72057e24315cf9bbac9268fffef9839398244c0c7196bb8ecb6f38f01ca12cec5211 SHA512 cc07eb5a9022e7d9e200b8c414c900ff069dd4c61773eba0b5047a4aea9e75f1263c1a4f0d8df559956a55b95dabf74a497cdb91fb27652ab7822e03e6588edc MISC metadata.xml 1515 BLAKE2B 318f796bfacb0e1facbd60f80fc9176e24f06661fc4dce4acda3a218aab10766231566a9ae58f9985770513fb53a52e9ea5e985aba0bcff62c042c75fb662c70 SHA512 4c886d89143d2862a3d915e5b0ef14382c76d758a306fa9971a762fdae400086175c470045e85775f028947156a4bb40a09bd9810c56dda08662e835cba3b45c diff --git a/app-metrics/collectd/collectd-5.12.0-r7.ebuild b/app-metrics/collectd/collectd-5.12.0-r7.ebuild index 1b25586eb8fc..26990d0f4680 100644 --- a/app-metrics/collectd/collectd-5.12.0-r7.ebuild +++ b/app-metrics/collectd/collectd-5.12.0-r7.ebuild @@ -170,7 +170,10 @@ REQUIRED_USE=" collectd_plugins_smart? ( udev ) contrib? ( perl )" -PATCHES=( "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-5.11.0-libsigrok-0.4+.patch + "${FILESDIR}"/${PN}-5.12.0-python3_11.patch +) # @FUNCTION: collectd_plugin_kernel_linux # @DESCRIPTION: diff --git a/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch b/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch new file mode 100644 index 000000000000..3c0572889559 --- /dev/null +++ b/app-metrics/collectd/files/collectd-5.12.0-python3_11.patch @@ -0,0 +1,33 @@ +From 623e95394e0e62e7f9ced2104b786d21e9c0bf53 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + <congdanhqx@gmail.com> +Date: Wed, 21 Sep 2022 22:21:58 +0700 +Subject: [PATCH] cpython: fix build with Python 3.11 + +Python 3.11 moves longintrepr.h into cpython sub-directory. +However, in this version, longintrepr.h is always included. +--- + src/cpython.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/cpython.h b/src/cpython.h +index 11e64fa62f..bcfa406feb 100644 +--- a/src/cpython.h ++++ b/src/cpython.h +@@ -24,9 +24,15 @@ + * Sven Trenkel <collectd at semidefinite.de> + **/ + ++#include <Python.h> + /* Some python versions don't include this by default. */ +- ++#if PY_VERSION_HEX < 0x030B0000 ++/* ++ * Python 3.11 move longintrepr.h to cpython/longintrepr.h ++ * And it's always included ++ */ + #include <longintrepr.h> ++#endif /* PY_VERSION_HEX < 0x030B0000 */ + + /* These two macros are basically Py_BEGIN_ALLOW_THREADS and + * Py_BEGIN_ALLOW_THREADS |