merge with upstream

Package-Manager: portage-2.0.51.22-r1

5 files changed, 8 insertions, 27 deletions

diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 303bb64540f3..a66cb431ed68 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 730dac3c866ab68b49dfc8832552c5cd ChangeLog 930
 MD5 a6b87455345059b8524871b4023efe74 metadata.xml 391
 MD5 0009c455fcab94ae6bf573605e69753d selinux-snort-20050219.ebuild 433
-MD5 a47f0793b44baa3aaf8734fd5590242b selinux-snort-20041117.ebuild 381
+MD5 85239f75e1048df30ed898944360f5e4 selinux-snort-20050605.ebuild 437
 MD5 3207d2b60a2b861295eef18c487f5887 files/digest-selinux-snort-20050219 72
-MD5 2a7e7436c2c1d4917a2fe49886fef0b1 files/digest-selinux-snort-20041117 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCQR9KGSBEIeh4AEYRAq0OAJ0QPH8uRsUpZ8oPUAaww7s7bAML5wCfQSfk
-u+er6gkLMNdSZZzhMPExPJ4=
-=l9YV
------END PGP SIGNATURE-----
+MD5 a49b08e6d10b1a63ad67026b36b9bc1c files/digest-selinux-snort-20050605 72
diff --git a/sec-policy/selinux-snort/files/digest-selinux-snort-20041117 b/sec-policy/selinux-snort/files/digest-selinux-snort-20041117
deleted file mode 100644
index 1631648db752..000000000000
--- a/sec-policy/selinux-snort/files/digest-selinux-snort-20041117
+++ /dev/null
@@ -1 +0,0 @@
-MD5 288701b5b3a8379d499e89cba8ffeeca selinux-snort-20041117.tar.bz2 728
diff --git a/sec-policy/selinux-snort/files/digest-selinux-snort-20050605 b/sec-policy/selinux-snort/files/digest-selinux-snort-20050605
new file mode 100644
index 000000000000..938f5f9f1657
--- /dev/null
+++ b/sec-policy/selinux-snort/files/digest-selinux-snort-20050605
@@ -0,0 +1 @@
+MD5 d76f87ff9dbc0a451092d0b1dd62e27e selinux-snort-20050605.tar.bz2 737
diff --git a/sec-policy/selinux-snort/selinux-snort-20041117.ebuild b/sec-policy/selinux-snort/selinux-snort-20050605.ebuild
index 7656bec3c5ce..facf36014afb 100644
--- a/sec-policy/selinux-snort/selinux-snort-20041117.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-20050605.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-20041117.ebuild,v 1.3 2005/02/25 08:27:09 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-20050605.ebuild,v 1.1 2005/06/26 17:38:15 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="snort.te"
 FCFILES="snort.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for snort"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 2c44ce13855a..e51532cc0311 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 db350d2d4525dda1c66222a33ce33c93 ChangeLog 1790
+MD5 e2e6ac50f56c615f306349207f11e757 ChangeLog 1894
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
 MD5 18080462affd3a3fc122c8b13a59d3c0 selinux-spamassassin-20050219.ebuild 536
-MD5 fca5f78526aff65a09111c2b150f40c8 selinux-spamassassin-20050626.ebuild 540
+MD5 0f813c63b3adc92c932f286b878f4ba1 selinux-spamassassin-20050626.ebuild 536
 MD5 7e66aa08556496f9ffdc252678e1d499 files/digest-selinux-spamassassin-20050219 80
 MD5 d0146c7441c2c356fa69f0c0373696a0 files/digest-selinux-spamassassin-20050626 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCvpuMGSBEIeh4AEYRAqpPAJ9b7OmQgyknfD7W+pwgS90TjVDp/gCfeTEj
-TSAo6ykPnCCE6WqhGllgdIw=
-=Brqh
------END PGP SIGNATURE-----