Drop unused local desc, eapi4.

Package-Manager: portage-2.2.0_alpha52/cvs/Linux x86_64

4 files changed, 30 insertions, 26 deletions

diff --git a/www-apache/modsecurity-crs/ChangeLog b/www-apache/modsecurity-crs/ChangeLog
index 36c95ed8be20..8fc5f6b22ee2 100644
--- a/www-apache/modsecurity-crs/ChangeLog
+++ b/www-apache/modsecurity-crs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/modsecurity-crs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.9 2011/04/19 05:19:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/ChangeLog,v 1.10 2011/09/03 09:05:04 scarabeus Exp $
+
+  03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  modsecurity-crs-2.1.2.ebuild, metadata.xml:
+  Drop unused local desc, eapi4.
 
   19 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   -modsecurity-crs-2.0.8.ebuild, -modsecurity-crs-2.0.10.ebuild,
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 066597dddf5f..71aa63c9617f 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -2,13 +2,23 @@
 Hash: SHA1
 
 DIST modsecurity-crs_2.1.2.tar.gz 173951 RMD160 4c4b23388e0455afb12cd0eed8d8d01bf5ca9392 SHA1 206bcb2392477187696efbad788cd86e722303db SHA256 78216d659b13dc18ab25bd6e01d58e5b636edf6a20666629f462e2fabea068a7
-EBUILD modsecurity-crs-2.1.2.ebuild 2160 RMD160 cbff0bceeb6edd7463e59decd4a494a10067ea37 SHA1 eb6e4fc12e8497ed788c1bff5bf2947e5d636c37 SHA256 74e7ccb998b266f04998769e773cb643652a7acf2af720d10198a0d4ee7bd2fc
-MISC ChangeLog 1675 RMD160 e47d23c329958c0001bbbe2380de01ed5617e440 SHA1 bde978435dd198124b1c2b80df6a17c7f257ab04 SHA256 4a11fa03ede5ac91f6146386d64c9a8598afa456a01d778365bdaf6284cd98a8
-MISC metadata.xml 663 RMD160 86ce5a300643284f72a5c9a657f6946163e23e44 SHA1 6b9a9355f552f3c869a1b00ad8586b77a132cf16 SHA256 aceb77ecf1564c16e052cfb222a508649ffe176ed6745d13a22d2b1a2cceae45
+EBUILD modsecurity-crs-2.1.2.ebuild 2118 RMD160 9dafd9a844cc3f924b1b76d31f551a50f3d555ea SHA1 c506c19fb9ebc259ecac410f02978ba2683dfc5f SHA256 780d1d755026fe23d0756e6951ecba89bb3547455dae04532382ccf24373875b
+MISC ChangeLog 1811 RMD160 a4f57b612ab705133450b485e5a90b43abe0c2be SHA1 b868f87daa9b32216eca10d56bfd1c7a6c633e52 SHA256 e79882bd2aff0430d2a09bc86d59efddd01df8455a72e624652908b5317c7986
+MISC metadata.xml 267 RMD160 511ac4eac08cf7c7598b7f0dd2c2a7b54b2a6d17 SHA1 7cfd482a8ab9b30e3e424c19cfef49ccc93013c8 SHA256 0c11886362b779764fbeda77806037b3625b1c11375b7ecc1b7ad3e20ec6a1ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2tG1YACgkQAiZjviIA2XhFUgCfVygDz7Uikd3btE6+lDEQU3v6
-6DgAn0Olt+k6EfBi0VAnyA0Y7Tqv80Yb
-=0Rc+
+iQIcBAEBAgAGBQJOYe3MAAoJEOSiRoyO7jvoCygP/1PVqQX3+D+k8jJ4PHL8R8Eq
+x0FA2HqS/sYb8CbzPdopJU0Ke0e1yfuvOdsg3yfEzYdKLtVm7d2TL8bjCnWPOXE0
+Jd/qWyaC4xHX0hoMk093zKqTvRFAEQOsdpqHKtLp+J3QDiaaxlJIFXqvLv+vYCdG
+Arl0Q32fm0B4AzHk+YHq0+0Y3Oba8vDYdaEsXxcYGYtnlipweZVWObNwZ08zf3Lw
+HTAk4Wk5GJgcHAYX8L4PVgZqfyYM2jQCjlbK5NBDpNFe8pHIKg8FMh9XIXBhBF1d
+lbAkfLMDUaPOLFVX5RFSls2mDe6qBZqaXBacYlxG764J2TixY1v3aFmv/33K2Wmd
+X+w5ZINpFXmH8xMgHb1d8zMcsAS+guCvCbohrxkzAu5dNWGZyTr/mtQFfGULeoK/
+PBCkzgBODiWScXD2jlSX7ggqqknMofG4L2MSpmlhaUREl2LPpXJ//khS2csRexsk
+eW8XhlKiUEeSWdWYWtQ5xy7h4MsV75cx5GpdpluzJU0ot0m+Zqa1ClP3zGGznqk6
+l+CgU57ua+QG8kuNb++FGxRxtRyT9AP50769pJBmU2w+fjRL9TdX/ZWIxHRMykhZ
+6A4iradVvJjl75t35Hz7TzLO2T2ozrbb/jqW1aOu3216LytB3mE7/RY0HEFyEqW5
+09gc9Af/mvqzR1V+4Fga
+=anQ6
 -----END PGP SIGNATURE-----
diff --git a/www-apache/modsecurity-crs/metadata.xml b/www-apache/modsecurity-crs/metadata.xml
index 72bb6448ac19..51450645398c 100644
--- a/www-apache/modsecurity-crs/metadata.xml
+++ b/www-apache/modsecurity-crs/metadata.xml
@@ -6,14 +6,4 @@
     <email>flameeyes@gentoo.org</email>
     <name>Diego E. Pettenò</name>
   </maintainer>
-  <use>
-    <flag name="vanilla">
-      Provide the original ModSecurity Core Rule Set without
-      Gentoo-specific relaxation. When this flag is enabled, we
-      install the unadulterated Core Rule Set. Warning! The original
-      Core Rule Set is draconic and most likely will break your web
-      applications, including Rails-based web applications and
-      Bugzilla.
-    </flag>
-  </use>
 </pkgmetadata>
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.1.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.1.2.ebuild
index 01277b293b49..9ec92f4b40ce 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-2.1.2.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-2.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/modsecurity-crs-2.1.2.ebuild,v 1.2 2011/03/24 14:58:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/modsecurity-crs/modsecurity-crs-2.1.2.ebuild,v 1.3 2011/09/03 09:05:04 scarabeus Exp $
 
-EAPI=2
+EAPI=4
 
 DESCRIPTION="Core Rule Set for ModSecurity"
 HOMEPAGE="http://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project"
@@ -21,16 +21,16 @@ S="${WORKDIR}/${PN}_${PV}"
 RULESDIR=/etc/modsecurity
 
 src_install() {
-	insinto "${RULESDIR}"/base_rules || die
-	doins base_rules/* || die
+	insinto "${RULESDIR}"/base_rules
+	doins base_rules/*
 
 	insinto "${RULESDIR}"/optional_rules
-	doins optional_rules/* || die
+	doins optional_rules/*
 
 	insinto "${RULESDIR}"/experimental_rules
-	doins experimental_rules/* || die
+	doins experimental_rules/*
 
-	dodoc CHANGELOG README || die
+	dodoc CHANGELOG README
 
 	(
 		cat - <<EOF
@@ -55,7 +55,7 @@ EOF
 	) > "${T}"/"80_${PN}.conf"
 
 	insinto /etc/apache2/modules.d/
-	doins "${T}"/"80_${PN}.conf" || die
+	doins "${T}"/"80_${PN}.conf"
 }
 
 pkg_postinst() {