version bump fix #501988 #501982 #501986 #490744 thx to @Whissi

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

15 files changed, 768 insertions, 605 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 7d670080cdf1..816543139d91 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.111 2014/04/16 16:14:41 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.112 2014/05/22 11:15:49 ultrabug Exp $
+
+*rsyslog-7.6.3 (22 May 2014)
+
+  22 May 2014; Ultrabug <ultrabug@gentoo.org> -rsyslog-7.4.3.ebuild,
+  -rsyslog-7.4.6.ebuild, -rsyslog-7.4.7.ebuild, +rsyslog-7.6.3.ebuild,
+  +files/7-stable/50-default.conf, +files/7-stable/README.gentoo,
+  +files/7-stable/bugfix_52.patch, +files/7-stable/bugfix_73.patch,
+  +files/7-stable/fix-omruleset-default-value.patch,
+  +files/7-stable/rsyslog.conf, +files/7-stable/rsyslog.confd-r1,
+  +files/7-stable/rsyslog.initd-r1, +files/7-stable/rsyslog.logrotate-r1,
+  metadata.xml:
+  version bump fix #501988 #501982 #501986 #490744 thx to @Whissi, drop old
+  versions
 
   16 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org>
   +files/7-stable/rsyslog-7.x-mmjsonparse.patch, rsyslog-7.2.7.ebuild,
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 0754449eb7db..a23ae69df489 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -2,36 +2,37 @@
 Hash: SHA256
 
 AUX 6-stable/rsyslog-6.6.0-fix-runtime.patch 1173 SHA256 c2a80dc2b8d83f25625ced4782f104258599ba3a9a8faa9738596d70ad8c1ced SHA512 ec478fab2371e4bc0b3e64366c1f6d1cc8836af0df257ffaaf90e387d2c2688d8e6a292377e64d7514e3afaac4626601da67645e7f332b592e13b1265ce73c28 WHIRLPOOL 81cc8f2292dfa4d916c8cd2a10360dff9c75d2f119e5502c01c93a1731222f3bda91b0928a8df80d93c24f6b673fd74859192d46c9f153c9b9a4c87a7578ccdc
+AUX 7-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
+AUX 7-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
+AUX 7-stable/bugfix_52.patch 3776 SHA256 756f7630fa2c14d9605ce560f608acdc66277abb4592feec11dc05ef9ecc01cc SHA512 1b4fb7efd2a9e3a5b16003124e63ff5434512d9d103d938d2cfaf9ceb6087bad83d5141c21bd1d13b8dad7c67b58e0359fc836dc8263652eafd5404d181b0a4f WHIRLPOOL f0062ca640e11957da6621d8e73189e6be9eca275adfff32e3f701235682535cc42d34709a9c912541764af3d74073afd82c8d8048a3521eab9b70f8198ea02d
+AUX 7-stable/bugfix_73.patch 3575 SHA256 f621d578f730c8d633e42af977077f3c67e894acd4e8c7702dd6a41e85232062 SHA512 67996a804673214e4c23ceaf8c0092a1cf8288024180c047b96b773ee55db05e95b8da4b73ea0db5cdfabc8b49a632d6b313cf54dad23a80d9fd1bf243590971 WHIRLPOOL 371ded4813d1f3b65e570eefd366c1ca9ffabf38b1b5b5b80d6d632b3574bea272a8a802ec2b956d69359ac8f44c5b66d0c0ed66d898dbe96784a9090c4585a3
+AUX 7-stable/fix-omruleset-default-value.patch 834 SHA256 9b9506a1141ef8619ba98e4bb8e2c8ad23e6a51e64d971db8ee461c073ef1ae0 SHA512 64113caf4ec31100f1ad4dbfef27ac39e6be09f0560b1a77ad54b2c7aaf8469780b4ba17ef892cbcf80931a4d7070b40b4ca22265553568d2302eaf5ab976e5e WHIRLPOOL 7aa020772813d2611c90f7605497ece6f1ed32c1e3b75f0fc7360492186dfe0b522275d128c185013c1849b64c7c1550f1752397239609f18583a475f44361cf
 AUX 7-stable/rsyslog-7.4.3-fix-runtime.patch 1066 SHA256 d03db0a4f5c3a23cb38f0ad7eea90f9970459decef385f6a4c7075686648f382 SHA512 eb7fb61d3f30e3d7824537755bb1fc0af5525964cd594cce95082202f513382b84ba5bc1a1fa9fb1eac2c8f938e5bcaaa7ea50c2a95036a9b4fcb931f1b6f5e5 WHIRLPOOL ea5a24bf441c8f780a623f9ee4c4df24b9dcc7fb679a7ac8f8b1aad3625a63e34151f0f832b6669240bd3b40f1051ed0bdea2a635237178abd5c3f801dbc4746
 AUX 7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch 4179 SHA256 f23a6b927b9444ba82fb0dc775a9b1b826f86395da43d406c948b82d7e9b6d38 SHA512 e67632dbc87ba3805c75e6fb49ec6ef9f75c323dd9e6044ddf11d0232291214692663fc35543cb64230e6e6059f2b49373191f85669de1d206406b8716989c95 WHIRLPOOL 0b255ddfecb78234f6e37b4c5195286c7055703058add10846f51fbfd80a03350104178f916aa34156c732760b6cdbe2a8205340cef44b39321977ef6bb15d66
 AUX 7-stable/rsyslog-7.x-mmjsonparse.patch 952 SHA256 8db6b4c0001ae53306ceb685ef245c6978e143c71c9642e634cbed98e6d2dde8 SHA512 4446349f75ff5726d1bffe261f607dd8710c31d1254925928ffcc825a0f86d96b281962150bfa8e85846b94610d0a15f0932ef6b041d390bd4402657ad0f47b7 WHIRLPOOL 1ba7a6db2cb753953f0ae8e701a9b7150b99bf553b653ba2b82c6f6d1bf76461efa1cbfb1d026e5e459069cbfc6e868d46743e38c9a01583b1ff4f7a4225ed69
 AUX 7-stable/rsyslog-gentoo.conf 2630 SHA256 9b390cfffef39d3b5c6f845c6285e23fddce7405397b94abfa4145e998a97845 SHA512 41c5729c357099f1d58e80b13c889d4ee797dea69b9e427e61cfaf390ee16a7ec83d1d4a9b5fc1ee7812a8545d9bf1e1c6df0a636c2dbc8c400c7f5bd81516b5 WHIRLPOOL e9d03e579658e95b33ca77d99bfebb531f1975b5c7f0ee09cc718aaa5505c5aebb8dc3ab9492033933c8522f28f26ad4b847808c23668ffacb3173cb90abad94
+AUX 7-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
 AUX 7-stable/rsyslog.confd 583 SHA256 ff2634927d3208ac2c82d352f0a7dc9fef1d0ee098d18f818d4417ac04516e9c SHA512 d7cdfd5eab63877ca2a4776c24b2810aee600c2590f10b598d9feee08a5fcedd9c33cdd2a8e1f89b869474b66ab22e7f96126a5b52e6e66760f742407ae81301 WHIRLPOOL f53744ca0177d2f52e1f070eed6927afddbd38c9b6f3fe889b4652cd8b3f0dd625abfe434253e73fbdbf7a14169c7ace5038dc8322ca4b3f97abf893125cedec
+AUX 7-stable/rsyslog.confd-r1 1140 SHA256 f0b15a0334f6177a6cf23cb9b169302c75745dc30857f24a7d11892feb6b1ee4 SHA512 8501be8d0abc166994863db61afa5a4ef120aaec601d86fb71711b557741d39b29b96a4d688e7af6ad8d5d15a1257821ca299c5f7391f2ce66cd95e33ea2ff7c WHIRLPOOL 0a3617defa10acfa693a3339e1f7ec69c9272b44aac6fda30b49452f32ea7037743acfd871cea025f1e584639725588286056db6e17663c2806ed47088600d35
 AUX 7-stable/rsyslog.initd 985 SHA256 7b3b32e89c051566b68c5e5a077cd5960da183e071e411b1248d4e4702a24279 SHA512 982f2f11370a87fc5d3dd6d1961d35b4e2c1d0d91b4806f9d2ce422e08c08f8d62c7c0f0fdfa6950c0114da099f61bb3142af431a13ea62d7c6ea1720a6d6682 WHIRLPOOL 4b906fbed7d8a9acb2c0989d94d4611f63f8598d77c124506426ddb9d9d24ff9b92b7c91d5405158e18542fb8a383e0abdfecace03959507c1180244d1b93973
+AUX 7-stable/rsyslog.initd-r1 1710 SHA256 da92c6da122789935aba9e47d0b81d0a147a81023bd1fe4a0f1c5c04d170569e SHA512 984878c38a6f32d8bb64c6de067da02015b2dc460cb8603f7ebdb7b34bf8e9510a5e61ade48b0f7bba70502560510990dbfc7729c5c3978b78afd3233007d753 WHIRLPOOL 90140e8ba62dca5aeafecf66a412233d9f04dbf8a7238926719436cce5bc385bd0485b498ab13953c00ed53a6f6764458538b21145d9623e9a668e765b128ba7
 AUX 7-stable/rsyslog.logrotate 547 SHA256 5ade60899ab0f01b757e2f6322ef044b34d143697151431fb0ff7ef65290b53f SHA512 1a43dad1d64f3fb08d55f3d8b60072b06d277eff40fa3e2092998110936f871e1f21ad19a2ef5e17fdd06c3b0643abf4c5668cf41e81847f1c8d7a5c5f9ebe0c WHIRLPOOL ded39f72f185ebfd623f75e60ebaa236f4c1c9fb25c63bd0e751e7b8bf32d8d23dac08e0e5246d6390f4b79040561053ccfebe747e7350e07d1f8ffc78493d39
+AUX 7-stable/rsyslog.logrotate-r1 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
 AUX rsyslog-7.2.5-json-c-pkgconfig.patch 5587 SHA256 107990512f1cbaf4459ec83870cde288fde8ca8c95905658b1202ee8ac12e6fc SHA512 04c4b12916fe158c580d5e9ad74449108d42b7242e0c5d8ecc89f99fdd13bf68b3576d187b4ef5b52d877bc7f7b3d7a2c12786fcd08140d23521a7bbf3c50a56 WHIRLPOOL 4cfc61d46d472b874864726c0ebb88495c4437106121b79fd05f338939ae48d3b8658676305a88d5de996da69f5bdee8b25dc73275ffe4aa01b209d89fb78c81
 DIST rsyslog-7.2.7.tar.gz 2761741 SHA256 4833533a140c1aebed069082ad579ac25e488b647d4d508167dc6e4de75af96d SHA512 4489de8f0fa63d2c9296695faacb653b43ee7a779fcc29bcb8ce0ca0442554b832e3d491248d15a6f3d9b6982cfcc669cfae750fccb58c52ad847c3a7df94e3c WHIRLPOOL d59a433c82153ad52297b05dc2422e20d90b2398f6cf4e11f0408b8565ace7d559bf80fc8e2f5fc086a693311f97ed09a5c004cd356d210c14aef9bd848d00f1
 DIST rsyslog-7.4.10.tar.gz 2924496 SHA256 ab1d26da2bfd38db34dd991a9c5d93034ef1373d01f9d5a0923bb0d4802b9fbe SHA512 8e9a665304419a738e7dac0f682681071d0269291ffe86bd4a0008a00c2bd5259d982a2f78349ee7f26d43bf85aea312293515925d9c9001d3b994dac981390d WHIRLPOOL de0410250129933351c773efa30afd7e4827d6e8542da83ad57d3536893c42552e5e0c3f337f786c45812262ec0a6bb93a3257966c64deb99ff126a924f15845
-DIST rsyslog-7.4.3.tar.gz 2908523 SHA256 d96fcb733452177f5f06789507e06f5c01434d83001c130c9fcdf21e0fffe382 SHA512 bf840b59c4fb6e0978ca55df5ef48cb6898e0c6ec633efce8e148c0d8af5497346c98290df388811b2f94425119dd0bf28dd272418a35f958ed59a3f5946d25a WHIRLPOOL b57acc662e232c27293c2836d5547e0cc7e7902fdd3ed5d2bfcbf85a747ecdb6c984b25da1a38196f485e2473d2de3f5ae8d9d764cdd86778d4bc99b9a3f574d
 DIST rsyslog-7.4.4.tar.gz 2910075 SHA256 276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087 SHA512 cefaa0d5c5e9deb8a6e049a5b6c4503a9f30bfe89324a06f3e8ac6d85334bbddfec9e81010a1821ad5f902347bbc519e92d501783f77bd12f29e216a9abbfc08 WHIRLPOOL 0ba87e3edd7e0eba6ceaeef251d9e29d580452e0305c9df9577769abd53e01345a86de45c0289b945eca3d283838d7cbc4d36eb04ba8105fe3cb754c06a759b9
-DIST rsyslog-7.4.6.tar.gz 2932031 SHA256 07c2cdc4152c05a4f226361fb12c6124087182cc100bf063334af18153d5f7d2 SHA512 07e63c3ac892b9e1a146c057f46e4d3834858569784fbac0c57fd6320a4e4b79d382384fdbba2070fabaea213f5a7c216db56d0d7616b4b55119aff2878dc5a0 WHIRLPOOL 3ad567965609ac35127430c525f82ebbb971f5930d188fe7208f64959c670c54ad1d658d040bbbec0006ff4f74b75c5eb3ce319d752fb0691468635c81961390
-DIST rsyslog-7.4.7.tar.gz 2934197 SHA256 5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21 SHA512 4366ed63364a793ee6d19ee078aa72685c1558256dfaf2a43db6574a531fc0e815f870d956c74f680258bfddbe5657ef1eb6a3bd4eb7f6808d0d2f9a6dd924f5 WHIRLPOOL 356fecff57334935315710086a7b32b6f217e3fb3711d5dfc9f671ea22d1e4f73e96df2705af17433ad3f646586ac04037dfc31370cb5509bfd91f0e80ccfee4
+DIST rsyslog-7.6.3.tar.gz 3052448 SHA256 013359035f8b6e5a4328edaffbda1120974accaba36ddc5de66a582fa588f5ec SHA512 f5bafbf7e40011e583a01d20beb1a98b78512cd537128c8f925c27b1906b22471b98d11e58c41256570fc205ec7ca756219d5cf44041ffe4e613fbd802d1f309 WHIRLPOOL 23719d6451eec4d21b022dfc2701726a00adeb132f8fe7e93826fba8693edbf949d7b6a9f3fac358482ee86b65fbccfd25330a6bbbd522e92bfc659bf01ec243
 EBUILD rsyslog-7.2.7.ebuild 7242 SHA256 b78a4318a93c2d6ce36d2e51ad216f5fa21797ebe5941daef4d5bf8fbe32c641 SHA512 8c2394ddc3855b44fc7135679e197e2acb31b1ca20efbf1469f03edb9aea73555dfa5b66c908cb6beeb36fb6254a66a8480f1814d2dfe8f5414927ef6f865f01 WHIRLPOOL 2e78d86f6c03e989237811a74138b75cc0d33435b72a3286a1943ece009d434307a1282e333c7ffc9dda4ec9d773e287676a5f16cf2e0bbe29f076e52cf39b85
 EBUILD rsyslog-7.4.10.ebuild 7286 SHA256 bf809c04b622fac07835c50022d08080f4996991807a55f594c9225dedfcbc29 SHA512 fa80b702e69d281ad60c304dfc76af7aa103f92d41c873ec88209311b23cc78d62bcfa5c1cff331d0a52d33d5e2db91c047a079f0867048af766976847eaa967 WHIRLPOOL 3ac67652764549ec67d390a9e2f7d6a505ca6f9a68c1e00cd33f4d942c92a878f708bf2710a04f4b0ffd4b0606303698bd79e5ca6ec9f98b1187ec1eea550c0e
-EBUILD rsyslog-7.4.3.ebuild 7099 SHA256 a9aeaa36c81328fd1d77a4d2afcd45bb3c6356c85ac3095d4589e0a9be6b87a8 SHA512 b2cbcfb5ab892584e141ab3bb35fd0ae12e86ae2d6fae5618aff0cb7b334742d33840c56bfcbf1aab6d60da4fd9bc6075a0b0d66fa2d16025ad9375748534fba WHIRLPOOL 4ea78295928283bc19e171ba925a158117e5cb8ae9043621fc6ac81e109a360ae2ec5efe1198e15f33c98feeca50ee8802c473070efada440e1b98d6ea7ad0a1
 EBUILD rsyslog-7.4.4.ebuild 7068 SHA256 5fd6b6681b9fb7677ed00541237ce6e1b1eede86c9ac4ecfff56a1ccd2aae4a1 SHA512 e979da21fde67ce6d759273cdc0cfd138d2fd4dd7550650d7a467ca5484f0eac4ce0832e13fef7ffe638f005b91eed940037e8784fc7772b1d46823c62554c3a WHIRLPOOL dfa887210559f405484b59ad0f22015dc9a832f474af108652a9defddc8ab4329e8855322904b110fc2e0cbe65805839772d6dd00ef5d1db283d2cd6b83d864f
-EBUILD rsyslog-7.4.6.ebuild 7070 SHA256 8309efc45ed1b329f8f6d6ee08567bb52f094b27a9c822c3b51612ab0ef8f960 SHA512 a9f44a8a0ec93039cc19559ceeaa1e4db655bff29b38c86928a7386ffe2201cfdabd4ffe4b0925a60b1fea1a99101f018a15e6bd00190519615d6468465daa79 WHIRLPOOL 048526caf36d0186be116c97304f5280d806e30d81713be1b225cb3c0781099ae7b4153ac463b356be2d263d58a6e0c644188e3b0effa575af0f95a8f20982ed
-EBUILD rsyslog-7.4.7.ebuild 7154 SHA256 c75e649b10f739c4b26b00d5ae2f967b261b77e10b29ebab65cc7f741f1ec52e SHA512 9f1eed4c51c25943265664ead2c3d8ab5f851b5c19fa59217d81031729a982df327178aa85aa74543659b8d15328b04fbc338e1dc2d89974f35378deb47ef5a3 WHIRLPOOL 4bce0bf3adcabfbd161589b1b36b84664ffe9e8b34315ebda47039112fd239d09b486c5bb92d564edd94fb64bfda1afa38d174797acbe8063858fd0cf2dca9e6
-MISC ChangeLog 20844 SHA256 47d33af5c7f1d091f5667b40fa8d0913459377eb378bf419f8af1ba0ce70ee09 SHA512 1297e117b656c6bf08d75b916a24ab8371034ed4641160a1fe15d63e54a25320ed47c56bc4a0523068a69257ef57adb8d946b0d4e9fa232dd06cd43b0e707d31 WHIRLPOOL 962caf47b781ef0894ed14aa214fa2d8094aabfabcb164d1cf62e7e04344ec3ce8f7596be59fac113710440a571984542c911ee91d18cae7e1ebc21a8f398a15
-MISC metadata.xml 1024 SHA256 b6fd10efa6c76f70de0a4b59b70bedfe0ad9012b2807e89627e7bcc056b16ba0 SHA512 86727a3fa9ad7114ca203f32cc2d3c00ce1ef783ec3863b22caccd5909df582cf562c813da0631437383302f581121ce3666941c9693ee55c2d5a9e183c0394c WHIRLPOOL 489d8c631d8e5e4e3b3d94fe6f666c320c9a66c70a1e605aa3fc39803273d8b614def81110dc7378e014d4758b3f9f8a696bfa32c1c6bc671618c2a796c5267e
+EBUILD rsyslog-7.6.3.ebuild 9300 SHA256 40dee3a5aeb1290de511b860084993d17a45aac6c713e0a197083279f13c31a6 SHA512 5aa07968e2b752052f81b576dda9af1c2f82c5e2528944aaf76d298c684d8f69b462d37dd63b477ec9d797474e7279b97d65599efe6be11ce584592608b374aa WHIRLPOOL e0494490d629aff03123eb7b8f7123ca5e470b65f8f4e98f67cc6e9b6649adea2cc6ce3154d9b6d02e82eaa75ae9fc110b9134188a5a10f2622879e7cb5698be
+MISC ChangeLog 21444 SHA256 43d08144c1b0e692a278c983ff6715040f97533967cd613c488c188ecfc820a1 SHA512 e6ac9b0a12f44d03cb784e68a22d1e268f2d43884061acf72eb831e8d47be73442335e503dbf860587de4c589a19af3cba15e25d320de10a5190d08211b133ac WHIRLPOOL 80e95b14080efda18f349ba672927f0f3ec66a8d9f1f405d58223e06467ce2dae7b57a8cf5cab6d2b6d1f31618e76ad03e16d8d8a0f30446a19121d24e07104b
+MISC metadata.xml 2941 SHA256 3d75473e17679907bf3170ec29f377f6eac2ee67408685015de41584713a68c1 SHA512 57b479b75864889ce2b143921c7e717229ba88f1eb470db0c6d2b151a5061b2b6fc5138b50c6e96c1d715ac0d05d48ed4c34375d42c0ea9cc3703c4f92625c44 WHIRLPOOL 70bfd3127b8f630e009d5226de5fc39b42a6f188069f68aead8986661516b171879bccb82cf1d444c150dd004cddddf9402e60e2d3ce43f1108171ffe84ec304
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTTqxuAAoJEAmJmMX429re4GkIAIF/A/7VRuxLPFPIEYeT8mXL
-cUAksVNShK517woodPMFQSqZgUil2ziNCh8W6wAX/OU3HYRcBkt3aZg2+21R0X1S
-lL0ipS/Wx3e/vKTaqSSFQ4mF1yjn+b4sUVXKXsFdklz8N6cdmOUBAv+bzDMDSmQp
-jt2zga6n1jNWcysqy+X+K4UPpnuq4NkXjrPa2UK2KXG9q6bjxpoeXu/pUvX3eoXT
-hbA0rcDg8g0ewcHUYzek7iJm+6SP+xR68ZeLNg0BgL9kwFcZYUGzL2dMxoK4Ewbj
-GGmxvtKiGeNncIDOgaxNSr/SoncgOwnWtHmqhvY6VrQGcUwjEFYk492f8KOzhgA=
-=dRbJ
+iF4EAREIAAYFAlN93GsACgkQKiQSS7ZY+hP7xgEA6vHbWIvzUq5xdDf7ntDKEBSC
+ph20Doo4aKBWreVI9wgBALvvWp3V8Woe6Qkb/KvGnCkXsIy05zDLFkGxFHA9niaB
+=gSgF
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/files/7-stable/50-default.conf b/app-admin/rsyslog/files/7-stable/50-default.conf
new file mode 100644
index 000000000000..9ae8578215bb
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/50-default.conf
@@ -0,0 +1,95 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+	type="omfile"
+	File="/var/log/auth.log"
+	FileCreateMode="0600"
+	FileOwner="root"
+	FileGroup="adm"
+	Sync="off"
+)
+
+cron.* action(
+	type="omfile"
+	File="/var/log/cron.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+daemon.* action(
+	type="omfile"
+	File="/var/log/daemon.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+kern.* action(
+	type="omfile"
+	File="/var/log/kern.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+lpr.* action(
+	type="omfile"
+	File="/var/log/lpr.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+mail.* action(
+	type="omfile"
+	File="/var/log/mail.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+news.* action(
+	type="omfile"
+	File="/var/log/news.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+user.* action(
+	type="omfile"
+	File="/var/log/user.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+	type="omfile"
+	File="/var/log/debug.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+	type="omfile"
+	File="/var/log/messages"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv.none action(
+#	type="omfile"
+#	File="/var/log/syslog"
+#	FileOwner="root"
+#	FileGroup="adm"
+#)
+
+*.emerg action(
+	type="omusrmsg"
+	Users="*"
+	action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/7-stable/README.gentoo b/app-admin/rsyslog/files/7-stable/README.gentoo
new file mode 100644
index 000000000000..9f0666c86b0a
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/README.gentoo
@@ -0,0 +1,36 @@
+Introduction
+============
+
+Since rsyslog version 7.6 we are shipping a new default Gentoo
+configuration. See bug #501982 to learn more about what we were trying to
+achieve by rewriting the entire configuration.
+
+
+Important changes
+=================
+
+1. "/var/log/syslog" log file is now deprecated
+
+   Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no
+   longer being written per default. We are considering this file as
+   deprecated/obsolet for the typical user/system.
+   The content from this log file is still availble through other
+   (dedicated) log files, see
+   
+     - /var/log/cron.log
+     - /var/log/daemon.log
+     - /var/log/mail.log
+     - /var/log/messages
+   
+   If you really need the old "/var/log/syslog" log file, all you have to
+   do is uncommenting the corresponding configuration directive in
+   "/etc/rsyslog.d/50-default.conf".
+   
+   If you do so, don't forget to re-enable log rotation in
+   "/etc/logrotate.d/rsyslog", too.
+
+
+2. An additional input socket in "/var/empty/dev/log" (default chroot
+   location) will be created per default
+
+   See bug #490744 for further details.
diff --git a/app-admin/rsyslog/files/7-stable/bugfix_52.patch b/app-admin/rsyslog/files/7-stable/bugfix_52.patch
new file mode 100644
index 000000000000..f5da7b92f3bf
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/bugfix_52.patch
@@ -0,0 +1,100 @@
+From b017e29aad70702c69e6016b07a932b7825a83e5 Mon Sep 17 00:00:00 2001
+From: Thomas D <whissi@whissi.de>
+Date: Sat, 3 May 2014 14:45:25 +0200
+Subject: [PATCH] Remove "--enable-cached-man-pages" switch and make rst2man
+ optional when required man pages already exist
+
+This commit backports the bugfix for issue #52 for the v7-stable branch.
+---
+ configure.ac | 61 +++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 36 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0dd40c2..07d96dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1087,30 +1087,6 @@ fi
+ AM_CONDITIONAL(ENABLE_GUARDTIME, test x$enable_guardtime = xyes)
+ 
+ 
+-# Support using cached man file copies, to avoid the need for rst2man
+-# in the build environment
+-AC_ARG_ENABLE(cached_man_pages,
+-        [AS_HELP_STRING([--enable-cached-man-pages],[Enable using cached versions of man files (avoid rst2man) @<:@default=no@:>@])],
+-        [case "${enableval}" in
+-         yes) enable_cached_man_pages="yes" ;;
+-          no) enable_cached_man_pages="no" ;;
+-           *) AC_MSG_ERROR(bad value ${enableval} for --enable-cached-man-pages) ;;
+-         esac],
+-        [enable_cached_man_pages=no]
+-)
+-if test "x$enable_cached_man_pages" = "xno"; then
+-# obtain path for rst2man
+-  if test "x$enable_libgcrypt" = "xyes" || \
+-     test "x$enable_guardtime" = "xyes"; then
+-        AC_PATH_PROG([RST2MAN], [rst2man])
+-        if test "x${RST2MAN}" == "x"; then
+-            AC_MSG_FAILURE([rst2man not found in PATH])
+-        fi
+-  fi
+-fi
+-
+-
+-
+ # RFC 3195 support
+ AC_ARG_ENABLE(rfc3195,
+         [AS_HELP_STRING([--enable-rfc3195],[Enable RFC3195 support @<:@default=no@:>@])],
+@@ -1519,6 +1495,41 @@ AM_CONDITIONAL(ENABLE_OMHIREDIS, test x$enable_omhiredis = xyes)
+ 
+ # END HIREDIS SUPPORT
+ 
++
++AC_CHECKING([if required man pages already exist])
++have_to_generate_man_pages="no"
++
++# man pages for libgcrypt module
++if test "x$enable_usertools" = "xyes" && test "x$enable_libgcrypt" = "xyes"; then
++    AC_CHECK_FILES(["tools/rscryutil.1" "tools/rsgtutil.1"],
++        [],
++        [have_to_generate_man_pages="yes"]
++    )
++fi
++
++# man pages for GuardTime module
++if test "x$enable_usertools" = "xyes" && test "x$enable_guardtime" = "xyes"; then
++    AC_CHECK_FILES(["tools/rscryutil.1" "tools/rsgtutil.1"],
++        [],
++        [have_to_generate_man_pages="yes"]
++    )
++fi
++
++if test "x$have_to_generate_man_pages" = "xyes"; then
++    AC_MSG_RESULT([Some man pages are missing. We need rst2man to generate the missing man pages from source...])
++else
++    AC_MSG_RESULT([All required man pages found. We don't need rst2man!])
++fi
++
++if test "x$have_to_generate_man_pages" = "xyes"; then
++    # We need rst2man to generate our man pages
++    AC_CHECK_PROGS([RST2MAN], [rst2man rst2man.py], [])
++    if test -z "$RST2MAN"; then
++        AC_MSG_ERROR([rst2man is required to build man pages. You can use the release tarball with pregenerated man pages to avoid this depedency.])
++    fi
++fi
++
++
+ AC_CONFIG_FILES([Makefile \
+ 		runtime/Makefile \
+ 		compat/Makefile \
+@@ -1594,7 +1605,7 @@ echo "    Zlib compression support enabled:         $enable_zlib"
+ echo "    rsyslog runtime will be built:            $enable_rsyslogrt"
+ echo "    rsyslogd will be built:                   $enable_rsyslogd"
+ echo "    GUI components will be built:             $enable_gui"
+-echo "    cached man files will be used:            $enable_cached_man_pages"
++echo "    have to generate man pages:               $have_to_generate_man_pages"
+ echo "    Unlimited select() support enabled:       $enable_unlimited_select"
+ echo "    uuid support enabled:                     $enable_uuid"
+ echo "    Log file signing support:                 $enable_guardtime"
+-- 
+1.9.2
+
diff --git a/app-admin/rsyslog/files/7-stable/bugfix_73.patch b/app-admin/rsyslog/files/7-stable/bugfix_73.patch
new file mode 100644
index 000000000000..cc295d614def
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/bugfix_73.patch
@@ -0,0 +1,103 @@
+This patch will update the pre-generated rscryutil man page from the release
+tarball so we don't need to depend on dev-python/docutils.
+
+https://github.com/rsyslog/rsyslog/issues/73
+
+diff -rupN old/rsyslog-7.6.3/tools/rscryutil.1 new/rsyslog-7.6.3/tools/rscryutil.1
+--- old/rsyslog-7.6.3/tools/rscryutil.1	2013-10-29 16:31:21.000000000 +0100
++++ new/rsyslog-7.6.3/tools/rscryutil.1	2014-05-03 20:41:46.143825094 +0200
+@@ -1,4 +1,4 @@
+-.\" Man page generated from reStructeredText.
++.\" Man page generated from reStructuredText.
+ .
+ .TH RSCRYUTIL 1 "2013-04-15" "" ""
+ .SH NAME
+@@ -31,12 +31,16 @@ level margin: \\n[rst2man-indent\\n[rst2
+ .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+ ..
+ .SH SYNOPSIS
++.INDENT 0.0
++.INDENT 3.5
+ .sp
+ .nf
+ .ft C
+ rscryutil [OPTIONS] [FILE] ...
+ .ft P
+ .fi
++.UNINDENT
++.UNINDENT
+ .SH DESCRIPTION
+ .sp
+ This tool performs various operations on encrypted log files.
+@@ -44,46 +48,46 @@ Most importantly, it provides the abilit
+ .SH OPTIONS
+ .INDENT 0.0
+ .TP
+-.B \-d,  \-\-decrypt
++.B \-d\fP,\fB  \-\-decrypt
+ Select decryption mode. This is the default mode.
+ .TP
+-.BI \-W,  \-\-write\-keyfile \ <file>
++.BI \-W\fP,\fB  \-\-write\-keyfile \ <file>
+ Utility function to write a key to a keyfile. The key can be obtained
+ via any method.
+ .TP
+-.B \-v,  \-\-verbose
++.B \-v\fP,\fB  \-\-verbose
+ Select verbose mode.
+ .TP
+-.B \-f,  \-\-force
++.B \-f\fP,\fB  \-\-force
+ Forces operations that otherwise would fail.
+ .TP
+-.BI \-k,  \-\-keyfile \ <file>
++.BI \-k\fP,\fB  \-\-keyfile \ <file>
+ Reads the key from <file>. File _must_ contain the key, only, no headers
+ or other meta information. Keyfiles can be generated via the
+ \fI\-\-write\-keyfile\fP option.
+ .TP
+-.BI \-p,  \-\-key\-program \ <path\-to\-program>
++.BI \-p\fP,\fB  \-\-key\-program \ <path\-to\-program>
+ In this mode, the key is provided by a so\-called "key program". This program
+ is executed and must return the key to (as well as some meta information)
+ via stdout. The core idea of key programs is that using this interface the
+ user can implement as complex (and secure) method to obtain keys as
+ desired, all without the need to make modifications to rsyslog.
+ .TP
+-.BI \-K,  \-\-key \ <KEY>
++.BI \-K\fP,\fB  \-\-key \ <KEY>
+ TESTING AID, NOT FOR PRODUCTION USE. This uses the KEY specified
+ on the command line. This is the actual key, and as such this mode
+ is highly insecure. However, it can be useful for intial testing
+ steps. This option may be removed in the future.
+ .TP
+-.BI \-a,  \-\-algo \ <algo>
++.BI \-a\fP,\fB  \-\-algo \ <algo>
+ Sets the encryption algorightm (cipher) to be used. See below
+ for supported algorithms. The default is "AES128".
+ .TP
+-.BI \-m,  \-\-mode \ <mode>
++.BI \-m\fP,\fB  \-\-mode \ <mode>
+ Sets the ciphermode to be used. See below for supported modes.
+ The default is "CBC".
+ .TP
+-.BI \-r,  \-\-generate\-random\-key \ <bytes>
++.BI \-r\fP,\fB  \-\-generate\-random\-key \ <bytes>
+ Generates a random key of length <bytes>. This option is
+ meant to be used together with \fI\-\-write\-keyfile\fP (and it is hard
+ to envision any other valid use for it).
+@@ -97,7 +101,7 @@ multiple operations mode are set on the
+ unpredictable.
+ .SS decrypt
+ .sp
+-The provided log files are decrypted. Note that the \fI.encinfo\fP side files
++The provided log files are decrypted. Note that the \fI\&.encinfo\fP side files
+ must exist and be accessible in order for decryption to to work.
+ .SS write\-keyfile
+ .sp
+@@ -198,5 +202,4 @@ LGPLv2.
+ .SH AUTHOR
+ Rainer Gerhards <rgerhards@adiscon.com>
+ .\" Generated by docutils manpage writer.
+-.\" 
+ .
diff --git a/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch b/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch
new file mode 100644
index 000000000000..816471caffa7
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/fix-omruleset-default-value.patch
@@ -0,0 +1,25 @@
+From 14f3b45151864aa4170de515f406a69ad2931eba Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Thu, 31 Oct 2013 18:21:47 +0100
+Subject: [PATCH] module omruleset is no longer enabled by default.
+
+Note that it has been deprecated in v7 and been replaced by the "call"
+statement. Also, it can still be build without problems, the option must
+just explicitely be given.
+---
+diff --git a/configure.ac b/configure.ac
+index 3abd559..de4c3ea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1353,7 +1353,7 @@ AC_ARG_ENABLE(omruleset,
+           no) enable_omruleset="no" ;;
+            *) AC_MSG_ERROR(bad value ${enableval} for --enable-omruleset) ;;
+          esac],
+-        [enable_omruleset=yes]
++        [enable_omruleset=no]
+ )
+ AM_CONDITIONAL(ENABLE_OMRULESET, test x$enable_omruleset = xyes)
+ 
+-- 
+1.9.1
+
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.conf b/app-admin/rsyslog/files/7-stable/rsyslog.conf
new file mode 100644
index 000000000000..da484598a652
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.conf
@@ -0,0 +1,61 @@
+# /etc/rsyslog.conf
+# 
+# This configuration is based on RainerScript, the new recommended syntax
+# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
+# details.
+# 
+# But if you don't want to learn something new at moment, don't worry: The
+# legacy syntax is still supported.
+# 
+# You may want to use the new RSYSLOG configuration builder to create your
+# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
+
+# Check config syntax on startup and abort if unclean (default: off)
+#$AbortOnUncleanConfig on
+
+
+###############
+### MODULES ###
+###############
+
+# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
+module(load="imuxsock")
+
+# Read messages from the kernel log and submits them to the syslog engine
+module(load="imklog")
+
+# Inject "--MARK--" messages every $Interval (seconds)
+#module(load="immark" Interval="600")
+
+# Read syslog messages from UDP
+#module(load="imudp")
+#input(type="imudp" port="514")
+
+# Read syslog messages from TCP
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+
+
+#########################
+### GLOBAL DIRECTIVES ###
+#########################
+
+# Where to place spool and state files
+$WorkDirectory /var/spool/rsyslog
+
+# Reduce repeating messages (default: off)
+#$RepeatedMsgReduction on
+
+# Set defaults for every output file
+$Umask 0022
+
+module(
+	load="builtin:omfile"
+	Template="RSYSLOG_TraditionalFileFormat"
+	FileCreateMode="0644"
+	DirCreateMode="0755"
+)
+
+
+# Include all conf files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1
new file mode 100644
index 000000000000..d8cbe875960a
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.confd-r1
@@ -0,0 +1,30 @@
+# /etc/conf.d/rsyslog
+
+# Configuration file
+RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
+
+# PID file
+# If you should ever change this, remember to update
+# "/etc/logrotate.d/rsyslog", too.
+RSYSLOG_PIDFILE="/run/rsyslogd.pid"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+RSYSLOG_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+# You need to increase the value when you are working with a large queue.
+# See http://www.rsyslog.com/doc/queues.html for further information.
+RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
+
+
+# Options to rsyslogd
+# See rsyslogd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
new file mode 100644
index 000000000000..90a9702f6e1c
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1
@@ -0,0 +1,69 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog.initd-r1,v 1.1 2014/05/22 11:15:49 ultrabug Exp $
+
+RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
+RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
+
+command="/usr/sbin/rsyslogd"
+command_args="${RSYSLOG_OPTS} -f ${RSYSLOG_CONFIGFILE} -i ${RSYSLOG_PIDFILE}"
+start_stop_daemon_args="${RSYSLOG_SSDARGS}"
+pidfile="${RSYSLOG_PIDFILE}"
+retry="${RSYSLOG_TERMTIMEOUT}"
+
+required_files=( "${RSYSLOG_CONFIGFILE}" )
+
+description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
+
+extra_commands="configtest"
+extra_started_commands="rotate"
+
+description_configtest="Run rsyslogd's internal config check."
+
+description_rotate="Sends rsyslogd a signal to re-open its log files."
+
+depend() {
+	need clock hostname localmount
+	provide logger
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_post() {
+	rm -f ${RSYSLOG_PIDFILE}
+}
+
+configtest() {
+	# This will currently only detect fatal errors
+	# See https://github.com/rsyslog/rsyslog/issues/79
+
+	local _test_command="${command} -N 999 -f ${RSYSLOG_CONFIGFILE}"
+	local _retval=0
+
+	ebegin "Checking rsyslogd's configuration"
+	${_test_command} &>/dev/null
+	_retval=$?
+
+	if [ ${_retval} -ne 0 ]; then
+		${_test_command}
+	fi
+
+	eend ${_retval} "failed, please correct errors above"
+}
+
+rotate() {
+	ebegin "Re-opening rsyslogd logs"
+	start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
+	eend $?
+}
diff --git a/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1 b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
new file mode 100644
index 000000000000..1eae30e0d741
--- /dev/null
+++ b/app-admin/rsyslog/files/7-stable/rsyslog.logrotate-r1
@@ -0,0 +1,37 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+#	rotate 7
+#	daily
+#	missingok
+#	notifempty
+#	delaycompress
+#	compress
+#	postrotate
+#		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#	endscript
+#}
+
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+/var/log/debug.log
+/var/log/messages
+{
+	rotate 4
+	weekly
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+	postrotate
+		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+	endscript
+}
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index bd711f139060..6f23de3e8171 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -1,23 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>ultrabug@gentoo.org</email>
-    <name>Ultrabug</name>
-    <description>Primary Maintainer</description>
-  </maintainer>
-  <maintainer>
-    <email>whissi@whissi.de</email>
-    <name>Thomas D. (Whissi)</name>
-    <description>Proxy-Maintainer, CC. bugs</description>
-  </maintainer>
-  <use>
-    <flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
-    <flag name="mongodb">Add support for the MongoDB output template module using <pkg>dev-libs/libmongo-client</pkg></flag>
-    <flag name="relp">Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
-    <flag name="zeromq">Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
-  </upstream>
+	<maintainer>
+		<email>ultrabug@gentoo.org</email>
+		<name>Ultrabug</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>whissi@whissi.de</email>
+		<name>Thomas D. (Whissi)</name>
+		<description>Proxy-Maintainer, CC. bugs</description>
+	</maintainer>
+	<use>
+		<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
+		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
+		<flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
+		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
+		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
+		<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>
+		<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
+		<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
+		<flag name="oracle">Build the Oracle database output module (requires <pkg>dev-db/oracle-instantclient-basic</pkg>)</flag>
+		<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql-base</pkg>)</flag>
+		<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
+		<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
+		<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
+		<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
+		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag>
+		<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
+		<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
+		<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
+		<flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
+		<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/zeromq</pkg>)</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to>
+		<remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/rsyslog/rsyslog-7.4.3.ebuild b/app-admin/rsyslog/rsyslog-7.4.3.ebuild
deleted file mode 100644
index 007d1ae8dad0..000000000000
--- a/app-admin/rsyslog/rsyslog-7.4.3.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.3.ebuild,v 1.8 2014/04/16 16:14:41 maksbotan 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"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
-
-RDEPEND="
-	dev-libs/json-c
-	dev-libs/libee
-	>=dev-libs/libestr-0.1.5
-	dev-libs/libgcrypt:0
-	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-1.0.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="7-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)
-
-PATCHES=(
-	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-json-c-pkgconfig.patch
-	"${FILESDIR}"/${BRANCH}/${PN}-7.4.3-fix-runtime.patch
-	"$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-)
-
-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 : doesnt work with mongo-c-driver ?
-	local myeconfargs=(
-		--enable-cached-man-pages
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
-		--enable-mmanon
-		--enable-omprog
-		--enable-omstdout
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
-		$(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_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-	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"
-}
diff --git a/app-admin/rsyslog/rsyslog-7.4.6.ebuild b/app-admin/rsyslog/rsyslog-7.4.6.ebuild
deleted file mode 100644
index 73b852e64afb..000000000000
--- a/app-admin/rsyslog/rsyslog-7.4.6.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.6.ebuild,v 1.6 2014/04/16 16:14:41 maksbotan 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"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs systemd zeromq zlib"
-
-RDEPEND="
-	dev-libs/json-c
-	dev-libs/libee
-	>=dev-libs/libestr-0.1.9
-	dev-libs/libgcrypt:0
-	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-1.0.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	systemd? ( sys-apps/systemd )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="7-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() {
-	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-}
-
-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 : doesnt work with mongo-c-driver ?
-	local myeconfargs=(
-		--enable-cached-man-pages
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
-		--enable-mmanon
-		--enable-omprog
-		--enable-omstdout
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
-		$(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 systemd omjournal)
-		$(use_enable zlib)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-	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"
-}
diff --git a/app-admin/rsyslog/rsyslog-7.4.7.ebuild b/app-admin/rsyslog/rsyslog-7.6.3.ebuild
index 4eac17feddb9..9a5e38b85242 100644
--- a/app-admin/rsyslog/rsyslog-7.4.7.ebuild
+++ b/app-admin/rsyslog/rsyslog-7.6.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.7.ebuild,v 1.5 2014/04/16 16:14:41 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.6.3.ebuild,v 1.1 2014/05/22 11:15:49 ultrabug Exp $
 
 EAPI=5
-AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-utils eutils systemd
 
@@ -12,118 +12,168 @@ HOMEPAGE="http://www.rsyslog.com/"
 SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="dbi debug doc extras kerberos mongodb mysql oracle postgres relp snmp ssl static-libs systemd zeromq zlib"
+IUSE="dbi debug doc elasticsearch +gcrypt kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
 
 RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libee
+	>=dev-libs/json-c-0.11:=
 	>=dev-libs/libestr-0.1.9
-	dev-libs/libgcrypt:0=
-	dev-libs/liblognorm
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
 	kerberos? ( virtual/krb5 )
-	mongodb? ( dev-libs/libmongo-client )
+	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-1.0.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	systemd? ( sys-apps/systemd )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-0.3.1:=
+		!>=dev-libs/liblognorm-1.0.0
+	)
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.2 )
+	postgres? ( >=dev-db/postgresql-base-8.4.20 )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
+	redis? ( >=dev-libs/hiredis-0.11.0 )
+	relp? ( >=dev-libs/librelp-1.2.5 )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23 )
+	systemd? ( >=sys-apps/systemd-208 )
+	zeromq? ( >=net-libs/czmq-1.2.0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 BRANCH="7-stable"
 
-# need access to certain device nodes
+# Test suite requires a special setup or will always fail
 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)
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
 
-src_prepare() {
-	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-}
+DOCS=(
+	AUTHORS
+	ChangeLog
+	doc/rsyslog-example.conf
+	"${FILESDIR}"/${BRANCH}/README.gentoo
+)
+
+PATCHES=(
+	"${FILESDIR}"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
+	"${FILESDIR}"/${BRANCH}/fix-omruleset-default-value.patch
+	"${FILESDIR}"/${BRANCH}/bugfix_52.patch
+	"${FILESDIR}"/${BRANCH}/bugfix_73.patch
+)
 
 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 : doesnt work with mongo-c-driver ?
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
 	local myeconfargs=(
-		--enable-cached-man-pages
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
+		# Input Plugins without depedencies
 		--enable-imfile
 		--enable-impstats
 		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
+		--enable-imttcp
+		# Message Modificiation Plugins without depedencies
 		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
 		--enable-omprog
+		--enable-omruleset
 		--enable-omstdout
 		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmcisconames
 		--enable-pmlastmsg
 		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
 		--enable-pmsnare
 		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
+		# DB
 		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable oracle)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
 		$(use_enable debug)
-		$(use_enable debug rtinst)
 		$(use_enable debug diagtools)
+		$(use_enable debug imdiag)
 		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
 		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
+		# Misc
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
 		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
+		$(use_enable normalize mmnormalize)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
 		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
 		$(use_enable snmp)
 		$(use_enable snmp mmsnmptrapd)
 		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
 		$(use_enable systemd omjournal)
-		$(use_enable zlib)
+		$(use_enable usertools)
 		$(use_enable zeromq imzmq3)
 		$(use_enable zeromq omzmq3)
 		"$(systemd_with_unitdir)"
 	)
+
 	autotools-utils_src_configure
 }
 
 src_install() {
-	use doc && HTML_DOCS=(doc/)
+	use doc && HTML_DOCS=( "${S}"/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}
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
 	keepdir /var/spool/${PN}
 	keepdir /etc/ssl/${PN}
 	keepdir /etc/${PN}.d
 
-	use static-libs || find "${D}" -name '*.la' -delete || die
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate-r1" ${PN}
 
 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
@@ -134,25 +184,50 @@ src_install() {
 		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"
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		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
 	fi
 
-	if use ssl; then
+	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
+		# Show this message until rsyslog-8.x
 		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."
+		elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
+		elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
+
+		advertise_readme=1
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
 	fi
 }
 
@@ -164,7 +239,7 @@ pkg_config() {
 	fi
 
 	# Make sure the certificates directory exists
-	CERTDIR="${ROOT}/etc/ssl/${PN}"
+	CERTDIR="${EROOT}/etc/ssl/${PN}"
 	if [ ! -d "${CERTDIR}" ]; then
 		mkdir "${CERTDIR}" || die
 	fi