merge with upstream, added mips arch

(Portage version: 2.0.52-r1)

5 files changed, 13 insertions, 17 deletions

diff --git a/sec-policy/selinux-postfix/ChangeLog b/sec-policy/selinux-postfix/ChangeLog
index 39d4cbf7bd2d..09aabc894cea 100644
--- a/sec-policy/selinux-postfix/ChangeLog
+++ b/sec-policy/selinux-postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postfix
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.13 2005/06/26 17:21:44 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.14 2005/09/18 09:50:06 kaiowas Exp $
+
+*selinux-postfix-20050918 (18 Sep 2005)
+
+  18 Sep 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-postfix-20050417.ebuild, +selinux-postfix-20050918.ebuild:
+  merge with upstream, added mips arch
 
   26 Jun 2005; petre rodan <kaiowas@gentoo.org>
   selinux-postfix-20050626.ebuild:
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index d16430ce6e95..16000a83ee7f 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 45679a930dd3d49705c75eed77688242 ChangeLog 2076
 MD5 0b8ee728a701b048ddb9e62d6c08ee02 metadata.xml 381
+MD5 deaf670aa7a00980fe29f5a0088a758d selinux-postfix-20050918.ebuild 336
 MD5 f3536cb10b1215d47b738b610d9051bb selinux-postfix-20050626.ebuild 443
-MD5 7d52576b835f4134f52091be7bed6f5c selinux-postfix-20050417.ebuild 443
 MD5 edd7e11886832ae8aee23051086b3a5a files/digest-selinux-postfix-20050626 75
-MD5 4de62eaec2f45d21044b57be2af0d28a files/digest-selinux-postfix-20050417 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCvsdsGSBEIeh4AEYRAiEVAJ9R4n3hxEftmSqdd3nOfMoUFxedmQCfdjgX
-HH3tAyiQ6JM6DXYNoBF3isk=
-=CUab
------END PGP SIGNATURE-----
+MD5 69c47f8c726cb5c59d4572facb700d68 files/digest-selinux-postfix-20050918 75
diff --git a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050417 b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050417
deleted file mode 100644
index 4510f3f34283..000000000000
--- a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050417
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c89ab23bc3d215aa5d5209e08b5076cb selinux-postfix-20050417.tar.bz2 3433
diff --git a/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050918 b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050918
new file mode 100644
index 000000000000..9dc243210e25
--- /dev/null
+++ b/sec-policy/selinux-postfix/files/digest-selinux-postfix-20050918
@@ -0,0 +1 @@
+MD5 ecad33d04b35f1bc41dbe2d7c8a3a587 selinux-postfix-20050918.tar.bz2 3480
diff --git a/sec-policy/selinux-postfix/selinux-postfix-20050417.ebuild b/sec-policy/selinux-postfix/selinux-postfix-20050918.ebuild
index 2ef8e7809906..16b67c8c2947 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-20050417.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-20050918.ebuild
@@ -1,15 +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-postfix/selinux-postfix-20050417.ebuild,v 1.2 2005/04/23 18:53:48 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-20050918.ebuild,v 1.1 2005/09/18 09:50:06 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="postfix.te"
 FCFILES="postfix.fc"
 IUSE=""
-RDEPEND=">=sec-policy/selinux-base-policy-20050224"
+RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for postfix"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"