merge with upstream, added mips arch

Package-Manager: portage-2.0.52-r1

5 files changed, 12 insertions, 16 deletions

diff --git a/sec-policy/selinux-cyrus-sasl/ChangeLog b/sec-policy/selinux-cyrus-sasl/ChangeLog
index e832ad27a184..b6308fa647d5 100644
--- a/sec-policy/selinux-cyrus-sasl/ChangeLog
+++ b/sec-policy/selinux-cyrus-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cyrus-sasl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyrus-sasl/ChangeLog,v 1.1 2005/06/26 18:18:23 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyrus-sasl/ChangeLog,v 1.2 2005/09/18 09:56:24 kaiowas Exp $
+
+*selinux-cyrus-sasl-20050918 (18 Sep 2005)
+
+  18 Sep 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-cyrus-sasl-20050605.ebuild, +selinux-cyrus-sasl-20050918.ebuild:
+  merge with upstream, added mips arch
 
 *selinux-cyrus-sasl-20050605 (26 Jun 2005)
 
diff --git a/sec-policy/selinux-cyrus-sasl/Manifest b/sec-policy/selinux-cyrus-sasl/Manifest
index e81f96315f06..86a69d7a1550 100644
--- a/sec-policy/selinux-cyrus-sasl/Manifest
+++ b/sec-policy/selinux-cyrus-sasl/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4904793998e374f3683edea61261e39f ChangeLog 396
 MD5 fe0e5490a8062491c5c9e96cb16becda metadata.xml 512
-MD5 727cdf0e7478bf9fa50771949f4b45c3 selinux-cyrus-sasl-20050605.ebuild 408
-MD5 92c17b27383194b9f0cb8fd0edf5c890 files/digest-selinux-cyrus-sasl-20050605 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCvu8kGSBEIeh4AEYRAj10AJwMOlYmQezJM6l2fxKD0ImcSCy6VACfdSkK
-OCaTA67LULx0f8SpJwRDaxY=
-=Sb0g
------END PGP SIGNATURE-----
+MD5 f2b46900fea4f0c8482559318a874e40 selinux-cyrus-sasl-20050918.ebuild 291
+MD5 637924f46dd19d5b9e07e754465e9f28 files/digest-selinux-cyrus-sasl-20050918 77
diff --git a/sec-policy/selinux-cyrus-sasl/files/digest-selinux-cyrus-sasl-20050605 b/sec-policy/selinux-cyrus-sasl/files/digest-selinux-cyrus-sasl-20050605
deleted file mode 100644
index 8d1fae2567c3..000000000000
--- a/sec-policy/selinux-cyrus-sasl/files/digest-selinux-cyrus-sasl-20050605
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e6d616e629fc0d160ff61b19db08d67 selinux-cyrus-sasl-20050605.tar.bz2 643
diff --git a/sec-policy/selinux-cyrus-sasl/files/digest-selinux-cyrus-sasl-20050918 b/sec-policy/selinux-cyrus-sasl/files/digest-selinux-cyrus-sasl-20050918
new file mode 100644
index 000000000000..8cebc56c00c2
--- /dev/null
+++ b/sec-policy/selinux-cyrus-sasl/files/digest-selinux-cyrus-sasl-20050918
@@ -0,0 +1 @@
+MD5 b277aee04dad9a4493c1d6572ea78545 selinux-cyrus-sasl-20050918.tar.bz2 741
diff --git a/sec-policy/selinux-cyrus-sasl/selinux-cyrus-sasl-20050605.ebuild b/sec-policy/selinux-cyrus-sasl/selinux-cyrus-sasl-20050918.ebuild
index 6266e3bd19fc..76b4e0721a64 100644
--- a/sec-policy/selinux-cyrus-sasl/selinux-cyrus-sasl-20050605.ebuild
+++ b/sec-policy/selinux-cyrus-sasl/selinux-cyrus-sasl-20050918.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-cyrus-sasl/selinux-cyrus-sasl-20050605.ebuild,v 1.1 2005/06/26 18:18:23 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyrus-sasl/selinux-cyrus-sasl-20050918.ebuild,v 1.1 2005/09/18 09:56:24 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -10,5 +10,5 @@ IUSE=""
 
 DESCRIPTION="SELinux policy for cyrus-sasl"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"