[gentoo-commits] gentoo-x86 commit in app-admin/collectd: ChangeLog collectd-4.10.1-r2.ebuild

["Andreas HAttel (dilfridge)" <dilfridge@gentoo.org>]

dilfridge    10/10/12 17:59:52

  Modified:             ChangeLog collectd-4.10.1-r2.ebuild
  Log:
  Real fix for bug 340109: use libiptc only if needed and fully disable bundled copy
  
  (Portage version: 2.1.9.14/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  app-admin/collectd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	10 Oct 2010 19:13:04 -0000	1.5
+++ ChangeLog	12 Oct 2010 17:59:52 -0000	1.6
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/collectd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.5 2010/10/10 19:13:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.6 2010/10/12 17:59:52 dilfridge Exp $
+
+  12 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  collectd-4.10.1-r2.ebuild, +files/collectd-4.10.1-noowniptc.patch:
+  Real fix for bug 340109: use libiptc only if needed for iptables plugin,
+  and completely disable bundled version
 
   10 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   files/collectd.initd:



1.6                  app-admin/collectd/collectd-4.10.1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild?r1=1.5&r2=1.6

Index: collectd-4.10.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- collectd-4.10.1-r2.ebuild	10 Oct 2010 18:15:48 -0000	1.5
+++ collectd-4.10.1-r2.ebuild	12 Oct 2010 17:59:52 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.5 2010/10/10 18:15:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.1-r2.ebuild,v 1.6 2010/10/12 17:59:52 dilfridge Exp $
 
 EAPI="2"
 
@@ -46,10 +46,7 @@
 
 # Now come the dependencies.
 
-# this cannot be in the dependencies if the USE flag is not listed
-# 	collectd_plugins_oracle?		( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
 COMMON_DEPEND="
-	>=net-firewall/iptables-1.4.9.1-r2
 	collectd_plugins_apache?		( net-misc/curl )
 	collectd_plugins_ascent?		( net-misc/curl dev-libs/libxml2 )
 	collectd_plugins_bind?			( dev-libs/libxml2 )
@@ -97,7 +94,7 @@
 RDEPEND="${COMMON_DEPEND}
 	collectd_plugins_syslog?		( virtual/logger )"
 
-PATCHES=( "${FILESDIR}/${P}"-{libperl,libiptc}.patch )
+PATCHES=( "${FILESDIR}/${P}"-{libperl,libiptc,noowniptc}.patch )
 
 # @FUNCTION: collectd_plugin_kernel_linux
 # @DESCRIPTION:
@@ -251,6 +248,11 @@
 		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
 	fi
 
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	if ! use collectd_plugins_iptables; then
+		myconf+=" --with-libiptc=no"
+	fi
+
 	# Finally, run econf.
 	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl --localstatedir=/var ${myconf}
 }