diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2010-08-26 21:07:04 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2010-08-26 21:07:04 +0000 |
| commit | 776b10f0ee894211df74c52de59aef4ee7e2cbd6 (patch) | |
| tree | c8d754f414a1fad2c7a8721c7d272e98f4ab37f9 /app-admin | |
| parent | net-misc/autoupnp: Support installing setuid & setgid. (diff) | |
| download | sunrise-reviewed-776b10f0ee894211df74c52de59aef4ee7e2cbd6.tar.gz sunrise-reviewed-776b10f0ee894211df74c52de59aef4ee7e2cbd6.tar.bz2 sunrise-reviewed-776b10f0ee894211df74c52de59aef4ee7e2cbd6.zip | |
[app-admin/collectd] Require iptables version where --as-needed linkage is fixed, see bug #334503. Fix typo in cd_postgresql useflag handling.
(Portage version: 2.1.8.3/svn/Linux x86_64)
svn path=/sunrise/; revision=11248
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/collectd/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/collectd/collectd-4.10.1-r1.ebuild (renamed from app-admin/collectd/collectd-4.10.1.ebuild) | 6 | ||||
| -rw-r--r-- | app-admin/collectd/files/collectd-4.10.1-libiptc.patch | 12 |
3 files changed, 10 insertions, 16 deletions
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index aff2eb729..830e3e8c0 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*collectd-4.10.1-r1 (26 Aug 2010) + + 26 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> + -collectd-4.10.1.ebuild, +collectd-4.10.1-r1.ebuild, + -files/collectd-4.10.1-libiptc.patch: + Require iptables version where --as-needed linkage is fixed, see bug + #334503. Fix typo in cd_postgresql useflag handling. + *collectd-4.10.1 (23 Aug 2010) 23 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> diff --git a/app-admin/collectd/collectd-4.10.1.ebuild b/app-admin/collectd/collectd-4.10.1-r1.ebuild index 7c93304fd..9453625f0 100644 --- a/app-admin/collectd/collectd-4.10.1.ebuild +++ b/app-admin/collectd/collectd-4.10.1-r1.ebuild @@ -58,7 +58,7 @@ COMMON_DEPEND=" cd_dns? ( net-libs/libpcap ) cd_gmond? ( sys-cluster/ganglia ) cd_ipmi? ( >=sys-libs/openipmi-2.0.11 ) - cd_iptables? ( net-firewall/iptables ) + cd_iptables? ( >=net-firewall/iptables-1.4.9.1-r2 ) cd_java? ( virtual/jre dev-java/java-config-wrapper ) cd_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) cd_memcachec? ( dev-libs/libmemcached ) @@ -73,7 +73,7 @@ COMMON_DEPEND=" cd_onewire? ( sys-fs/owfs ) cd_oracle? ( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 ) cd_perl? ( dev-lang/perl[ithreads] sys-devel/libperl[ithreads] ) - cd_postgres? ( >=dev-db/postgresql-base-8.2 ) + cd_postgresql? ( >=dev-db/postgresql-base-8.2 ) cd_python? ( || ( dev-lang/python:2.4 dev-lang/python:2.5 dev-lang/python:2.6 ) ) cd_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) cd_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) @@ -101,8 +101,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} cd_syslog? ( virtual/logger )" -PATCHES=( "${FILESDIR}/${P}-libiptc.patch" ) - collectd_plugin_kernel_linux() { # # USAGE: <plug-in name> <kernel_options> <severity> diff --git a/app-admin/collectd/files/collectd-4.10.1-libiptc.patch b/app-admin/collectd/files/collectd-4.10.1-libiptc.patch deleted file mode 100644 index 7a4e6ffe1..000000000 --- a/app-admin/collectd/files/collectd-4.10.1-libiptc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r collectd-4.10.1.orig/configure.in collectd-4.10.1/configure.in ---- collectd-4.10.1.orig/configure.in 2010-07-09 12:01:59.000000000 +0200 -+++ collectd-4.10.1/configure.in 2010-08-23 22:16:38.000000000 +0200 -@@ -1626,7 +1626,7 @@ - # Check for the iptc_init symbol in the library. - if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno" - then -- AC_CHECK_LIB(iptc, iptc_init, -+ AC_CHECK_LIB(ip4tc, iptc_init, - [ - AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).]) - ], |