diff options
Diffstat (limited to 'app-metrics/collectd')
| -rw-r--r-- | app-metrics/collectd/Manifest | 5 | ||||
| -rw-r--r-- | app-metrics/collectd/collectd-5.9.1.ebuild (renamed from app-metrics/collectd/collectd-5.8.0-r1.ebuild) | 19 | ||||
| -rw-r--r-- | app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch | 98 |
3 files changed, 15 insertions, 107 deletions
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest index 6665bf874eb7..617045da5013 100644 --- a/app-metrics/collectd/Manifest +++ b/app-metrics/collectd/Manifest @@ -1,11 +1,10 @@ -AUX collectd-5.8.0-disk-plugin-udev-fix.patch 2659 BLAKE2B 9b787040e34e62f06993d5bc2ccf92032b9880a1ba65f69c351300ad61ffa6e1ff5ace074285abf3e05962b61a2aa15f355f48ab9f789357197dc24d50138025 SHA512 bdac64df91de88d0cb8220a9cd5a9d303a5d9f3551484bf6319c8a2987ef69c2becc4dfb37350836767aed06704be3da9500433c21f1363c80c6d3faac13e1e5 AUX collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch 2595 BLAKE2B cd60e42c3870611b30068d09410abc1cc80e5c2c945805d9a105050a52f3c2fc2ca2c5e10f33cd9c5063b0773a1bdad9ea7446f88632674cbd2cdd5202a69247 SHA512 6c04f6651a4bbe0c051202cfc3fae3e366cacf34c74e9ff3f09ca83887eb165e4febf8957ede66c22195c03c1f111b24a8859a56921cd42f68f938e87d784f52 AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7 AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668 -DIST collectd-5.8.0.tar.bz2 1686017 BLAKE2B 26d995cdb9c25869bf96a056e6ba879de9f009fd4bbf1364a7dedba93b822e57c4b606ca8c84da68cc29db8e77333047695e85d7eb101080de9cee783240f5ea SHA512 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901 -EBUILD collectd-5.8.0-r1.ebuild 19412 BLAKE2B c1b044dbed47d6583330e67ab4b30dd5b788c397178617ba116d2d6ecef5769fddb6af17ed88127760a4a8be67635b1f22c4c1840e3eb423de3fc9314d6093eb SHA512 2b46a3eba0d79715ee94d34002cd8f7e6645d632221d0668e5e2fab6855859ac3d22bf9c60a7482816e0ce2c804132769a1488b591817a87233a120e7d90047f +DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce SHA512 424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb EBUILD collectd-5.8.1.ebuild 19429 BLAKE2B b84bcdcd587f375766052acc92f3c053fac92a6c0a8750a1d558333345918fdcd7e563f705830b85cc5c76f9b14beca28297a8b1762ac6f67f66bd871c1c522f SHA512 123f88476f52f94cc5a975558889fb450e5341d6ae9ac9ec0cf4ffb5d46633d04f949b27f8408cab587d818ce27058c2d2dd53c8ea70315c9c7215c06cce61fe +EBUILD collectd-5.9.1.ebuild 19563 BLAKE2B 99704cccf28dfbfb29085fa99f586efa15dcc0702d542927931cef723d583a6e988fadbdce96a4e69976f2e21a5404566ffd98c30f2362e793e4119ef96c535d SHA512 d4ca49e401ee7b92e7422e0cd3fc09d73ebaf4a5d0432c9f8836e0e859f7c3ee527b700c35d871b83651242cf76f8aa92baadac9f3549ea3e8860b6852940d78 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5 diff --git a/app-metrics/collectd/collectd-5.8.0-r1.ebuild b/app-metrics/collectd/collectd-5.9.1.ebuild index 64b897cee82b..e79b4d6e0e41 100644 --- a/app-metrics/collectd/collectd-5.8.0-r1.ebuild +++ b/app-metrics/collectd/collectd-5.9.1.ebuild @@ -11,17 +11,18 @@ inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-fun DESCRIPTION="Collects system statistics and provides mechanisms to store the values" HOMEPAGE="https://collectd.org/" -SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PN}-${PV}.tar.gz" LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm x86" +KEYWORDS="~alpha ~amd64 ~arm ~x86" IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs" # The plugin lists have to follow here since they extend IUSE # Plugins that don't build (e.g. dependencies not in Gentoo) # apple_sensors: Requires libIOKit +# amqp1: Requires libqpid-proton # aquaero: Requires aerotools-ng/libaquaero5 # barometer: Requires libi2c (i2c_smbus_read_i2c_block_data) # dpdkevents: Requires dpdk @@ -39,8 +40,8 @@ IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux # write_riemann: Requires riemann-c-client # xmms: Requires libxmms (v1) # zone: Solaris only... -COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc - intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann +COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer dpdkstat + grpc intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann xmms zone" # Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS @@ -159,7 +160,9 @@ REQUIRED_USE=" collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} ) collectd_plugins_smart? ( udev )" -PATCHES=( "${FILESDIR}"/${P}-disk-plugin-udev-fix.patch ) +PATCHES=() + +S="${WORKDIR}/${PN}-${PN}-${PV}" # @FUNCTION: collectd_plugin_kernel_linux # @DESCRIPTION: @@ -344,7 +347,11 @@ src_configure() { # Disable what needs to be disabled. for plugin in ${COLLECTD_DISABLED_PLUGINS}; do - myconf+=" --disable-${plugin}" + if [[ "${plugin}" == 'dpdkstat' ]]; then + myconf+=" --without-libdpdk" + else + myconf+=" --disable-${plugin}" + fi done # Set enable/disable for each single plugin. diff --git a/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch b/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch deleted file mode 100644 index 1a96f06df0a8..000000000000 --- a/app-metrics/collectd/files/collectd-5.8.0-disk-plugin-udev-fix.patch +++ /dev/null @@ -1,98 +0,0 @@ -From ed696c1b3adcb42d55759efe6f8034337f0fd243 Mon Sep 17 00:00:00 2001 -From: Dylan Stephano-Shachter <dylan@wopr.nasuni.net> -Date: Thu, 15 Feb 2018 16:37:33 -0500 -Subject: [PATCH] change HAVE_UDEV_H to HAVE_LIBUDEV_H for bug 2651 - ---- - src/disk.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/disk.c b/src/disk.c -index 004ce9e2d7..04f337415f 100644 ---- a/src/disk.c -+++ b/src/disk.c -@@ -139,7 +139,7 @@ static int pnumdisk; - #error "No applicable input method." - #endif - --#if HAVE_UDEV_H -+#if HAVE_LIBUDEV_H - #include <libudev.h> - - static char *conf_udev_name_attr = NULL; -@@ -173,7 +173,7 @@ static int disk_config(const char *key, const char *value) { - "on Mach / Mac OS X and will be ignored."); - #endif - } else if (strcasecmp("UdevNameAttr", key) == 0) { --#if HAVE_UDEV_H -+#if HAVE_LIBUDEV_H - if (conf_udev_name_attr != NULL) { - free(conf_udev_name_attr); - conf_udev_name_attr = NULL; -@@ -209,7 +209,7 @@ static int disk_init(void) { - /* #endif HAVE_IOKIT_IOKITLIB_H */ - - #elif KERNEL_LINUX --#if HAVE_UDEV_H -+#if HAVE_LIBUDEV_H - if (conf_udev_name_attr != NULL) { - handle_udev = udev_new(); - if (handle_udev == NULL) { -@@ -217,7 +217,7 @@ static int disk_init(void) { - return -1; - } - } --#endif /* HAVE_UDEV_H */ -+#endif /* HAVE_LIBUDEV_H */ - /* #endif KERNEL_LINUX */ - - #elif KERNEL_FREEBSD -@@ -260,10 +260,10 @@ static int disk_init(void) { - - static int disk_shutdown(void) { - #if KERNEL_LINUX --#if HAVE_UDEV_H -+#if HAVE_LIBUDEV_H - if (handle_udev != NULL) - udev_unref(handle_udev); --#endif /* HAVE_UDEV_H */ -+#endif /* HAVE_LIBUDEV_H */ - #endif /* KERNEL_LINUX */ - return 0; - } /* int disk_shutdown */ -@@ -325,7 +325,7 @@ static counter_t disk_calc_time_incr(counter_t delta_time, - } - #endif - --#if HAVE_UDEV_H -+#if HAVE_LIBUDEV_H - /** - * Attempt to provide an rename disk instance from an assigned udev attribute. - * -@@ -841,7 +841,7 @@ static int disk_read(void) { - - output_name = disk_name; - --#if HAVE_UDEV_H -+#if HAVE_LIBUDEV_H - char *alt_name = NULL; - if (conf_udev_name_attr != NULL) { - alt_name = -@@ -852,7 +852,7 @@ static int disk_read(void) { - #endif - - if (ignorelist_match(ignorelist, output_name) != 0) { --#if HAVE_UDEV_H -+#if HAVE_LIBUDEV_H - /* release udev-based alternate name, if allocated */ - sfree(alt_name); - #endif -@@ -878,7 +878,7 @@ static int disk_read(void) { - submit_io_time(output_name, io_time, weighted_time); - } /* if (is_disk) */ - --#if HAVE_UDEV_H -+#if HAVE_LIBUDEV_H - /* release udev-based alternate name, if allocated */ - sfree(alt_name); - #endif |