merge with upstream

(Portage version: 2.0.51.19)

5 files changed, 14 insertions, 16 deletions

diff --git a/sec-policy/selinux-spamassassin/ChangeLog b/sec-policy/selinux-spamassassin/ChangeLog
index a5ccd76aa506..7c211e3601ea 100644
--- a/sec-policy/selinux-spamassassin/ChangeLog
+++ b/sec-policy/selinux-spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-spamassassin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.5 2005/03/23 08:04:41 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.6 2005/04/23 19:09:59 kaiowas Exp $
+
+*selinux-spamassassin-20050408 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-spamassassin-20041119.ebuild,
+  +selinux-spamassassin-20050408.ebuild:
+  merge with upstream
 
   23 Mar 2005; petre rodan <kaiowas@gentoo.org>
   selinux-spamassassin-20050219.ebuild:
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 7850b08b090f..fe260abeea67 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8e6a7f627661205321173e538d5ef9ee ChangeLog 980
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
 MD5 18080462affd3a3fc122c8b13a59d3c0 selinux-spamassassin-20050219.ebuild 536
-MD5 4e088bbdc738907c10dfb49d9aa2f0ad selinux-spamassassin-20041119.ebuild 484
+MD5 9e1e1976b6c35c4416412e199f8ec1e4 selinux-spamassassin-20050408.ebuild 413
 MD5 7e66aa08556496f9ffdc252678e1d499 files/digest-selinux-spamassassin-20050219 80
-MD5 a84b040682f569a6f8da4b9d5077e4d0 files/digest-selinux-spamassassin-20041119 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCQSBxGSBEIeh4AEYRAgfTAJkBA3Megq27CPB/guhwzet8S8X4GwCfcmgr
-bl2JYbliM0KeHsCVm43qhlU=
-=KZw+
------END PGP SIGNATURE-----
+MD5 542c68d9af89d77cfe154d7065e9a0bc files/digest-selinux-spamassassin-20050408 80
diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20041119 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20041119
deleted file mode 100644
index b7a6ac4a0e76..000000000000
--- a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20041119
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80e9844691ee351cb5108f0835c5fb31 selinux-spamassassin-20041119.tar.bz2 2217
diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050408 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050408
new file mode 100644
index 000000000000..ab8798e6199a
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050408
@@ -0,0 +1 @@
+MD5 778efa502db253e183f8288a0501f7a6 selinux-spamassassin-20050408.tar.bz2 2232
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-20041119.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050408.ebuild
index 339ac866d6a8..5d156cb9d33a 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-20041119.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050408.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-20041119.ebuild,v 1.2 2005/01/20 09:38:58 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-20050408.ebuild,v 1.1 2005/04/23 19:09:59 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -8,8 +8,9 @@ TEFILES="spamassassin.te spamc.te spamd.te"
 FCFILES="spamassassin.fc spamc.fc spamd.fc"
 MACROS="spamassassin_macros.te"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for SpamAssassin"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"