Fix init scripts #432548 thx to zunkree

Package-Manager: portage-2.1.11.10/cvs/Linux x86_64

5 files changed, 16 insertions, 681 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 30696d51bec1..9b483ef8df7b 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,407 +1,8 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.80 2012/08/19 19:07:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.81 2012/08/24 14:40:14 ultrabug Exp $
 
-  19 Aug 2012; Raúl Porcel <armin76@gentoo.org> rsyslog-5.8.5.ebuild,
-  rsyslog-5.8.11.ebuild, rsyslog-5.8.12.ebuild:
-  Drop sparc keywords
-
-  23 Jul 2012; Markus Meier <maekke@gentoo.org> rsyslog-6.2.2.ebuild:
-  add ~arm, bug #425526
-
-  12 Jul 2012; Jeroen Roovers <jer@gentoo.org> rsyslog-6.2.2.ebuild:
-  Marked ~hppa (bug #425526).
-
-  09 Jul 2012; Jeroen Roovers <jer@gentoo.org> rsyslog-5.8.11.ebuild:
-  Stable for HPPA (bug #424767).
-
-  05 Jul 2012; Agostino Sarubbo <ago@gentoo.org> rsyslog-5.8.11.ebuild:
-  Stable for amd64, wrt bug #424767
-
-  04 Jul 2012; Jeff Horelick <jdhore@gentoo.org> rsyslog-5.8.11.ebuild:
-  marked x86 per bug 424767
-
-*rsyslog-5.8.12 (04 Jul 2012)
-
-  04 Jul 2012; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.8.12.ebuild:
-  v5 branch version bump
-
-*rsyslog-6.2.2 (15 Jun 2012)
-
-  15 Jun 2012; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.8.8.ebuild,
-  +rsyslog-6.2.2.ebuild:
-  Version bump fix #420999. Drop old.
-
-  02 Jun 2012; Justin Lecher <jlec@gentoo.org> rsyslog-5.8.5.ebuild,
-  rsyslog-5.8.8.ebuild, rsyslog-5.8.11.ebuild, rsyslog-6.2.1.ebuild:
-  Don't run eautoreconf twice
-
-*rsyslog-6.2.1 (01 Jun 2012)
-
-  01 Jun 2012; Ultrabug <ultrabug@gentoo.org> +files/6-stable/rsyslog.confd,
-  +files/6-stable/rsyslog.initd, +files/6-stable/rsyslog.logrotate,
-  +files/6-stable/rsyslog-gentoo.conf, +files/6-stable/rsyslog6-zeromq.patch,
-  +rsyslog-6.2.1.ebuild:
-  New stable v6 branch bump, fix #398269.
-
-  31 May 2012; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.11.ebuild,
-  rsyslog-5.8.5.ebuild, rsyslog-5.8.8.ebuild:
-  Fix autotools-utils usage wrt #407811 thanks to vapier and mgorny.
-
-  30 May 2012; Zac Medico <zmedico@gentoo.org> rsyslog-5.8.11.ebuild,
-  rsyslog-5.8.5.ebuild, rsyslog-5.8.8.ebuild:
-  Inherit eutils for epatch.
-
-*rsyslog-5.8.11 (22 May 2012)
-
-  22 May 2012; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.5.ebuild,
-  -rsyslog-5.8.6.ebuild, -rsyslog-5.8.7.ebuild, rsyslog-5.8.8.ebuild,
-  +rsyslog-5.8.11.ebuild:
-  Version bump, fix #408745 thx to Opportunist. Fix ssl/gnutls dependencies wrt
-  #410241 thx to Conrad. Drop old versions.
-
-  10 May 2012; Jeff Horelick <jdhore@gentoo.org> rsyslog-5.8.8.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-*rsyslog-5.8.8 (07 May 2012)
-
-  07 May 2012; Justin Lecher <jlec@gentoo.org> +rsyslog-5.8.8.ebuild:
-  Non-maintainer Version Bump, Correct indention of _EOF
-
-  03 May 2012; Jeff Horelick <jdhore@gentoo.org> rsyslog-5.8.5.ebuild,
-  rsyslog-5.8.6.ebuild, rsyslog-5.8.7.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-*rsyslog-5.8.7 (14 Feb 2012)
-
-  14 Feb 2012; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.8.7.ebuild:
-  Version bump
-
-  24 Jan 2012; Justin Lecher <jlec@gentoo.org> rsyslog-5.8.6.ebuild:
-  exchange last gnutls to ssl
-
-  16 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org>
-  files/5-stable/rsyslog.initd, rsyslog-5.8.6.ebuild:
-  Fix initscript to not use deprecated opts. Use ssl useflag not gnutls for ssl
-  support as ssl should enable the ssl support and gnutls/openssl respective
-  features if multiple backends are available.
-
-*rsyslog-5.8.6 (28 Dec 2011)
-
-  28 Dec 2011; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.8.6.ebuild:
-  Version bump.
-
-  13 Sep 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.6.5.ebuild,
-  -rsyslog-5.8.3.ebuild:
-  Drop old vulnerable versions wrt #381637
-
-  11 Sep 2011; Markus Meier <maekke@gentoo.org> rsyslog-5.8.5.ebuild:
-  x86 stable, bug #381637
-
-  09 Sep 2011; Tim Harder <radhermit@gentoo.org> rsyslog-5.6.5.ebuild,
-  rsyslog-5.8.3.ebuild, rsyslog-5.8.5.ebuild:
-  Add build dependency on pkgconfig (bug #349924 by matsuu).
-
-  09 Sep 2011; Jeroen Roovers <jer@gentoo.org> rsyslog-5.8.5.ebuild:
-  Stable for HPPA (bug #381637).
-
-  05 Sep 2011; Tony Vroon <chainsaw@gentoo.org> rsyslog-5.8.5.ebuild:
-  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo in bug
-  #381637.
-
-  05 Sep 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.5.ebuild:
-  Multiple ebuild fixes : #381909, #381907, #381905, #381901, #381903. Thanks
-  to Agostino Sarubbo.
-
-  05 Sep 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.5.ebuild:
-  Multiple ebuild fixes : #381909, #381907, #381905, #381901, #381903. Thanks
-  to Agostino Sarubbo.
-
-*rsyslog-5.8.5 (05 Sep 2011)
-
-  05 Sep 2011; Ultrabug <ultrabug@gentoo.org> files/5-stable/rsyslog.initd,
-  -rsyslog-5.8.1.ebuild, +rsyslog-5.8.5.ebuild, metadata.xml:
-  Init script handles baselayout 1 & 2, fix #373913 thanks to Martin Dummer for
-  reporting. Version bump wrt #381637 and drop old vulnerable version. Add
-  optional zeromq support to rsyslog.
-
-*rsyslog-5.8.3 (03 Aug 2011)
-
-  03 Aug 2011; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.8.3.ebuild:
-  Version bump.
-
-*rsyslog-5.8.1 (23 May 2011)
-
-  23 May 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.8.0-r1.ebuild,
-  +rsyslog-5.8.1.ebuild:
-  Version bump, drop previous bugged 5.8.x version. Thanks to Opportunist for
-  spotting, fix #368193.
-
-*rsyslog-5.8.0-r1 (16 May 2011)
-
-  16 May 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.8.0.ebuild,
-  +rsyslog-5.8.0-r1.ebuild:
-  EAPI4 and use of systemd eclass, fix #366179.
-
-  16 May 2011; Ultrabug <ultrabug@gentoo.org> -files/3-stable/rsyslog.conf,
-  -files/3-stable/rsyslog.init, -files/3-stable/rsyslog.logrotate,
-  -rsyslog-3.22.0.ebuild, -files/3-stable/rsyslog-gentoo.conf,
-  -rsyslog-3.22.1.ebuild, -rsyslog-5.6.4.ebuild:
-  Remove obsolete v3 branch. Drop old wrt #361219.
-
-  13 May 2011; Markos Chandras <hwoarang@gentoo.org> rsyslog-5.6.5.ebuild:
-  Stable on amd64 wrt bug #361219
-
-  13 May 2011; Jeroen Roovers <jer@gentoo.org> rsyslog-5.6.5.ebuild:
-  Stable for HPPA (bug #361219).
-
-  13 May 2011; Thomas Kahle <tomka@gentoo.org> rsyslog-5.6.5.ebuild:
-  x86 stable per bug 361219
-
-  26 Apr 2011; Jeroen Roovers <jer@gentoo.org> rsyslog-5.6.4.ebuild:
-  Stable for HPPA (bug #359765).
-
-*rsyslog-5.8.0 (26 Apr 2011)
-
-  26 Apr 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-3.20.4.ebuild,
-  +rsyslog-5.8.0.ebuild:
-  version bump wrt #364145. Drop old stable. Thanks to Opportunist for
-  reporting.
-
-  19 Apr 2011; Thomas Kahle <tomka@gentoo.org> rsyslog-5.6.4.ebuild:
-  x86 stable per bug 359765
-
-  16 Apr 2011; Christoph Mende <angelos@gentoo.org> rsyslog-5.6.4.ebuild:
-  Stable on amd64 wrt bug #359765
-
-  07 Apr 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-3.20.4.ebuild,
-  rsyslog-3.22.0.ebuild, rsyslog-3.22.1.ebuild, rsyslog-5.6.4.ebuild,
-  rsyslog-5.6.5.ebuild:
-  migrate ebuilds to new-style virtual, wrt #358881
-
-  30 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
-  Drop logrotate useflag description too.
-
-  30 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> rsyslog-5.6.4.ebuild,
-  rsyslog-5.6.5.ebuild:
-  Drop logrotate useflag. Fixes bug #344175.
-
-  25 Mar 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-5.6.5.ebuild:
-  add back virtual/logger provider waiting for migration (#358881)
-
-*rsyslog-5.6.5 (24 Mar 2011)
-
-  24 Mar 2011; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.6.5.ebuild:
-  version bump
-
-*rsyslog-5.6.4 (04 Mar 2011)
-
-  04 Mar 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.6.3.ebuild,
-  +rsyslog-5.6.4.ebuild:
-  version bump. drop old.
-
-*rsyslog-5.6.3 (07 Feb 2011)
-
-  07 Feb 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.6.2.ebuild,
-  +rsyslog-5.6.3.ebuild:
-  Version bump, drop old
-
-*rsyslog-5.6.2 (10 Jan 2011)
-
-  10 Jan 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.4.0.ebuild,
-  +rsyslog-5.6.2.ebuild, metadata.xml:
-  Version bump. Fixes bug #343085. Maintainer bump. Thanks to Opportunist and
-  Nebojsa Trpkovic for their help.
-
-  29 Oct 2010; Markus Meier <maekke@gentoo.org> rsyslog-5.4.0.ebuild:
-  readd ~arm, bug #341965
-
-*rsyslog-5.4.0 (21 Oct 2010)
-
-  21 Oct 2010; Tiziano Müller <dev-zero@gentoo.org>
-  -files/3-devel/rsyslog.conf, -files/3-devel/rsyslog.init,
-  -files/3-devel/rsyslog.logrotate, -files/3-devel/rsyslog-gentoo.conf,
-  +files/5-stable/rsyslog.confd, +files/5-stable/rsyslog.initd,
-  +files/5-stable/rsyslog.logrotate, +files/5-stable/rsyslog-gentoo.conf,
-  +rsyslog-5.4.0.ebuild, metadata.xml:
-  Version bump (bug #292919), also solves bug #283416 and #339985. Thanks to
-  Ultrabug for the version bump and extensions/fixes and Mike Nerone for
-  testing.
-
-  17 Jun 2010; Patrick Lauer <patrick@gentoo.org> rsyslog-3.20.4.ebuild,
-  rsyslog-3.22.0.ebuild, rsyslog-3.22.1.ebuild:
-  Migrating away from deprecated postgres virtuals
-
-  15 Jan 2010; Tiziano Müller <dev-zero@gentoo.org> rsyslog-3.22.1.ebuild:
-  Keyworded ~sparc.
-
-  17 Oct 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
-  remove dbi description as it is global now
-
-  10 Oct 2009; Raúl Porcel <armin76@gentoo.org> rsyslog-3.22.1.ebuild:
-  Add ~arm
-
-*rsyslog-3.22.1 (14 Aug 2009)
-
-  14 Aug 2009; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.22.1.ebuild:
-  Version bump (bug #281363).
-
-  26 Jul 2009; Thilo Bangert <bangert@gentoo.org> metadata.xml:
-  add <herd> tag
-
-  21 Jul 2009; <chainsaw@gentoo.org> rsyslog-3.22.0.ebuild:
-  Marked stable on AMD64 as requested by Arfrever Frehtes Taifersar Arahesis
-  <arfrever@gentoo.org> in bug #275700.
-
-  30 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
-  rsyslog-3.22.0.ebuild:
-  stable x86, bug 275700
-
-  29 Jun 2009; Jeroen Roovers <jer@gentoo.org> rsyslog-3.22.0.ebuild:
-  Stable for HPPA (bug #275700).
-
-*rsyslog-3.22.0 (26 May 2009)
-
-  26 May 2009; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.20.2.ebuild,
-  -rsyslog-3.21.10.ebuild, +rsyslog-3.22.0.ebuild:
-  Version bump for stable branch. Dropped old stable-branch and obsolete
-  devel-branch ebuild.
-
-  15 Mar 2009; Markus Meier <maekke@gentoo.org> rsyslog-3.20.4.ebuild:
-  amd64/x86 stable, bug #254287
-
-*rsyslog-3.21.10 (13 Feb 2009)
-*rsyslog-3.20.4 (13 Feb 2009)
-
-  13 Feb 2009; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.20.4.ebuild,
-  -rsyslog-3.21.9.ebuild, +rsyslog-3.21.10.ebuild:
-  Version bump.
-
-*rsyslog-3.21.9 (08 Dec 2008)
-*rsyslog-3.20.2 (08 Dec 2008)
-
-  08 Dec 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.18.4.ebuild,
-  +rsyslog-3.20.2.ebuild, -rsyslog-3.21.6.ebuild, +rsyslog-3.21.9.ebuild:
-  Version bump for stable and beta branches, fixes security bug #249878
-  (thanks to Bruno Boss & Crag).
-
-  10 Nov 2008; Tiziano Müller <dev-zero@gentoo.org> rsyslog-3.21.6.ebuild:
-  Disable building imdiag with USE=debug (bug #240550) since upstream
-  doesn't support it.
-
-*rsyslog-3.21.6 (10 Nov 2008)
-
-  10 Nov 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.21.5.ebuild,
-  +rsyslog-3.21.6.ebuild:
-  Version bump (probably fixes bug #240550).
-
-*rsyslog-3.21.5 (06 Oct 2008)
-
-  06 Oct 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.21.4.ebuild,
-  +rsyslog-3.21.5.ebuild:
-  Version bump for devel branch
-
-*rsyslog-3.21.4 (29 Sep 2008)
-*rsyslog-3.18.4 (29 Sep 2008)
-
-  29 Sep 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.18.3.ebuild,
-  +rsyslog-3.18.4.ebuild, -rsyslog-3.21.3.ebuild, +rsyslog-3.21.4.ebuild:
-  Version bump for stable and devel branch (changelog says we don't want
-  3.18.3 stable, so dropping it)
-
-*rsyslog-3.21.3 (22 Aug 2008)
-*rsyslog-3.18.3 (22 Aug 2008)
-
-  22 Aug 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.18.1.ebuild,
-  -rsyslog-3.18.2.ebuild, +rsyslog-3.18.3.ebuild, -rsyslog-3.21.2.ebuild,
-  +rsyslog-3.21.3.ebuild:
-  Version bump. Dropped buggy versions.
-
-  14 Aug 2008; Tiziano Müller <dev-zero@gentoo.org>
-  files/3-devel/rsyslog.init, files/3-stable/rsyslog.init:
-  Added provide logger to init.d-scripts (thanks to Jon Gerdes, bug
-  #234640).
-
-  12 Aug 2008; Tiziano Müller <dev-zero@gentoo.org> rsyslog-3.21.2.ebuild:
-  Removed inherit autotools since unneeded
-
-*rsyslog-3.21.2 (12 Aug 2008)
-*rsyslog-3.18.2 (12 Aug 2008)
-
-  12 Aug 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.16.1.ebuild,
-  +rsyslog-3.18.2.ebuild, -rsyslog-3.21.1.ebuild, +rsyslog-3.21.2.ebuild:
-  Version bump for stable and unstable branch. Dropped old versions.
-
-*rsyslog-3.21.1 (31 Jul 2008)
-*rsyslog-3.18.1 (31 Jul 2008)
-
-  31 Jul 2008; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.18.1.ebuild,
-  -rsyslog-3.19.7.ebuild, +rsyslog-3.21.1.ebuild:
-  Version bump for stable and unstable branch. Dropped old unstable.
-
-  25 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  16 Jun 2008; Jeroen Roovers <jer@gentoo.org> rsyslog-3.19.7.ebuild:
-  Marked ~hppa too.
-
-*rsyslog-3.19.7 (12 Jun 2008)
-
-  12 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.19.5.ebuild,
-  +rsyslog-3.19.7.ebuild:
-  Version bump for devel-branch
-
-*rsyslog-3.19.5 (03 Jun 2008)
-
-  03 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
-  -files/3.19.2-as_needed.patch, rsyslog-3.16.1.ebuild,
-  -rsyslog-3.19.2.ebuild, +rsyslog-3.19.5.ebuild:
-  Version bump for devel-branch (upstream included --as-needed patch and
-  fixed tight-loop bug). Added PROVIDES to satisfy virtual/logger.
-
-*rsyslog-3.19.2 (19 May 2008)
-*rsyslog-3.16.1 (19 May 2008)
-
-  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
-  -files/3.14.1-implicit_declaration.patch, +files/3.19.2-as_needed.patch,
-  -rsyslog-3.14.1.ebuild, -rsyslog-3.16.0.ebuild, +rsyslog-3.16.1.ebuild,
-  -rsyslog-3.17.1.ebuild, +rsyslog-3.19.2.ebuild:
-  Version bump, cleaned up the old versions due to a couple of serious bugs.
-  Added GnuTLS USE flag for the devel-branch. Changed dependency for
-  postgresql to virtual/postgresql-base.
-
-  14 May 2008; Markus Meier <maekke@gentoo.org> rsyslog-3.16.0.ebuild,
-  rsyslog-3.17.1.ebuild:
-  add ~x86, bug #222081
-
-*rsyslog-3.17.1 (25 Apr 2008)
-*rsyslog-3.16.0 (25 Apr 2008)
-
-  25 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.16.0.ebuild,
-  -rsyslog-3.17.0.ebuild, +rsyslog-3.17.1.ebuild:
-  Version bump (both stable and testing branches).
-
-*rsyslog-3.17.0 (09 Apr 2008)
-*rsyslog-3.14.1 (09 Apr 2008)
-
-  09 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
-  -files/3.15/rsyslog.conf, -files/3.15/rsyslog.init,
-  -files/3.15/rsyslog.logrotate, -files/3.15/rsyslog-gentoo.conf,
-  +files/3-devel/rsyslog.conf, +files/3-devel/rsyslog.init,
-  +files/3-stable/rsyslog.conf, +files/3.14.1-implicit_declaration.patch,
-  +files/3-devel/rsyslog.logrotate, +files/3-devel/rsyslog-gentoo.conf,
-  +files/3-stable/rsyslog.init, +files/3-stable/rsyslog.logrotate,
-  +files/3-stable/rsyslog-gentoo.conf, +rsyslog-3.14.1.ebuild,
-  -rsyslog-3.15.0.ebuild, +rsyslog-3.17.0.ebuild:
-  Version bump. Added ebuild for stable branch (3.14.x). Reorganized
-  init.d/conf.d/logrotate files to have one set for the stable and one for
-  the devel branch. Is supposed to fix bug #216968.
-
-*rsyslog-3.15.0 (07 Apr 2008)
-
-  07 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
-  +files/3.15/rsyslog.conf, +files/3.15/rsyslog.init,
-  +files/3.15/rsyslog.logrotate, +files/3.15/rsyslog-gentoo.conf,
-  +metadata.xml, +rsyslog-3.15.0.ebuild:
-  Initial commit (ebuild written by me.)
+  24 Aug 2012; Ultrabug <ultrabug@gentoo.org> files/5-stable/rsyslog.initd,
+  files/6-stable/rsyslog.initd, -rsyslog-6.2.1.ebuild:
+  Fix init scripts #432548 thx to zunkree. Drop old.
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 0e0be2a32bea..b6467e91cac0 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,32 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 5-stable/rsyslog-gentoo.conf 3998 SHA256 d31ba477fb94c82cd2362694b680d43bfc5eb83c6e930202feb7531c4396982b SHA512 a27dc6255dceecc41b6fd231604bd0b4baa91ff03faa08e11cebaf2c3c791a9130ff7f5d51150cae8d06d5b270a2f23ce3f50c55f596841bbbd4b2c7cf49051a WHIRLPOOL 5ff9b2495853fb5616a6709296efd906a58f930e55639a384792219120a62fc2c517c417dddca800a13a2532f096a09924d8b486bf16235b5144edb793632df6
 AUX 5-stable/rsyslog.confd 654 SHA256 c476c2180fcceaf581d26d2da6201fbe7a2b9fc89c58456fdb3bdaf18a4cbb56 SHA512 c216674e6867d655c2c09b6205071591ae2b1611ad5dd0346e682733abafa8a1be261fdd9bb985bb5d05d5bfa708a68262b1a94e654a2c18d352fd02d6f950a3 WHIRLPOOL f4069536f61ff7190a357cc7d9bb90af7839e48a34bd4c12a622b295b963aac2f3dda7d9e637ab492ed00e2079541df4ab65516f43d7eb3673a66d579d96f966
-AUX 5-stable/rsyslog.initd 963 SHA256 cbaf49c80a8fd3ea74dbe82c85b2371aa749b3c431a76d99154616514f92f127 SHA512 be6501073eb359e2372b88bda79563a6a74b559f497e5b9369940957238511d259beb2b87c5a2ab0b3145d6d0c618aef7744ed3cafd65bffe816f856eeae3a84 WHIRLPOOL 2248e018f4c1a107ba137506265c07b8e27070075f41d5a14f57c00afe3b6515899712132fb636f3e4368f51ff3111245962305e8c6d5c7423d0e7be3057ba73
+AUX 5-stable/rsyslog.initd 985 SHA256 4b6b7019e93a6a81fb129a89d6ac54e490e2609ce339f5e2dae705db8e8466b4 SHA512 c1f2cefcae7104dbcdc4d1cf4026c08af01d30d0d3aa606cecc13052ead48daab04031163b4dc718c69557aef174762f868528b9d02cb85f00a6e4fe20a6b00a WHIRLPOOL f2775c6608b379f948ebfb123b77366f8434e0acd59f1da2f6a6d0a6215e5014da95f9f64e4cf3964734afb92baae2c0fe27c6ef2ea04c6d584a2ad237bc1820
 AUX 5-stable/rsyslog.logrotate 440 SHA256 f0effc19bd1f1bfa367d65d6516c73509cb34545157b9e91cf6e437685dd3fe5 SHA512 d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f WHIRLPOOL 4199c9ffb20fce8b84884a80426b1761c622dda7ec6f21c2c0cb5bec4698e4992e9d62af5b7e6cb07059d50196efdc264f2cd814df366fb1e8e79a742e0505ec
 AUX 6-stable/rsyslog-gentoo.conf 4008 SHA256 d42b77980c46deaa3a1e6037682297150d0830b95168dbea3e3d7ad2736ea57e SHA512 392c573dd378cc605be185c1670f6df45833f5412137c45ab26632905e61d009d5a195306dc8d750d8dd28a1fddc15a337ad972eab6efafe590cfea841c35225 WHIRLPOOL b72b7a6a91c8e10ae1f442e3916bc63f450496081245fecc8704c9fd4f2c907f0bc7e432c18ff84f0bbc9bf00813913f2eb27b18676669efc7ed0569184ef307
 AUX 6-stable/rsyslog.confd 654 SHA256 dbf4eab207f2b2974a5c9858a98a23ac37b5e8a98c3a837679145ed197226c6f SHA512 a527a376dac311da1d9e95c2dd1c079f2dc72f529046d0cb140fbea9d048c8d04907f5f517b62a1adf66b0eb73825e64b62c8ddc68caf652d84acc23234da597 WHIRLPOOL 48f3cc2e4372014d48bca9ce2421bb329cac837fa1e26f6bad016f32e2f00532d27ff0a72440e380fb031957e36fccade35c19c18c2cc51a523c1e4c022fe024
-AUX 6-stable/rsyslog.initd 962 SHA256 39810239217e6475d8e08948e8ece62472b3a443f615ea179bb678526ea39ec4 SHA512 424fde5367a90fceb64e2dd64bcf9adf2bdcbbad99b02ecf145debc98ca93381650b1a216f18439a9a069a1ca046e33b33a76f55cb7dd2b655b7558cc58fcdae WHIRLPOOL 26070373564b30f099630d0a57b8c98657beac32097d1b6e8c395190771f216caab72581122cf45aa17709e9a873de87205d218d34670d1773ce067a9c180e76
+AUX 6-stable/rsyslog.initd 985 SHA256 b604dfbeb141e532651b45e487c751a949df8c51c5b93f9a1e03c7d2d4db8244 SHA512 33156223804395bdbf2830c1bf8eaab61a53c8a810e13b3abd0c2f10acfa816e33f9c272ae78031491005682f76100ef8e738948a02f83af6d1999b4b6ec6248 WHIRLPOOL 9bf3713f52928c15e74d9549079b07fadbed58e4f7aacb1578b1fab8e85eb94976bb52e55df9528eec6efdc537ea8b7bab2cd0717fd19ed75b707e7f9bbeacd9
 AUX 6-stable/rsyslog.logrotate 440 SHA256 60ad6683550a9bb1600f3f9ad622c5a6897483e4457a4c9f1557e109a7873e72 SHA512 1112d7edb8ffd8009747da0840b34466233a22086ebc7fdf26cf9f600dcc3d85bba67bdd844283121a9df3fdcdada09dc8856613e391e3c3f14549d44b38fe00 WHIRLPOOL ee7a0039ae88252a7bb1d97523e28ef0d64cb15d6e962458370665fb721fb9547ee1d937f23aff070da5374e98d3f07f49e6e44c656e6b4d351e65232dfea2b6
 AUX 6-stable/rsyslog6-zeromq.patch 3383 SHA256 0cdff584364764a2ee494e3263b679b74eee00da6cd1f9a97a4e683eac08291b SHA512 96e4b6e686621c101c42d3b4bf9b256e81aa264795e2ee7017f0f82d93cfcefdee6577d269cdb81e1c3e43a241d6cb65ca8471b32c7d71ac86736d67b0ef09cc WHIRLPOOL 4e7d1d223c66a05984fa1a2228e7fca98bce8150b84c33364c20e321850cbe6b15f70fd9174a25cc620db91761ed7b1d4e70e37535ec392ecbcaaf630106cff1
 DIST rsyslog-5.8.11.tar.gz 2393222 SHA256 f75b39cf22506f7a28d986d0a446a09a0806f253dba661f125a241a1b47d6285 SHA512 545db333efd136c2ae26131ad400e69f41aaa4fa458a5d586c73e9063f0acb044dbcfe3a13e48b3db77a72f471e87b3b8f9ab2bff008b1166b836dbdddb7974a WHIRLPOOL 2ab8ae35179dcade3953c612cb8bdbd48e7bce6c0cca54278d2949ff3c7c29311341855778511acc38328db4ebeca5599e632c94def038f7134cdd2df78e53e8
 DIST rsyslog-5.8.12.tar.gz 2393679 SHA256 18a408c92fa299773d26a8d6f324eec66282a148b0989c66d94b94318dd0a514 SHA512 18080b09a5e80d3a2dc4b04976c3470eb096560ebc038815dfaec73ef3e53ffbad74b2586d0247aeb318a6e2463e072fe84dad5a2040a9320f37b55511d890ae WHIRLPOOL 80b429beb88014c862fc74f0b9ff0b78bd54764b3c01a4b3f7595d4863eb2f8996d29e9db70b472c30c7cac02793a5290319f51b6eaab4b28dea4ca16246c030
 DIST rsyslog-5.8.5.tar.gz 2364874 SHA256 a519704c06de1026847f69d99f31a2a32783e9547f5249dddefe805bfbc3ea50 SHA512 0e38bd03d0dd681f68ab11ef2f9d0633958a49d50379721f807fc9d31441b192c331ff56df0c8f8b5c319e0d9c65072402559ace665e80cce4f251dd24e45715 WHIRLPOOL 4afd89d1512e3164d809b5ab8480423936f27c0819aab1a8e4064c13b0b017db898d269439d310c30ec53d8b8ca40b6e60b326ef17ecace8a958a9b73fa10ccd
-DIST rsyslog-6.2.1.tar.gz 2432332 SHA256 5b21922f3466acb9511c6f58bbddd8ee269d180a5557dc23892d3b7999f66413 SHA512 a31e429c82ef6f19c0135674b605105d383b583e7c88f8f61be0442bbb4d8e0ec59f393a33d5997fe7409be4d913f573ee51fb3d310887976f711de87117e306 WHIRLPOOL 541b89fed7efe21938fa1431641d53dd5b89c753d5e60bfedd0775d3f0cc3eb4096429a2379ca18656f2eff8fa4251d9e8354090950d953851e40e09f89f6517
 DIST rsyslog-6.2.2.tar.gz 2432745 SHA256 c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471 SHA512 b90690c0abf20d08ccfe0f47ad417070d006dc25005301d68c62ef784f7b303689e920af24a11aca071439bd3d3f57c5a3c58fbad11578fffe7c374918c15ebd WHIRLPOOL 08e52fec63a934783812dfc071a7ccf55323f0a826dc006b0b5eabbfd827e91482a7b9c4ff34589f85598d8d94c22672b68daaeeea7e316a7d239cc992744576
 DIST rsyslog-zeromq.tar.gz 22223 SHA256 3cca6ce8722ec5035744a9b88e65b89b35f6b2e6bbdbc9c9bba89d22addd2753 SHA512 d0fd6705d1fbbfd8c2932df281ef30ebfcc83085a62026ffd192bdfefaca5abef415183f958eee4f7421804ca59d8c20d8cf7fbc5b4105f86c297c6fbbcdd760 WHIRLPOOL 17d189dfe12ef5525f103d6ee202cfafe019bca11856da9d206004a9377b682b09d76816e2e2d1ca5aff2394b8cc8baec13f4961d32c74a377a9b6041ff398b1
 EBUILD rsyslog-5.8.11.ebuild 7357 SHA256 035f8e193bf6362293ba25b0edcec520c70e345daa979a77667f4079f25bc666 SHA512 d69474b60709754961dccd0c9cc49241e4027aa462293a5e5f3649aebf23942ec37f525738d1ad844f2e5910b3d0d0be4d0cbc00ae80b54a5bc58864c8b04024 WHIRLPOOL 52e1bd085ea8648cdc7347c81bdf176cc4f8f68a28524b3b57d54b73ad092ac39fa24baeae036c1c0df803755d0fe2ad6b3365801c04a6aef8a2a2fdf19741c5
 EBUILD rsyslog-5.8.12.ebuild 7360 SHA256 0b2bfdfc075bef5c8f9e8dc8782a6ab7af857453dd64778ecd8731458efbb7bd SHA512 13da9f0d8592f88f49e24ce041d33ca5cd58fb9dd78bc0d2e90b701385f4e294bf2c4ee216260371a24eac4156034098784d05b692ae0d9281ad80ba9e15007c WHIRLPOOL 4b3166f075a1a55b680eb1b17a9c0d8b58c0e13b4aa2906e3991876cd4359f23aeeb69b2bebe7d43d66fd9ebef451e0f32085eb13cc7437a25a8ccd1d373b60d
 EBUILD rsyslog-5.8.5.ebuild 7346 SHA256 2b630d5e51c4225ad3d07195002e82ac00162a437fd19f29e813430fab13ff04 SHA512 be0cb2da485c3c7901dfb49a977ea01d982a27cefa8a671326e7625e9a24dec44da9db1de1072eddabab2fe615583b77f67f4dcf8426038de845f6989db15ccd WHIRLPOOL 6c2aaca20cde1f840081120978b2351ce95060dbf98b18bd03d66832c7f2095fbf0f481b39bdd92adb7d5ea666f44cb024ff304e53c56916f8e6e6e2bc4e44d8
-EBUILD rsyslog-6.2.1.ebuild 7552 SHA256 837c07dd4a5fa3df259cc705a83bd9872271c0e02f9e90588c177c9489f56cc6 SHA512 fd7162e4f1705a4cd37429f15fe0cd468b8c92ed940bd77eff6d88e1bb4e4b524dd0a14406bd88d5a5bc56bab9a373a3239a6f6f2f24f18969484e74a3d4736e WHIRLPOOL 86ecdfebfa52bfe222247cf51d524ad06b6eabffb05edd81f6b106a42e5b0e234ddff63b27facc3869886c35a70caa4e2bea3fc9c0a90e22a141b59aff56cec5
 EBUILD rsyslog-6.2.2.ebuild 7450 SHA256 f2b435b4fdd7a4e1bed90da721404fcbb42c1751c1c32bceb522a8378d5ae4f0 SHA512 c0c4cc937eb00861004a71071a3b45596847e43fe8e34e82541176143c5fd4e005635f52b06f517cbf5418d189a85a465feb45e5eb06a4707ead8a104e62b8ff WHIRLPOOL e4f8dd62cd408a7bf7ebc5dab9e124076359b89066f71aaa25a364ad044cb62d450769022c0dc6ab5c1c75f5e9a89a4c3e8884e77b561bd8fec23d3cc390762d
-MISC ChangeLog 14934 SHA256 f41b1854ef4d2c206c6c0d5e263b2edf5d5b1011fc84f21f7054c9686329f3c1 SHA512 315abfe9a1ba33f4ea385d197f97e506fb75ef956ec03167dc555b64588c5e5cdf1269e0a1b08ae8ff64ff1b84721216419c715c1ce42384c9d59faf4cdbcaa8 WHIRLPOOL 7cca344036351620756a80ab0ab3f2bc759f5465a790fd5545f5456403fa6a07ec1c1102e495dd4762496b520b062cebd435a9db2db8997df79d2f75abee83dd
+MISC ChangeLog 395 SHA256 5907a07884d69577b854cd7193154b50da84d9372218224991be8cf2976929e3 SHA512 18974f592ed66b904ec5d7d1164f0509a00023dd27075c04a8e4c4164766e12754d09fc164c242e69367b139d480476df01e0a4d227ebebab38e102502bcf223 WHIRLPOOL 1a56bf9985c702666ad7a237833ad2d0f81a08818dc1e68537ab29ec8fda2b9da2a3c59571144aeaf6305f95c3ec2f48fbef1bf967b776c6698bc353f62bd3c6
 MISC metadata.xml 769 SHA256 70468ddaa9ff15f4cb3059fcf8834ca7f2e8f55a6f3ac57e1487202e5f3f1730 SHA512 42969433dd0854e0641497b8982bd1a24b7333e6c896ca41a1e5519d132da7bcc445c8ff8f0150679e18592a4e558a49f568cd1d3998884a7548c510ca24516a WHIRLPOOL ffaca5de9effcb374fd0ab3df59f2fc9491f30344bee8fbf59145fb1825f1f1b29c0aa3b2683108ecd247055dbf52394ed9f69dab1992eb4d1a1e2d91e2a5e86
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAxOWAACgkQuQc30/atMkBA9gCeIYxwdaZ5GI3SYLbs7l1hCA8N
-2BMAnRM0buCNRG3kLUvcW1c8ExfJImxd
-=XuJk
+iF4EAREIAAYFAlA3klcACgkQKiQSS7ZY+hMZEwD+IiKdkhMjpZaVAyBmAz5VKN74
+dqxDLUE4oZV5SQ2tiLUBAK3JtAqTBWgsoTQOHnDY+3j8kxjJDwAh9Yw1eMmASHVq
+=axNq
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/files/5-stable/rsyslog.initd b/app-admin/rsyslog/files/5-stable/rsyslog.initd
index 0794d5cb56d3..dc45969213ee 100644
--- a/app-admin/rsyslog/files/5-stable/rsyslog.initd
+++ b/app-admin/rsyslog/files/5-stable/rsyslog.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.3 2012/01/16 07:57:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.4 2012/08/24 14:40:14 ultrabug Exp $
 
 extra_started_commands="reload"
 
@@ -12,7 +12,7 @@ depend() {
 start() {
 	ebegin "Starting rsyslogd"
 	start-stop-daemon \
-		--start --quiet --exec /usr/sbin/rsyslogd \
+		--start --quiet --exec /usr/sbin/rsyslogd --pidfile "${PIDFILE}" \
 		-- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
 	eend $?
 }
diff --git a/app-admin/rsyslog/files/6-stable/rsyslog.initd b/app-admin/rsyslog/files/6-stable/rsyslog.initd
index 36f775b9c3bc..ad7021f9967d 100644
--- a/app-admin/rsyslog/files/6-stable/rsyslog.initd
+++ b/app-admin/rsyslog/files/6-stable/rsyslog.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.initd,v 1.1 2012/06/01 12:54:17 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/6-stable/rsyslog.initd,v 1.2 2012/08/24 14:40:14 ultrabug Exp $
 
 extra_started_commands="reload"
 
@@ -12,7 +12,7 @@ depend() {
 start() {
 	ebegin "Starting rsyslogd"
 	start-stop-daemon \
-		--start --quiet --exec /usr/sbin/rsyslogd \
+		--start --quiet --exec /usr/sbin/rsyslogd --pidfile "${PIDFILE}" \
 		-- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}"
 	eend $?
 }
diff --git a/app-admin/rsyslog/rsyslog-6.2.1.ebuild b/app-admin/rsyslog/rsyslog-6.2.1.ebuild
deleted file mode 100644
index 5c5aa858abfb..000000000000
--- a/app-admin/rsyslog/rsyslog-6.2.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-6.2.1.ebuild,v 1.2 2012/06/02 09:30:17 jlec Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
-
-RDEPEND="
-	dev-libs/libee
-	dev-libs/libestr
-	dev-libs/liblognorm
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-0.1.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls dev-libs/libgcrypt )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="6-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-src_prepare() {
-	# Maintainer notes:
-	# ZeroMQ support,upstream bug #277
-	if use zeromq; then
-		local ZEROPATH=${WORKDIR}/aggregateknowledge-rsyslog-zeromq-44b551a
-		epatch "${FILESDIR}/${BRANCH}/rsyslog6-zeromq.patch"
-		cp -r ${ZEROPATH}/{i,o}mzeromq "${S}/plugins"
-	fi
-
-	# Don't force '-g' CFLAG
-	# Correct the sm_cust_bindcdr plugin detection (bug #330 upstream)
-	sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' \
-		-e 's/smcustbindcdr/sm_cust_bindcdr/g' \
-		-i configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : no plugin in the sources, we'll wait for bug #330 upstream
-	local myeconfargs=(
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imtemplate
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-omprog
-		--enable-omstdout
-		--enable-omtemplate
-		--disable-omdbalerting
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		$(use_enable dbi libdbi)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable zlib)
-	)
-
-	use zeromq && myeconfargs=(
-		${myeconfargs[@]-}
-		$(use_enable zeromq imzeromq)
-		$(use_enable zeromq omzeromq)
-	)
-
-	systemd_to_myeconfargs
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	if use mysql || use postgres; then
-		echo
-		elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-		elog "  /usr/share/doc/${PF}/scripts"
-	fi
-
-	if use ssl; then
-		echo
-		elog "To create a default CA and certificates for your server and clients, run:"
-		elog "  emerge --config =${PF}"
-		elog "on your logging server. You can run it several times,"
-		elog "once for each logging client. The client certificates will be signed"
-		elog "using the CA certificate generated during the first run."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}