merge with upstream

(Portage version: 2.0.53_rc7)

7 files changed, 15 insertions, 36 deletions

diff --git a/sec-policy/selinux-spamassassin/ChangeLog b/sec-policy/selinux-spamassassin/ChangeLog
index 381929c78c97..7fe8c6efff99 100644
--- a/sec-policy/selinux-spamassassin/ChangeLog
+++ b/sec-policy/selinux-spamassassin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.12 2005/09/18 10:35:33 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.13 2005/11/28 09:29:16 kaiowas Exp $
+
+*selinux-spamassassin-20051124 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-spamassassin-20050219.ebuild,
+  -selinux-spamassassin-20050626.ebuild,
+  +selinux-spamassassin-20051124.ebuild:
+  merge with upstream
 
   18 Sep 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 be92119086b3..d3d1dcd4a96b 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3c660f9d14031408698e7fb19e852f39 ChangeLog 2252
+MD5 6de8adf3e2560698eda37e4209e044ed files/digest-selinux-spamassassin-20050813 80
+MD5 8d5624e8838b69e5508850fa52ed0564 files/digest-selinux-spamassassin-20051124 80
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
-MD5 6e85852bb0d62e17c582f18827ba209e selinux-spamassassin-20050219.ebuild 541
-MD5 79f4ead2ed5729e808887aa3b9785888 selinux-spamassassin-20050626.ebuild 541
 MD5 9a0e1be33c86b629ac7e002b57105806 selinux-spamassassin-20050813.ebuild 541
-MD5 7e66aa08556496f9ffdc252678e1d499 files/digest-selinux-spamassassin-20050219 80
-MD5 d0146c7441c2c356fa69f0c0373696a0 files/digest-selinux-spamassassin-20050626 80
-MD5 6de8adf3e2560698eda37e4209e044ed files/digest-selinux-spamassassin-20050813 80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDLTLcGSBEIeh4AEYRAvVLAJ0UDZ4+rhssKQPSUiIb6KLRYINX9wCeLeMx
-sgHSKrD6xNfK8n1XnUDqTjw=
-=Zc3y
------END PGP SIGNATURE-----
+MD5 fec201aac52357a58a1b04d4f5e38499 selinux-spamassassin-20051124.ebuild 419
diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050219 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050219
deleted file mode 100644
index c7aab1590797..000000000000
--- a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050219
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d52c8dcf5439b56287cc723a2a976d70 selinux-spamassassin-20050219.tar.bz2 2212
diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050626 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050626
deleted file mode 100644
index da777fc40414..000000000000
--- a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20050626
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7942018b3d97b11dbafc59644d5f6e3 selinux-spamassassin-20050626.tar.bz2 2289
diff --git a/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20051124 b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20051124
new file mode 100644
index 000000000000..73b97e02aaad
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/files/digest-selinux-spamassassin-20051124
@@ -0,0 +1 @@
+MD5 3f724226a26da48f611e58fcd4e6ca46 selinux-spamassassin-20051124.tar.bz2 2335
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild
deleted file mode 100644
index 063300a94ef7..000000000000
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-20050219.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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-20050219.ebuild,v 1.3 2005/09/18 10:35:33 kaiowas Exp $
-
-inherit selinux-policy
-
-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="amd64 mips ppc sparc x86"
-
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-20050626.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-20051124.ebuild
index 86b2f3468c3c..624c30462e0c 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-20050626.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-20051124.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-20050626.ebuild,v 1.4 2005/09/18 10:35:33 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-20051124.ebuild,v 1.1 2005/11/28 09:29:17 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -12,5 +12,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for SpamAssassin"
 
-KEYWORDS="amd64 mips ppc sparc x86"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"