app-admin/collectd: Dropped old

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1101

8 files changed, 0 insertions, 225 deletions

diff --git a/app-admin/collectd/files/collectd-5.4.1-libocci.patch b/app-admin/collectd/files/collectd-5.4.1-libocci.patch
deleted file mode 100644
index 14b7d6992bb6..000000000000
--- a/app-admin/collectd/files/collectd-5.4.1-libocci.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git configure.ac configure.ac
-index 7029e1e..72f6ff4 100644
---- configure.ac
-+++ configure.ac
-@@ -2941,14 +2941,14 @@ AC_ARG_WITH(oracle, [AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path t
- ])
- if test "x$ORACLE_HOME" != "x"
- then
--	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public"
-+	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci"
-
- 	if test -e "$ORACLE_HOME/lib/ldflags"
- 	then
- 		with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"`
- 	fi
- 	#with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh"
--	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh"
-+	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci"
- fi
- if test "x$with_oracle" = "xyes"
- then
\ No newline at end of file
diff --git a/app-admin/collectd/files/collectd-5.4.1-libperl.patch b/app-admin/collectd/files/collectd-5.4.1-libperl.patch
deleted file mode 100644
index 4f60802240ac..000000000000
--- a/app-admin/collectd/files/collectd-5.4.1-libperl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git configure.ac configure.ac
-index ce8a9bc..eaa464e 100644
---- configure.ac
-+++ configure.ac
-@@ -3109,11 +3109,13 @@ if test "x$with_libperl" = "xyes" \
- then
-   SAVE_CFLAGS="$CFLAGS"
-   SAVE_LDFLAGS="$LDFLAGS"
-+  SAVE_LIBS="$LIBS"
- dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
-   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
-   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
-   CFLAGS="$CFLAGS $PERL_CFLAGS"
-   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
-+  LIBS="$LIBS -lperl -lpthread"
-
-   AC_CACHE_CHECK([for libperl],
-     [c_cv_have_libperl],
-@@ -3132,7 +3134,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string
- ]]]
-       )],
-       [c_cv_have_libperl="yes"],
--      [c_cv_have_libperl="no"]
-+      [
-+        c_cv_have_libperl="no"
-+        LIBS="$SAVE_LIBS"
-+      ]
-     )
-   )
diff --git a/app-admin/collectd/files/collectd-5.4.1-lt.patch b/app-admin/collectd/files/collectd-5.4.1-lt.patch
deleted file mode 100644
index bac1809f1c30..000000000000
--- a/app-admin/collectd/files/collectd-5.4.1-lt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git Makefile.am Makefile.am
-index 5267123..a7e0d0c 100644
---- Makefile.am
-+++ Makefile.am
-@@ -1,6 +1,4 @@
--ACLOCAL_AMFLAGS = -I libltdl/m4
--
--SUBDIRS = libltdl src bindings .
-+SUBDIRS = src bindings .
-
- INCLUDES = $(LTDLINCL)
-
-diff --git configure.ac configure.ac
-index eaa464e..d652d46 100644
---- configure.ac
-+++ configure.ac
-@@ -7,7 +7,6 @@ AC_CONFIG_AUX_DIR([libltdl/config])
- m4_ifdef([LT_PACKAGE_VERSION],
- 	# libtool >= 2.2
- 	[
--	 LT_CONFIG_LTDL_DIR([libltdl])
- 	 LT_INIT([dlopen])
- 	 LTDL_INIT([convenience])
- 	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
-@@ -19,7 +18,6 @@ m4_ifdef([LT_PACKAGE_VERSION],
- 	 AC_SUBST(LTDLINCL)
- 	 AC_SUBST(LIBLTDL)
- 	 AC_LIBTOOL_DLOPEN
--	 AC_CONFIG_SUBDIRS(libltdl)
- 	 AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
- 	]
- )
\ No newline at end of file
diff --git a/app-admin/collectd/files/collectd-5.4.1-nohal.patch b/app-admin/collectd/files/collectd-5.4.1-nohal.patch
deleted file mode 100644
index 9978296e8df6..000000000000
--- a/app-admin/collectd/files/collectd-5.4.1-nohal.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git configure.ac configure.ac
-index 7029e1e..ad5e336 100644
---- configure.ac
-+++ configure.ac
-@@ -1351,18 +1351,7 @@ AC_CHECK_LIB(resolv, res_search,
- AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
-
- dnl Check for HAL (hardware abstraction library)
--with_libhal="yes"
--AC_CHECK_LIB(hal,libhal_device_property_exists,
--	     [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
--	     [with_libhal="no"])
--if test "x$with_libhal" = "xyes"; then
--	if test "x$PKG_CONFIG" != "x"; then
--		BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
--		BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
--		AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
--		AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
--	fi
--fi
-+with_libhal="no"
-
- m4_divert_once([HELP_WITH], [
- collectd additional packages:])
\ No newline at end of file
diff --git a/app-admin/collectd/files/collectd-5.5.0-lt.patch b/app-admin/collectd/files/collectd-5.5.0-lt.patch
deleted file mode 100644
index b14736bf2667..000000000000
--- a/app-admin/collectd/files/collectd-5.5.0-lt.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git Makefile.am Makefile.am
-index 5267123..a7e0d0c 100644
---- Makefile.am
-+++ Makefile.am
-@@ -1,6 +1,4 @@
--ACLOCAL_AMFLAGS = -I libltdl/m4
--
--SUBDIRS = libltdl src bindings .
-+SUBDIRS = src bindings .
-
- INCLUDES = $(LTDLINCL)
-
---- configure.ac.old	2016-01-04 13:55:39.286846436 +0400
-+++ configure.ac	2016-01-04 13:56:07.905362298 +0400
-@@ -2,12 +2,10 @@
- AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
- AC_CONFIG_SRCDIR(src/)
- AC_CONFIG_HEADERS(src/config.h)
--AC_CONFIG_AUX_DIR([libltdl/config])
- 
- m4_ifdef([LT_PACKAGE_VERSION],
- 	# libtool >= 2.2
- 	[
--	 LT_CONFIG_LTDL_DIR([libltdl])
- 	 LT_INIT([dlopen])
- 	 LTDL_INIT([convenience])
- 	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
-@@ -19,7 +17,6 @@
- 	 AC_SUBST(LTDLINCL)
- 	 AC_SUBST(LIBLTDL)
- 	 AC_LIBTOOL_DLOPEN
--	 AC_CONFIG_SUBDIRS(libltdl)
- 	 AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
- 	]
- )
diff --git a/app-admin/collectd/files/collectd.confd b/app-admin/collectd/files/collectd.confd
deleted file mode 100644
index 979b7255b0fc..000000000000
--- a/app-admin/collectd/files/collectd.confd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Nice value used to launch collectd, to change priority of the process. As
-# you usually will want to run it in background, a default of 5 is used.
-#
-#COLLECTD_NICELVL='5'
-
-# Location of configuration file. Modify if you don't like the standard one.
-#
-#COLLECTD_CFGFILE='/etc/collectd.conf'
-
-# File used to store the PID file. Usually you won't need to touch it.
-#
-#COLLECTD_PIDFILE='/var/run/collectd/collectd.pid'
-
-# User to run collectd as (default is collectd, change to root or give
-# collectd user appropriate privileges if you use one of the plugins that 
-# require it, as e.g. ping or iptables plugins)
-#
-#COLLECTD_USER='collectd'
diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd
deleted file mode 100644
index 10d29524d10a..000000000000
--- a/app-admin/collectd/files/collectd.initd
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-: ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'}
-: ${COLLECTD_CFGFILE:='/etc/collectd.conf'}
-: ${COLLECTD_NICELVL:='5'}
-: ${COLLECTD_USER:='collectd'}
-
-extra_commands="configtest"
-
-depend() {
-	use net
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-checkconfig() {
-	if [ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ] ; then
-		if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then
-			. /etc/env.d/50oracle-instantclient-basic
-		        export ORACLE_HOME
-		        export TNS_ADMIN
-		else
-			ewarn "Unable to set Oracle environment, Oracle plugin wont work"
-		fi
-	fi
-
-	/usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" 1>/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} has detected an error in your setup:"
-		/usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}"
-	fi
-
-	return $ret
-}
-
-start() {
-	checkconfig || return 1
-	[ -d /var/run/collectd ] || mkdir /var/run/collectd && chown collectd:collectd /var/run/collectd
-
-	ebegin "Starting collectd"
-	start-stop-daemon --start --user "${COLLECTD_USER}:collectd" \
-		--env LC_NUMERIC=C \
-		--nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \
-			-P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}"
-	eend $? "Failed to start collectd"
-}
-
-stop() {
-	ebegin "Stopping collectd"
-	start-stop-daemon --stop \
-		--env LC_NUMERIC=C \
-		--pidfile "${COLLECTD_PIDFILE}"
-	eend $? "Failed to stop collectd"
-}
diff --git a/app-admin/collectd/files/logrotate b/app-admin/collectd/files/collectd.logrotate
index 5d344f6208f1..5d344f6208f1 100644
--- a/app-admin/collectd/files/logrotate
+++ b/app-admin/collectd/files/collectd.logrotate