Add patch from Debian to fix build with boost-1.48 and newer, wrt bug #425374. Fix .desktop file validation. Drop redundant FDO database update which is now handled by the eclass. Assign maintainership to KDE herd.

(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

5 files changed, 91 insertions, 4 deletions

diff --git a/kde-misc/kcollectd/ChangeLog b/kde-misc/kcollectd/ChangeLog
index 3740448952f4..ec74c8cf9e32 100644
--- a/kde-misc/kcollectd/ChangeLog
+++ b/kde-misc/kcollectd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-misc/kcollectd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/ChangeLog,v 1.11 2012/09/11 10:51:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/ChangeLog,v 1.12 2012/10/19 17:25:36 kensington Exp $
+
+*kcollectd-0.9-r1 (19 Oct 2012)
+
+  19 Oct 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/kcollectd-0.9-boost.patch, +files/kcollectd-0.9-desktop.patch,
+  +kcollectd-0.9-r1.ebuild, files/kcollectd-0.9-cflags.patch, metadata.xml:
+  Add patch from Debian to fix build with boost-1.48 and newer, wrt bug #425374.
+  Fix .desktop file validation. Drop redundant FDO database update which is now
+  handled by the eclass. Assign maintainership to KDE herd.
 
   11 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Drop maintainership
diff --git a/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch b/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch
new file mode 100644
index 000000000000..7823ab7dbac1
--- /dev/null
+++ b/kde-misc/kcollectd/files/kcollectd-0.9-boost.patch
@@ -0,0 +1,42 @@
+--- 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-desktop.patch b/kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch
new file mode 100644
index 000000000000..6e5ce5bd6fc4
--- /dev/null
+++ b/kde-misc/kcollectd/files/kcollectd-0.9-desktop.patch
@@ -0,0 +1,11 @@
+--- kcollectd/kcollectd.desktop
++++ 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/kcollectd-0.9-r1.ebuild b/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild
new file mode 100644
index 000000000000..d42ffeeeab04
--- /dev/null
+++ b/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcollectd/kcollectd-0.9-r1.ebuild,v 1.1 2012/10/19 17:25:36 kensington Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="Simple KDE-based live data viewer for collectd"
+HOMEPAGE="http://www.forwiss.uni-passau.de/~berberic/Linux/kcollectd.html"
+SRC_URI="http://www.forwiss.uni-passau.de/~berberic/Linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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"
+)
diff --git a/kde-misc/kcollectd/metadata.xml b/kde-misc/kcollectd/metadata.xml
index 91f4e72fb544..a23f444b67d6 100644
--- a/kde-misc/kcollectd/metadata.xml
+++ b/kde-misc/kcollectd/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+	<herd>kde</herd>
 </pkgmetadata>