14 files changed, 21 insertions, 850 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index e06cb05d85f6..c0e498af73b1 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/syslog-ng
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.261 2010/11/28 14:51:53 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.262 2011/01/02 22:45:11 mr_bones_ Exp $
+
+  02 Jan 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  -syslog-ng-2.0.10.ebuild, -syslog-ng-2.1.4.ebuild, syslog-ng-3.1.3.ebuild,
+  -files/syslog-ng.conf.debian, -files/syslog-ng.conf.gentoo,
+  -files/syslog-ng.conf.gentoo.3.0, -files/syslog-ng.conf.gentoo.fbsd,
+  -files/syslog-ng.conf.gentoo.fbsd.3.0,
+  -files/syslog-ng.conf.gentoo.hardened,
+  -files/syslog-ng.conf.gentoo.hardened.3.0, -files/syslog-ng.rc6-r1,
+  -files/syslog-ng.rc6.3.0, -files/syslog-ng.rc6.3.0-r1:
+  punt old ebuilds and files
 
 *syslog-ng-3.0.9 (28 Nov 2010)
 
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.debian b/app-admin/syslog-ng/files/syslog-ng.conf.debian
deleted file mode 100644
index 9a55bf77d050..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.debian
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# Syslog-ng configuration file, compatible with default Debian syslogd
-# installation. Originally written by anonymous (I can't find his name)
-# Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>)
-
-# First, set some global options.
-options { chain_hostnames(off); sync(0); use_dns(no);
-	  owner("root"); group("adm"); perm(0640);
-};
-
-########################
-# Sources
-########################
-# This is the default behavior of sysklogd package
-# Logs may come from unix stream, but not from another machine.
-#
-source src { unix-dgram("/dev/log"); internal();
-       	     file("/proc/kmsg" log_prefix("kernel: "));
-};
-
-# If you wish to get logs from remote machine you should uncomment
-# this and comment the above source line.
-#
-#source net { tcp(ip(127.0.0.1) port(1000) authentication(required) encrypt(allow)); };
-
-########################
-# Destinations
-########################
-# First some standard logfile
-#
-destination auth { file("/var/log/auth.log"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination mail { file("/var/log/mail.log"); };
-destination syslog { file("/var/log/syslog.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-
-# This files are the log come from the mail subsystem.
-#
-destination mailinfo { file("/var/log/mail/mail.info"); };
-destination mailwarn { file("/var/log/mail/mail.warn"); };
-destination mailerr { file("/var/log/mail/mail.err"); };
-
-# Logging for INN news system
-#
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-# Some `catch-all' logfiles.
-#
-destination debug { file("/var/log/debug"); };
-destination error { file("/var/log/error"); };
-
-# The root's console.
-#
-destination console { usertty("root"); };
-
-# Virtual console.
-#
-destination console_all { file("/dev/vc/10"); };
-
-# The named pipe /dev/xconsole is for the nsole' utility.  To use it,
-# you must invoke nsole' with the -file' option:
-#
-#    $ xconsole -file /dev/xconsole [...]
-#
-destination xconsole { pipe("/dev/xconsole"); };
-
-# Send the messages to an other host
-#
-#destination net { tcp("127.0.0.1" port(1000) authentication(on) encrypt(on) log_fifo_size(1000)); };
-
-# Debian only
-destination ppp { file("/var/log/ppp.log"); };
-
-########################
-# Filters
-########################
-# Here's come the filter options. With this rules, we can set which 
-# message go where.
-
-filter dbg { level(debug); };
-filter info { level(info); };
-filter notice { level(notice); };
-filter warn { level(warn); };
-filter err { level(err); };
-filter crit { level(crit .. emerg); };
-
-filter debug { level(debug) and not facility(auth, authpriv, news, mail); };
-filter error { level(err .. emerg) ; };
-
-filter auth { facility(auth, authpriv) and not filter(debug); };
-filter cron { facility(cron) and not filter(debug); };
-filter daemon { facility(daemon) and not filter(debug); };
-filter kern { facility(kern) and not filter(debug); };
-filter lpr { facility(lpr) and not filter(debug); };
-filter local { facility(local0, local1, local3, local4, local5,
-                        local6, local7) and not filter(debug); };
-filter mail { facility(mail) and not filter(debug); };
-filter news { facility(news) and not filter(debug); };
-filter syslog { facility(syslog) and not filter(debug); };
-filter user { facility(user) and not filter(debug); };
-filter uucp { facility(uucp) and not filter(debug); };
-
-filter cnews { level(notice, err, crit) and facility(news); };
-filter cother { level(debug, info, notice, warn) or facility(daemon, mail); };
-
-filter ppp { facility(local2) and not filter(debug); };
-filter console { level(warn .. emerg); };
-
-########################
-# Log paths
-########################
-log { source(src); filter(auth); destination(auth); };
-log { source(src); filter(cron); destination(cron); };
-log { source(src); filter(daemon); destination(daemon); };
-log { source(src); filter(kern); destination(kern); };
-log { source(src); filter(lpr); destination(lpr); };
-log { source(src); filter(syslog); destination(syslog); };
-log { source(src); filter(user); destination(user); };
-log { source(src); filter(uucp); destination(uucp); };
-
-log { source(src); filter(mail); destination(mail); };
-#log { source(src); filter(mail); filter(info); destination(mailinfo); };
-#log { source(src); filter(mail); filter(warn); destination(mailwarn); };
-#log { source(src); filter(mail); filter(err); destination(mailerr); };
-
-log { source(src); filter(news); filter(crit); destination(newscrit); };
-log { source(src); filter(news); filter(err); destination(newserr); };
-log { source(src); filter(news); filter(notice); destination(newsnotice); };
-#log { source(src); filter(cnews); destination(console_all); };
-#log { source(src); filter(cother); destination(console_all); };
-
-#log { source(src); filter(ppp); destination(ppp); };
-
-log { source(src); filter(debug); destination(debug); };
-log { source(src); filter(error); destination(error); };
-
-log { source(src); filter(console); destination(console_all);
-				    destination(xconsole); };
-log { source(src); filter(crit); destination(console); };
-
-# All messages send to a remote site
-#
-#log { source(src); destination(net); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo
deleted file mode 100644
index 48e5513fea94..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo,v 1.7 2007/08/02 04:52:18 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo Linux
-# contributed by Michael Sterrett
-
-options { 
-	chain_hostnames(off); 
-	sync(0); 
-
-	# The default action of syslog-ng 1.6.0 is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats(43200); 
-};
-
-source src {
-    unix-stream("/dev/log" max-connections(256));
-    internal();
-    file("/proc/kmsg");
-};
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.0 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.0
deleted file mode 100644
index 3a734ac1fb44..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.0
+++ /dev/null
@@ -1,32 +0,0 @@
-@version: 3.0
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.3.0,v 1.1 2009/05/25 20:07:21 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-options { 
-	chain_hostnames(no); 
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-};
-
-source src {
-    unix-stream("/dev/log" max-connections(256));
-    internal();
-    file("/proc/kmsg");
-};
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd
deleted file mode 100644
index 13f7dc47df53..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd,v 1.1 2007/03/27 07:38:41 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-# contributed by Tiziano Mülle
-options {
-	chain_hostnames(off);
-	sync(0);
-
-	# The default action of syslog-ng 1.6.0 is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats(43200);
-};
-
-source src { unix-dgram("/var/run/log"); file("/dev/klog"); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.0 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.0
deleted file mode 100644
index 883fbb350e0b..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.0
+++ /dev/null
@@ -1,24 +0,0 @@
-@version: 3.0
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.3.0,v 1.1 2009/05/25 20:07:21 mr_bones_ Exp $
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-#
-options {
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-};
-
-source src {
-    unix-dgram("/var/run/log");
-    internal();
-    file("/dev/klog");
-};
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened
deleted file mode 100644
index 4123b9532aaa..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened,v 1.5 2007/10/30 17:16:15 solar Exp $
-
-#
-# Syslog-ng configuration file, compatible with default hardened installations.
-#
-
-options {
-	chain_hostnames(off);
-	sync(0);
-	stats(43200);
-};
-
-#options {
-#	chain_hostnames(off);
-#	sync(0);
-#	stats(43200);
-#	long_hostnames(off);        
-#	use_dns(no);
-#	create_dirs(yes);
-#};
-
-source src { unix-stream("/dev/log"); internal(); };
-source kernsrc { file("/proc/kmsg"); };
-
-#source net { udp(); };
-#log { source(net); destination(net_logs); };
-#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination avc { file("/var/log/avc.log"); };
-destination audit { file("/var/log/audit.log"); };
-destination pax { file("/var/log/pax.log"); };
-destination grsec { file("/var/log/grsec.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) 
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-filter f_avc { match(".*avc: .*"); };
-filter f_audit { match("^audit.*") and not match(".*avc: .*"); };
-filter f_pax { match("^PAX:.*"); };
-filter f_grsec { match("^grsec:.*"); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(kernsrc); filter(f_pax); destination(pax); };
-log { source(kernsrc); filter(f_grsec); destination(grsec); };
-log { source(kernsrc); filter(f_audit); destination(audit); };
-log { source(kernsrc); filter(f_avc); destination(avc); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
-
-
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0 b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0
deleted file mode 100644
index d12d89a8fbee..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0
+++ /dev/null
@@ -1,111 +0,0 @@
-@version: 3.0
-# Copyright 2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.3.0,v 1.2 2010/04/05 22:19:33 zorry Exp $
-
-#
-# Syslog-ng configuration file, compatible with default hardened installations.
-#
-
-options {
-	chain_hostnames(no);
-	stats_freq(43200);
-};
-
-source src {
-    unix-stream("/dev/log");
-    internal();
-};
-source kernsrc {
-    file("/proc/kmsg");
-};
-
-#source net { udp(); };
-#log { source(net); destination(net_logs); };
-#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination _syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination avc { file("/var/log/avc.log"); };
-destination audit { file("/var/log/audit.log"); };
-destination pax { file("/var/log/pax.log"); };
-destination grsec { file("/var/log/grsec.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn)
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-filter f_avc { message(".*avc: .*"); };
-filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
-filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
-filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(_syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(kernsrc); filter(f_pax); destination(pax); };
-log { source(kernsrc); filter(f_grsec); destination(grsec); };
-log { source(kernsrc); filter(f_audit); destination(audit); };
-log { source(kernsrc); filter(f_avc); destination(avc); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6-r1 b/app-admin/syslog-ng/files/syslog-ng.rc6-r1
deleted file mode 100644
index 77e204fcc196..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.rc6-r1
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6-r1,v 1.8 2009/11/06 17:03:33 mr_bones_ Exp $
-
-opts="checkconfig reload"
-
-depend() {
-	# Make networking dependency conditional on configuration
-	case $(sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf) in
-		*source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
-			need net
-			use stunnel ;;
-	esac
-
-	# kludge for baselayout-1 compatibility
-	[ -z "${svclib}" ] && config /etc/syslog-ng/syslog-ng.conf
-	need clock hostname localmount
-	provide logger
-}
-
-checkconfig() {
-	if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then
-		eerror "You need to create /etc/syslog-ng/syslog-ng.conf first."
-		eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample"
-		return 1
-	fi
-	syslog-ng -s /etc/syslog-ng/syslog-ng.conf
-	
-	# the start and reload functions have their own eends so 
-	# avoid calling this twice when there are no problems
-	[ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)"
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting syslog-ng"
-	[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
-	start-stop-daemon --start --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
-	eend $? "Failed to start syslog-ng"
-}
-
-stop() {
-	ebegin "Stopping syslog-ng"
-	start-stop-daemon --stop --pidfile /var/run/syslog-ng.pid
-	eend $? "Failed to stop syslog-ng"
-	sleep 1 # needed for syslog-ng to stop in case we're restarting
-}
-
-reload() {
-	if [ ! -f /var/run/syslog-ng.pid ]; then
-		eerror "syslog-ng isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --stop --oknodo --signal HUP \
-	    --pidfile /var/run/syslog-ng.pid
-	eend $?
-}
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6.3.0 b/app-admin/syslog-ng/files/syslog-ng.rc6.3.0
deleted file mode 100644
index cbd45a96b8a0..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.rc6.3.0
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6.3.0,v 1.2 2009/11/06 17:03:33 mr_bones_ Exp $
-
-opts="checkconfig reload"
-
-depend() {
-	# Make networking dependency conditional on configuration
-	case $(sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf) in
-		*source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
-			need net
-			use stunnel ;;
-	esac
-
-	# kludge for baselayout-1 compatibility
-	[ -z "${svclib}" ] && config /etc/syslog-ng/syslog-ng.conf
-	need clock hostname localmount
-	provide logger
-}
-
-checkconfig() {
-	if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then
-		eerror "You need to create /etc/syslog-ng/syslog-ng.conf first."
-		eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample"
-		return 1
-	fi
-	syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
-	
-	# the start and reload functions have their own eends so 
-	# avoid calling this twice when there are no problems
-	[ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)"
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting syslog-ng"
-	[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
-	start-stop-daemon --start --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
-	eend $? "Failed to start syslog-ng"
-}
-
-stop() {
-	ebegin "Stopping syslog-ng"
-	start-stop-daemon --stop --pidfile /var/run/syslog-ng.pid
-	eend $? "Failed to stop syslog-ng"
-	sleep 1 # needed for syslog-ng to stop in case we're restarting
-}
-
-reload() {
-	if [ ! -f /var/run/syslog-ng.pid ]; then
-		eerror "syslog-ng isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --stop --oknodo --signal HUP \
-	    --pidfile /var/run/syslog-ng.pid
-	eend $?
-}
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc6.3.0-r1 b/app-admin/syslog-ng/files/syslog-ng.rc6.3.0-r1
deleted file mode 100644
index b7c752aec8e7..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.rc6.3.0-r1
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6.3.0-r1,v 1.3 2009/12/30 08:41:05 mr_bones_ Exp $
-
-opts="checkconfig reload"
-
-depend() {
-	# Make networking dependency conditional on configuration
-	case $(sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf) in
-		*source*tcp*|*source*udp*|*destination*tcp*|*destination*udp*)
-			need net
-			use stunnel ;;
-	esac
-
-	config /etc/syslog-ng/syslog-ng.conf
-	use clock
-	need hostname localmount
-	provide logger
-}
-
-checkconfig() {
-	if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then
-		eerror "You need to create /etc/syslog-ng/syslog-ng.conf first."
-		eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample"
-		return 1
-	fi
-	syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
-	
-	# the start and reload functions have their own eends so 
-	# avoid calling this twice when there are no problems
-	[ $? -eq 0 ] || eend $? "Configuration error. Please fix your configfile (/etc/syslog-ng/syslog-ng.conf)"
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting syslog-ng"
-	[ -n "${SYSLOG_NG_OPTS}" ] && SYSLOG_NG_OPTS="-- ${SYSLOG_NG_OPTS}"
-	start-stop-daemon --start --pidfile /var/run/syslog-ng.pid --exec /usr/sbin/syslog-ng ${SYSLOG_NG_OPTS}
-	eend $? "Failed to start syslog-ng"
-}
-
-stop() {
-	ebegin "Stopping syslog-ng"
-	start-stop-daemon --stop --pidfile /var/run/syslog-ng.pid
-	eend $? "Failed to stop syslog-ng"
-	sleep 1 # needed for syslog-ng to stop in case we're restarting
-}
-
-reload() {
-	if [ ! -f /var/run/syslog-ng.pid ]; then
-		eerror "syslog-ng isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --stop --oknodo --signal HUP \
-	    --pidfile /var/run/syslog-ng.pid
-	eend $?
-}
diff --git a/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild b/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild
deleted file mode 100644
index 595a17e1bfea..000000000000
--- a/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.0.10.ebuild,v 1.8 2010/09/13 03:39:05 mr_bones_ Exp $
-
-inherit fixheadtails
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="hardened ipv6 selinux spoof-source static tcpd"
-
-RDEPEND=">=dev-libs/eventlog-0.2
-	spoof-source? ( net-libs/libnet )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/glib-2.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex"
-PROVIDE="virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ht_fix_file configure
-	cd "${S}/doc/reference"
-	tar xzf syslog-ng.html.tar.gz || die "tar failed"
-}
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc/syslog-ng \
-		--disable-dependency-tracking \
-		$(use_enable ipv6) \
-		$(use_enable !static dynamic-linking) \
-		$(use_enable static static-linking) \
-		$(use_enable spoof-source) \
-		$(use_enable tcpd tcp-wrapper) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README \
-		doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
-		contrib/syslog-ng.conf* \
-		doc/reference/syslog-ng.txt \
-		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
-	dohtml doc/reference/syslog-ng.html/*
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened" syslog-ng.conf
-	elif use userland_BSD ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	# Install snippet for logrotate, which may or may not be installed
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng
-	else
-		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
-	fi
-
-	newinitd "${FILESDIR}/syslog-ng.rc6-r1" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-}
-
-pkg_postinst() {
-	echo
-	elog "It is highly recommended that app-admin/logrotate be emerged to"
-	elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-	elog "for logrotate to use."
-	echo
-}
diff --git a/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild b/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild
deleted file mode 100644
index 639359480964..000000000000
--- a/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-2.1.4.ebuild,v 1.9 2010/09/13 03:39:05 mr_bones_ Exp $
-
-EAPI=2
-inherit fixheadtails eutils
-
-MY_PV=${PV/_/}
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/syslog-ng_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="hardened ipv6 selinux spoof-source sql static tcpd"
-
-RDEPEND="!static? ( >=dev-libs/eventlog-0.2 )
-	spoof-source? ( net-libs/libnet )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	sql? ( >=dev-db/libdbi-0.8.3 )
-	>=dev-libs/glib-2.4"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/eventlog-0.2[static-libs] )
-	dev-util/pkgconfig
-	sys-devel/flex"
-PROVIDE="virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/doc/reference
-	unpack ./syslog-ng.html.tar.gz
-}
-
-src_prepare() {
-	ht_fix_file configure
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--sysconfdir=/etc/syslog-ng \
-		$(use_enable ipv6) \
-		$(use_enable sql) \
-		$(use_enable static static-linking) \
-		$(use_enable spoof-source) \
-		$(use_enable tcpd tcp-wrapper)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README \
-		doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
-		contrib/syslog-ng.conf* \
-		doc/reference/syslog-ng.txt \
-		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
-	dohtml doc/reference/syslog-ng.html/*
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened" syslog-ng.conf
-	elif use userland_BSD ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	# Install snippet for logrotate, which may or may not be installed
-	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng
-	else
-		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
-	fi
-
-	newinitd "${FILESDIR}/syslog-ng.rc6-r1" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-}
-
-pkg_postinst() {
-	echo
-	elog "It is highly recommended that app-admin/logrotate be emerged to"
-	elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-	elog "for logrotate to use."
-	echo
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.1.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.1.3.ebuild
index 6e106c00f1a5..ac9203a14d52 100644
--- a/app-admin/syslog-ng/syslog-ng-3.1.3.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.1.3.ebuild,v 1.1 2010/11/28 07:36:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.1.3.ebuild,v 1.2 2011/01/02 22:45:11 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools fixheadtails eutils
@@ -82,23 +82,23 @@ src_install() {
 	# Install default configuration
 	insinto /etc/syslog-ng
 	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%%.*}" syslog-ng.conf
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%%.*}" syslog-ng.conf || die
 	elif use userland_BSD ; then
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%%.*}" syslog-ng.conf
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%%.*}" syslog-ng.conf || die
 	else
-		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%%.*}" syslog-ng.conf
+		newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%%.*}" syslog-ng.conf || die
 	fi
 
 	insinto /etc/logrotate.d
 	# Install snippet for logrotate, which may or may not be installed
 	if use hardened || use selinux ; then
-		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng
+		newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
 	else
-		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng
+		newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
 	fi
 
-	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng || die
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
 	keepdir /etc/syslog-ng/patterndb.d
 }