Change version pattern to yyyymmdd, remove old version, add lognorm use flag. Thanks to slepnoga

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

7 files changed, 50 insertions, 58 deletions

diff --git a/app-admin/sagan-rules/ChangeLog b/app-admin/sagan-rules/ChangeLog
index bbb2a646fada..04ff63f672e2 100644
--- a/app-admin/sagan-rules/ChangeLog
+++ b/app-admin/sagan-rules/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/sagan-rules
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan-rules/ChangeLog,v 1.3 2012/02/04 14:49:30 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan-rules/ChangeLog,v 1.4 2012/02/17 11:29:16 maksbotan Exp $
+
+*sagan-rules-20110822 (17 Feb 2012)
+*sagan-rules-99999999 (17 Feb 2012)
+
+  17 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +sagan-rules-20110822.ebuild, +sagan-rules-99999999.ebuild,
+  -sagan-rules-03172011.ebuild, -sagan-rules-22082011.ebuild,
+  -sagan-rules-999999999999.ebuild, metadata.xml:
+  Change version pattern to yyyymmdd, remove old version, add lognorm use flag.
+  Thanks to slepnoga
 
   04 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml:
   Fix maintainer's email in metadata
diff --git a/app-admin/sagan-rules/Manifest b/app-admin/sagan-rules/Manifest
index 69cd1274c707..8593a4659a9c 100644
--- a/app-admin/sagan-rules/Manifest
+++ b/app-admin/sagan-rules/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST sagan-rules-03172011-r1.tar.gz 193382 RMD160 f710686d191aac370c5bf08f205d54ec1fe2c4b5 SHA1 daeb796616323c8e15beb344205d8184fc04da06 SHA256 708dc4808d89d346c0e53785b4d92f180cfc650c3e5b735abfddcbea11948233
-DIST sagan-rules-22082011.tar.gz 355802 RMD160 575b201fcc88218b1a5b153149f56a43a6ad9b27 SHA1 73a96e5c9629060a14724a98c8a80893649c2a4b SHA256 d92c5b1fdb4cdc1b371c506661387bac1ff3f73e1f72cec29e8501c3d2a330e9
-EBUILD sagan-rules-03172011.ebuild 592 RMD160 a05eeb935436b5fe3361d3653238021dd8849873 SHA1 3039d039fcfd2ae09ac42fb0ce3071fa12432056 SHA256 168db8359700552f0c1fe5dfa3bec25236db2227141c5bb34302af463c32bcd4
-EBUILD sagan-rules-22082011.ebuild 615 RMD160 54d22a445c2e1df27133ba74339bce83c5928284 SHA1 ade1e720f05300481a64a9b07ba9948f4161fc85 SHA256 68b96bac9441c90ae748e66fbee08af8c74b90d02277a3e01d85aea9c696ba52
-EBUILD sagan-rules-999999999999.ebuild 589 RMD160 dbdbacf592cad116f0aaace2e4191345c564ab2c SHA1 41f28f13675e04fd10ac7344d0647e9bb3050521 SHA256 77aa30e3c29202fae2e2324f5ec74b453796f3559dc80f2f71d462fad1d31ca3
-MISC ChangeLog 870 RMD160 16ab53531b052cafd3b911e0c98945b73536b160 SHA1 aca029040c945d303ed8711cccae0365062ec351 SHA256 f8dbb23c0a6775385b9122b30e4a72b7b026a4f31b06a2cbe0c96590af463369
-MISC metadata.xml 278 RMD160 f7ace47f8a64af33de752f757f84e722f3d8391c SHA1 f9b6b46eaf20e359e0acfac3b78af84b2bf10661 SHA256 3bf133a2d7d21dcf9c944babdb4a047da7d2b85b4eebe79e268f499e13a0dd63
+DIST sagan-rules-20110822.tar.gz 355802 RMD160 575b201fcc88218b1a5b153149f56a43a6ad9b27 SHA1 73a96e5c9629060a14724a98c8a80893649c2a4b SHA256 d92c5b1fdb4cdc1b371c506661387bac1ff3f73e1f72cec29e8501c3d2a330e9
+EBUILD sagan-rules-20110822.ebuild 680 RMD160 1084a913cb2026c0d865550a41783b2a7d90b549 SHA1 d2e6bf7d97aecb4e38b6af307739258225544650 SHA256 cf7e6a42230fa0f22f5eee3d07f1cb19c978ec95aa8324b4ef2a2ecc940ce580
+EBUILD sagan-rules-99999999.ebuild 662 RMD160 727d7b639e95b5d364899fef9b6a87aa64c8fe16 SHA1 f702ab25339e10a1cc6923cc76278c4c944a2608 SHA256 970e24ce7be82addf58efad7fc6f75c19ea93397f1a94cd79fee8fb4e09a9bc4
+MISC ChangeLog 1271 RMD160 f7ea8197aa3da1464f712fc7aff130d9beb233ca SHA1 32d45566ec503be7535d72e563e18dd9e4d4f93c SHA256 a206506b76d6b6499b21db62d9bb6ce07e94037f1d522c00fcf7bc0cfe3dd1f7
+MISC metadata.xml 388 RMD160 194dd16576f335eb26cf8128134cf9a47ab35033 SHA1 b0032c57f8c7459f9345af6f9df8320d000f41c3 SHA256 6f72284cff89a17f6e557233066f1ffb45617bf8d75c8c677c65b7945576ecf2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPLUXpAAoJEAmJmMX429reV5QH/3v9z9NnfC1dxQwXvOXeTL1h
-3whNtdm/Aw6GhHsDrk6YcFQqwPXFnQ+ji82edfV+SIbd2uj68YC0LneEBCk71u3n
-GaUP0Mr3mgpdo3jkiYSA/xOUWhC43DMavdSY7UqPvTzj71iD/7PY0n8mS28354U/
-agktmS8+z+rHd22nQJDMBY3V5EonOnPQ389oBclsELnrXrnLmKS9bx7Mp97bqp9e
-UHG/Bwd34gxUBryQakWT4TsbT+Q7lcOIuOLj7v3lCtOPZKW2eaFEmQuFVZ4UcQND
-XgzJMrYnkOqPaXdJNmuXHJMIfzewYD0rkRCQrYOjrSDA/PnLSSnePuXNZ/0NEvo=
-=Qu8l
+iQEcBAEBAgAGBQJPPjqKAAoJEAmJmMX429rerqkH/jBaZFNhpiJcfenJiaaVhjEf
+RPPb49bUx/lqrRB3L1KuxrCSQ9n2RyKGZnBCQMmD65N0T32vkib7d4gUllKE6rvJ
+RrcI4kSYEHKa30hewkfEeRsdyzZrMn0PVry8J1qZei6As0ubFcy23xmOQA/6+Pc+
+cCyf3PSczcDgcIOEpIW7kZVP5tpmji8F4QNDr7vBkNdM2y1DFNaWVUsevQryPt99
+w8UQycYBrOvKaVzY2Y6AL+x/OVape3BGTuZ08g4EXz5CZeQzId55dgzsB/YH8cqf
+tLg1Y+n+tT9/IghmxZnVV8SkbWbZyW2cFX6mdOl8e91Ssn9kdzY566Xv4YG5Xrg=
+=GY5i
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index 833352191f45..935e36f58d8d 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@@ -7,4 +7,7 @@
 <maintainer>
   <email>maksbotan@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name='lognorm'>Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/app-admin/sagan-rules/sagan-rules-03172011.ebuild b/app-admin/sagan-rules/sagan-rules-03172011.ebuild
deleted file mode 100644
index 9a927803beb4..000000000000
--- a/app-admin/sagan-rules/sagan-rules-03172011.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan-rules/sagan-rules-03172011.ebuild,v 1.1 2011/08/31 08:30:15 maksbotan Exp $
-
-EAPI=3
-
-DESCRIPTION="Rules for Sagan log analyzer"
-HOMEPAGE="http://sagan.softwink.com/"
-SRC_URI="http://sagan.softwink.com/rules/${P}-r1.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-PDEPEND="app-admin/sagan"
-
-S=${WORKDIR}/rules
-
-src_install() {
-	insinto /etc/sagan-rules
-	doins ./*.config
-	doins ./*rules
-}
diff --git a/app-admin/sagan-rules/sagan-rules-22082011.ebuild b/app-admin/sagan-rules/sagan-rules-20110822.ebuild
index 050822c7d1ac..445af7ec6926 100644
--- a/app-admin/sagan-rules/sagan-rules-22082011.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20110822.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan-rules/sagan-rules-22082011.ebuild,v 1.2 2011/08/31 12:00:09 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan-rules/sagan-rules-20110822.ebuild,v 1.1 2012/02/17 11:29:16 maksbotan Exp $
 
-EAPI=3
+EAPI=4
 
 DESCRIPTION="Rules for Sagan log analyzer"
 HOMEPAGE="http://sagan.softwink.com/"
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~maksbotan/sagan/sagan-rules-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+lognorm"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -23,4 +23,7 @@ src_install() {
 	insinto /etc/sagan-rules
 	doins ./*.config
 	doins ./*rules
+	if use lognorm ; then
+		doins ./*normalize.rulebase
+	fi
 }
diff --git a/app-admin/sagan-rules/sagan-rules-999999999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
index 1f7f0bdd1c6d..4b9ed68af545 100644
--- a/app-admin/sagan-rules/sagan-rules-999999999999.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan-rules/sagan-rules-999999999999.ebuild,v 1.1 2011/08/31 08:30:15 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan-rules/sagan-rules-99999999.ebuild,v 1.1 2012/02/17 11:29:16 maksbotan Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+lognorm"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -23,5 +23,9 @@ S="${WORKDIR}"/rules
 
 src_install() {
 	insinto /etc/sagan-rules
-	doins -r ./* || die
+	doins ./*.config
+	doins ./*rules
+	if use lognorm; then
+		doins ./*normalize.rulebase
+	fi
 }
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index 1831bef17e24..6758cbecac8f 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -4,17 +4,17 @@ Hash: SHA1
 AUX sagan.confd 239 RMD160 796438f167022580bf83fb95f90d2526a72e8d45 SHA1 bd1d0bc3f62c2e659467f8e5c1f83ffc64c379da SHA256 ef5a99015369648e88e32ec8325261b1bdf53900543f86b77fea5aeb6387de51
 AUX sagan.init 611 RMD160 d9441b563b3db13f906ca92090aa7134d3c790dd SHA1 e7accaaadf4a796ce09cc8b0ea2b70fee124df28 SHA256 7a9d6129d5225a25c1d5dc83675d9ce456b71d22cb9b7920b1b2b7742be02d34
 DIST sagan-0.2.0.tar.gz 329728 RMD160 5115728dd5901310289eb7562bbe0370c5512e74 SHA1 07a0beb7e7cbd40c3c9190f07bce38c4664e4323 SHA256 cda2d1e4c0e93403469d21af672957302eabebade346a1f67036ae7427f3e399
-EBUILD sagan-0.2.0.ebuild 2152 RMD160 cda0edb47e6fc032cd69aa3f77b22eb44fe04a9b SHA1 dddc9f3bd22b373c36e779b5bf8c99535a4a784f SHA256 2756cd1376f23b600abeb7d2437a41c5a481f31335ae65dad89feefb5a51748a
-MISC ChangeLog 541 RMD160 cb49ad762718b7b15ae56567a08200f75e098765 SHA1 c486d988f206b67dcc2712b36f29045906888ea9 SHA256 8129d36068ecace35835f2571dd4f6bc2e1fdb224b9eeba905f2572398786752
+EBUILD sagan-0.2.0-r1.ebuild 2165 RMD160 0a5bd43a84a024eb549887b4a8bd90ddab2a8fbd SHA1 5df370c731f5cbadcfeef69b2ff7a1b717464621 SHA256 da667210b3ff8e20418c814f179d4d283cb9b14dfa011a61ab11ed61a5945636
+MISC ChangeLog 727 RMD160 cfdbef94bb415c255b9434484002991bfac787ce SHA1 7c3e030dd34ef3d50cf851a0974408ae4ef6c96d SHA256 d754da3d28968e2bfdb75eef3c4cc74aed9f88630db4dad871204bccc48e442c
 MISC metadata.xml 630 RMD160 7be66a77cd26b84fbeeb569f737a6510c570d774 SHA1 9d60541e8b8167e39c9da3a912c7c3b24f215a65 SHA256 bc0c7a590726478d244df074ca8e1e6045cb64b24d6a50be340abd2366ca0c03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPLUW+AAoJEAmJmMX429re3cwH/jXLrzoNgGmTQJn88g19b5Ns
-hb76wwawfZ8rrVoDRMk3xxd0dEyDS1tdtr4MmE98YIg3kNdW3y3WRi+9z+GjPDRB
-42eiHKDSpXaGiCp7ZLPTiwgUbkZuqEGK55Bcag6Kirrh6n3Kqqy4VN99u8iHvpKn
-Y9PZrrAjMR4qsMvWV//f7UPVCk52uaVYx6agVnvkRZTUGUrnMh/3a2ENTWDltv1x
-GOct6EAKZ2kX7bmUOecoPzdP51ptKHCZetDAaF7NTEbRQ1FsK2RCtDRKRrdNVM/m
-eFxGaLlrtofSipfuGpd2yF/AtDev3LMi7BLJfZWlZooJziprmm2eyNfmLrgYSV4=
-=Q2ko
+iQEcBAEBAgAGBQJPPjsqAAoJEAmJmMX429reB10IALVYQmOQPPrX48QBqGeuxJjy
+YGA01WOUz1Hx73b7EuvnwVvEh3Y3jlZrCJ1A6r55OHLaUXqP6C8i+2C+hdMkNAQE
+3rPYKV5RwESLV/cX8vqNWYy3GFix1Ewe8l38uEXMz48h1B2JxiEQ5qpfBBvdsHYE
+1gQf+fJNsLaQ3tPOt9+N2hWP0L41GkK9mABOiixk57ZECBNZikLlTZk0HeQQehiu
+fvkkMfD8e/RW7PVf5LWJ5iPeRuWAsu2J21wL7BD4idiqoguR0vnEQZjEOvRQXqqF
+apbJjBryEavlkze22UAEeUzAclE2SlK77mhe+rIfP2wIrjdwfKXcSFKZpytnFf4=
+=9WbA
 -----END PGP SIGNATURE-----