diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-26 11:42:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-26 11:42:28 +0000 |
commit | 89c6c06b8c42107dd231687a1012354e7d3039fc (patch) | |
tree | dad94f4da8a6694f3cb99f7048be2f9cf5f78f97 /kde-misc/kcollectd | |
parent | 796cae72cf9ed18ba01256ac1f83a686a2a76036 (diff) |
gentoo resync : 26.11.2017
Diffstat (limited to 'kde-misc/kcollectd')
-rw-r--r-- | kde-misc/kcollectd/Manifest | 9 | ||||
-rw-r--r-- | kde-misc/kcollectd/files/kcollectd-0.9-boost.patch | 42 | ||||
-rw-r--r-- | kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch | 10 | ||||
-rw-r--r-- | kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch | 11 | ||||
-rw-r--r-- | kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch | 52 | ||||
-rw-r--r-- | kde-misc/kcollectd/kcollectd-0.9-r1.ebuild | 28 | ||||
-rw-r--r-- | kde-misc/kcollectd/metadata.xml | 8 |
7 files changed, 0 insertions, 160 deletions
diff --git a/kde-misc/kcollectd/Manifest b/kde-misc/kcollectd/Manifest deleted file mode 100644 index 6dbb7e85fdf2..000000000000 --- a/kde-misc/kcollectd/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX kcollectd-0.9-boost.patch 1823 SHA256 4a3ca4927cf7076195f449b0cc1b55950cd6d6ef6a044b5f05df0ec4514e8e50 SHA512 9496b0d194e851fa0aed60fa2dc935a87af8387e3389739deb217d236d97c5babcc7c0e50e27881bba8d424d0c188662e694766dce3fb6a91e42746461b9f49b WHIRLPOOL 70fe042ced4d49d2ec1d6e37cb50ab6e2651198c00b16988670ebe3cdb0f4e7e1daacfb93c0c246d2ab7576a12fef14e620d6e8b0ce47982cfb8eebbf8bb58bc -AUX kcollectd-0.9-cflags.patch 465 SHA256 26fe20680d3f38fb22413ef8bc41b3ad275f6be5b6ecba13b32294995484274a SHA512 54ec861baf837835f59a67790f66d9dbd0be9d30d86bef3ae3198a052a1ea626f1a74df0481d680d093bea319d12123673d63a57162f993a2d454518ab662ec8 WHIRLPOOL 54f7abcfb78aca15cd57b040f188222de39d9fab0bb25f5b28b678c2c88ae203c54ba69f3c5edafb143039df997b75ea3aac47fc0145a8cd94e3e5361772cded -AUX kcollectd-0.9-desktop.patch 324 SHA256 e82c2e209a80dcef4035fd30d9b5d34a62bea39abc9b80cc44858ade9381fd55 SHA512 a34dcbbe8407cf0e90471f3a21b38fe4e938a77321f57a15919ccdd28c998d1403b8e12690d3a2d09042a660bd1ae20a07f8d94a0c953ce918f5cb9f9c99d29e WHIRLPOOL 3447c00202c3b4fa36e54838e01850993ea294b179b8d0b6fb8fca623e63c3962c0bb2321e36e2f4307aab27e63822fef1b6831b673bdb8c223c09f138ac92ca -AUX kcollectd-0.9-gcc6.patch 1929 SHA256 0b00a52c7ef4eb9cec8cd0e73b98477055199e2114173261a7dd3a9d930b0975 SHA512 c26648ed374264b843c66b3eac3e7a7731bcbd37aeac7344ac6d1e3c016c427a31ad6cb1a03653c0055d027e3197d1948d40108ee152f79a744775206cc4fcce WHIRLPOOL eadfd6db0ac6317e2364c6513f4ed399b766794d02b9c6dcf269bd6eb4940fa19092e0fe932edf50be6f2fd70f6536d09476d840d19dce057d43de2cc7f2d043 -DIST kcollectd-0.9.tar.gz 97132 SHA256 d2d4cb9d8d1c0eb7695c3567c6f40d33fdf1655d63038cb0b170af2fadd2a3b1 SHA512 c6eeeb52e137484bbeae564c3e85b25df4b78ff8cd39dcad69316f0c36f645f37096a5117ea5e969f883d65ca8466928c19b0e6121a0156bc345c0a138fa273a WHIRLPOOL c98e8171068efc3fc461bd2b92cee6ce6909ad53462e1dda8b854cc9db6fd8b6d3556e69459d88ada6683b9a0980f450b399316c16d9e010a8672eed6ae93de6 -EBUILD kcollectd-0.9-r1.ebuild 731 SHA256 bc928fa72841aabbefadba43929afeea0a32fa7e2df903472a8284ef4931eafe SHA512 2f381901e3a19dd4cf3bb0bd38bb7eb2552bc320f8939197418efebc475bc37f589c28e3bf3444d79f82ba8f851159a806e779987456a6b178c8fb2f6ef0da8b WHIRLPOOL 346293731adafdc770fa95db847d9e161fc48a87940aea24ac3249fe97cf60116945c18d84725ad006401002c503657e23838bb991aaf4f90998c44ccd3a5aea -MISC ChangeLog 2542 SHA256 2dcaebd90477668ee26ac36712481c0177845e40ca534b0f41a2534ba0548bb5 SHA512 98fbc3555e29719e51f8891de1f3a027a24fba20b03feaaaf2f89b4b670617982418c854613d897f9a421875d7290da4cd48fab939f8c6b72efbd2d39324f04b WHIRLPOOL 4392db20d915d255fc833d126ac9b5a586ff7d4167b8cdfd22c6e44d88796537a6989ec3ad9e410d09dc4cd29ef36a148204e75c3d3d98f05a6f56ba76ff76d3 -MISC ChangeLog-2015 2334 SHA256 f49f1b4804655a6ccc30b06d5740f183becc3a8f0cc21746319b53d54a3674a1 SHA512 630fb78aa468275e4ac34a189e48b9cbc01efc7406d5671919cf0e5f68b2f9e6165a32568bee0db02d655b92823521df5a7b67eaa82a656590ee224a6b122fd6 WHIRLPOOL b0526c2bd92bc14131b5d827cdcfc72741f06ce7b4b8b01f4224353c9d68c67b282aab97a8c8b71636d73f5b037cd66395aa3c50e798ee79f313f7f569681f4e -MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch b/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch deleted file mode 100644 index 7823ab7dbac1..000000000000 --- a/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- kcollectd-0.9.orig/kcollectd/kcollectd.cc -+++ kcollectd-0.9/kcollectd/kcollectd.cc -@@ -73,7 +73,7 @@ - gui->show(); - } - } -- catch(basic_filesystem_error<path> &e) { -+ catch(const std::exception &e) { - KMessageBox::error(0, i18n("Failed to read collectd-structure at \'%1\'\n" - "Terminating.", QString(RRD_BASEDIR))); - exit(1); - ---- kcollectd-0.9.orig/kcollectd/gui.cc -+++ kcollectd-0.9/kcollectd/gui.cc -@@ -127,21 +127,21 @@ - const directory_iterator end_itr; - for (directory_iterator host(rrdpath); host != end_itr; ++host ) { - if (is_directory(*host)) { -- QTreeWidgetItem *hostitem = mkItem(listview, host->leaf()); -+ QTreeWidgetItem *hostitem = mkItem(listview, host->path().filename().string()); - hostitem->setFlags(hostitem->flags() & ~Qt::ItemIsSelectable); - for (directory_iterator sensor(*host); sensor != end_itr; ++sensor ) { - if (is_directory(*sensor)) { -- QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->leaf()); -+ QTreeWidgetItem *sensoritem = mkItem(hostitem, sensor->path().filename().string()); - sensoritem->setFlags(sensoritem->flags() & ~Qt::ItemIsSelectable); - for (directory_iterator rrd(*sensor); rrd != end_itr; ++rrd ) { - if (is_regular(*rrd) && extension(*rrd) == ".rrd") { - QTreeWidgetItem *rrditem = mkItem(sensoritem, basename(*rrd)); - rrditem->setFlags(rrditem->flags() & ~Qt::ItemIsSelectable); - std::ostringstream info; -- info << host->leaf() << delimiter -- << sensor->leaf() << delimiter -+ info << host->path().filename().string() << delimiter -+ << sensor->path().filename().string() << delimiter - << basename(*rrd); -- get_datasources(rrd->string(), info.str(), rrditem); -+ get_datasources(rrd->path().string(), info.str(), rrditem); - } - } - } - diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch b/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch deleted file mode 100644 index 702c588d367e..000000000000 --- a/kde-misc/kcollectd/files/kcollectd-0.9-cflags.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ruN kcollectd-0.9.orig/kcollectd/CMakeLists.txt kcollectd-0.9/kcollectd/CMakeLists.txt ---- kcollectd-0.9.orig/kcollectd/CMakeLists.txt 2009-11-30 22:01:54.000000000 +0100 -+++ kcollectd-0.9/kcollectd/CMakeLists.txt 2011-04-24 15:35:21.596229942 +0200 -@@ -1,5 +1,5 @@ - --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAG} ${KDE4_ENABLE_EXCEPTIONS}") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") - - find_package(Boost COMPONENTS filesystem system) - diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch b/kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch deleted file mode 100644 index d50fdfba1864..000000000000 --- a/kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kcollectd/kcollectd.desktop -+++ b/kcollectd/kcollectd.desktop -@@ -5,7 +5,7 @@ - Terminal=false - StartupNotify=true - Categories=Qt;KDE;Utility; --MimeType=application/x-kcollectd -+MimeType=application/x-kcollectd; - Name=KDE collectd database-viewer - Name[de]=KDE collectd Datenbankbetrachter - GenericName=Collectd viewer diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch b/kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch deleted file mode 100644 index bcf28d0a3182..000000000000 --- a/kde-misc/kcollectd/files/kcollectd-0.9-gcc6.patch +++ /dev/null @@ -1,52 +0,0 @@ -Description: fix FTBFS with gcc-6 -Author: Logan Rosen <logan@ubuntu.com> -Acked-By: Mattia Rizzolo <mattia@debian.org> -Bug-Debian: https://bugs.debian.org/831129 -Last-Update: 2016-10-10 - ---- a/kcollectd/graph.cc -+++ b/kcollectd/graph.cc -@@ -564,9 +564,9 @@ - paint.setPen(Qt::NoPen); - paint.setBrush(QBrush(color_minmax[color_nr++ % 8])); - for(int i=0; i<size; ++i) { -- while (i<size && (isnan(min_data[i]) || isnan(max_data[i]))) ++i; -+ while (i<size && (std::isnan(min_data[i]) || std::isnan(max_data[i]))) ++i; - int l = i; -- while (i<size && !isnan(min_data[i]) && !isnan(max_data[i])) ++i; -+ while (i<size && !std::isnan(min_data[i]) && !std::isnan(max_data[i])) ++i; - const int asize = i-l; - points.resize(asize*2); - int k; -@@ -597,9 +597,9 @@ - if (!avg_data.empty()) { - paint.setPen(color_line[color_nr++ % 8]); - for(int i=0; i<size; ++i) { -- while (i<size && isnan(avg_data[i])) ++i; -+ while (i<size && std::isnan(avg_data[i])) ++i; - int l = i; -- while (i<size && !isnan(avg_data[i])) ++i; -+ while (i<size && !std::isnan(avg_data[i])) ++i; - const int asize = i-l; - points.resize(asize); - for(int k=0; k<asize; ++k, ++l) { ---- a/kcollectd/misc.cc -+++ b/kcollectd/misc.cc -@@ -119,7 +119,7 @@ - // process avg_data - if (!avg_data.empty()) { - for(std::size_t i=0; i<size; ++i) { -- if (isnan(avg_data[i])) continue; -+ if (std::isnan(avg_data[i])) continue; - valid = true; - if (min > avg_data[i]) min = avg_data[i]; - if (max < avg_data[i]) max = avg_data[i]; -@@ -129,7 +129,7 @@ - // process min/max-data - if (!min_data.empty() && !max_data.empty()) { - for(std::size_t i=0; i<size; ++i) { -- if (isnan(min_data[i]) || isnan(max_data[i])) continue; -+ if (std::isnan(min_data[i]) || std::isnan(max_data[i])) continue; - valid = true; - if (min > min_data[i]) min = min_data[i]; - if (max < min_data[i]) max = min_data[i]; diff --git a/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild b/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild deleted file mode 100644 index a06fbb5bdb63..000000000000 --- a/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde4-base - -DESCRIPTION="Simple kdelibs4-based live data viewer for collectd" -HOMEPAGE="https://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html" -SRC_URI="https://www.forwiss.uni-passau.de/~berberic/Linux/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="4" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND=" - dev-libs/boost:= - net-analyzer/rrdtool" -RDEPEND="${DEPEND} - || ( app-admin/collectd[collectd_plugins_rrdtool] app-admin/collectd[collectd_plugins_rrdcached] )" - -PATCHES=( - "${FILESDIR}/${P}-boost.patch" - "${FILESDIR}/${P}-cflags.patch" - "${FILESDIR}/${P}-desktop.patch" - "${FILESDIR}/${P}-gcc6.patch" -) diff --git a/kde-misc/kcollectd/metadata.xml b/kde-misc/kcollectd/metadata.xml deleted file mode 100644 index 2fdbf33d963d..000000000000 --- a/kde-misc/kcollectd/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> -</pkgmetadata> |