merge with upstream

Package-Manager: portage-2.0.53_rc7

12 files changed, 27 insertions, 52 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"
 
diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog
index 9029be990116..707afb308254 100644
--- a/sec-policy/selinux-squid/ChangeLog
+++ b/sec-policy/selinux-squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-squid
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.15 2005/10/27 19:05:06 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.16 2005/11/28 09:27:03 kaiowas Exp $
+
+*selinux-squid-20051122 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-squid-20050626.ebuild, +selinux-squid-20051122.ebuild:
+  merge with upstream
 
   27 Oct 2005; petre rodan <kaiowas@gentoo.org>
   selinux-squid-20051023.ebuild:
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 0e1eef6e6f03..828b5d752e57 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ed26beebb7d5eab994e24357fad78b47 ChangeLog 2351
-MD5 7dbb7d42e94a2a965cb04f32c3107e46 files/digest-selinux-squid-20050626 73
 MD5 ebd2fcd11864237df026c0e3e2557a3f files/digest-selinux-squid-20051023 73
+MD5 4e3bb0ea0ef8fc8e0cf89cb195b7ed66 files/digest-selinux-squid-20051122 73
 MD5 24c0cb2d4ce8da969c77f6ada1f8e60c metadata.xml 530
-MD5 002b69effed4cc7bddae576c61e46b95 selinux-squid-20050626.ebuild 433
 MD5 5fba924ebe2500671530e46faf85ee89 selinux-squid-20051023.ebuild 438
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDYSaFGSBEIeh4AEYRAsBYAJ4mbCix2X0JK7TWusOA2l79sHqtzgCghijU
-b2kmgvFAxXabOEVaNtSOZ8E=
-=R6ZX
------END PGP SIGNATURE-----
+MD5 24a50d63ab5041d9644c076c98b939b0 selinux-squid-20051122.ebuild 330
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20050626 b/sec-policy/selinux-squid/files/digest-selinux-squid-20050626
deleted file mode 100644
index f2675338c7db..000000000000
--- a/sec-policy/selinux-squid/files/digest-selinux-squid-20050626
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d016372b12cecc57666aa096d215da7f selinux-squid-20050626.tar.bz2 1288
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20051122 b/sec-policy/selinux-squid/files/digest-selinux-squid-20051122
new file mode 100644
index 000000000000..46d9751e7c68
--- /dev/null
+++ b/sec-policy/selinux-squid/files/digest-selinux-squid-20051122
@@ -0,0 +1 @@
+MD5 bba88465209800227e6701bd55d24710 selinux-squid-20051122.tar.bz2 1346
diff --git a/sec-policy/selinux-squid/selinux-squid-20050626.ebuild b/sec-policy/selinux-squid/selinux-squid-20051122.ebuild
index 38350d563d35..016b087914b9 100644
--- a/sec-policy/selinux-squid/selinux-squid-20050626.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-20051122.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-squid/selinux-squid-20050626.ebuild,v 1.1 2005/06/26 17:47:38 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20051122.ebuild,v 1.1 2005/11/28 09:27:03 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for squid"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"