merge with upstream

Package-Manager: portage-2.0.51.22-r1

6 files changed, 23 insertions, 16 deletions

diff --git a/sec-policy/selinux-procmail/ChangeLog b/sec-policy/selinux-procmail/ChangeLog
index a2c37036c29e..eeb0ced820e9 100644
--- a/sec-policy/selinux-procmail/ChangeLog
+++ b/sec-policy/selinux-procmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-procmail
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.6 2005/03/23 07:53:19 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.7 2005/06/26 17:25:12 kaiowas Exp $
+
+*selinux-procmail-20050605 (26 Jun 2005)
+
+  26 Jun 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-procmail-20041119.ebuild, +selinux-procmail-20050605.ebuild:
+  merge with upstream
 
   23 Mar 2005; petre rodan <kaiowas@gentoo.org>
   selinux-procmail-20050219.ebuild:
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 07bd6ad184a6..beab6e47d1fc 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 e421d60532515e2da46f0e0a53cbc8b8 ChangeLog 1153
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
 MD5 0dceb00eeafbb74ce563b62f0c1bac6f selinux-procmail-20050219.ebuild 448
 MD5 0e2ac8c559ad4bcae6810e9000aebf52 selinux-procmail-20050605.ebuild 452
 MD5 7016674e43e74e32bc7e8a1ec2ef8110 files/digest-selinux-procmail-20050219 76
 MD5 3d7ea69bee52893beefd68dd0dbc817a files/digest-selinux-procmail-20050605 76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCvsf2GSBEIeh4AEYRAjwZAJ9H32nRduPMsSzxxosQZwymXUSlYQCfdE6K
+IXGr48dFvySp/wQPSyXEAgw=
+=HC39
+-----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041119 b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041119
deleted file mode 100644
index a9c1dfbf34a8..000000000000
--- a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041119
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2533536a1d06637d84fba59dcf629674 selinux-procmail-20041119.tar.bz2 1113
diff --git a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20050605 b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20050605
new file mode 100644
index 000000000000..87ea03993ef4
--- /dev/null
+++ b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20050605
@@ -0,0 +1 @@
+MD5 f93ff748e21ab7464cdada3e74a4611c selinux-procmail-20050605.tar.bz2 1105
diff --git a/sec-policy/selinux-procmail/selinux-procmail-20041119.ebuild b/sec-policy/selinux-procmail/selinux-procmail-20050605.ebuild
index ca07db198ab1..843f9876ee7c 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-20041119.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-20050605.ebuild
@@ -1,14 +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-procmail/selinux-procmail-20041119.ebuild,v 1.3 2005/02/25 08:18:04 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-20050605.ebuild,v 1.1 2005/06/26 17:25:12 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="procmail.te"
 FCFILES="procmail.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for procmail"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 1985824ab777..b7a5fadc7fb8 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 433fbc58da9ecf31aa37f733f73fbfa6 ChangeLog 1378
+MD5 48f1ffbe9009e060b10a5fe07abe7fa9 ChangeLog 1474
 MD5 b99e999a2b338c63b407d5d138bab325 metadata.xml 508
-MD5 2f82176c987a191b5e1747b5ba6e11db selinux-samba-20050626.ebuild 437
+MD5 b176606d9fd7e3be569f0ffc52bdb18b selinux-samba-20050626.ebuild 433
 MD5 0ac241df6240728f4ca5f5b0f3630af4 selinux-samba-20041117.ebuild 381
 MD5 d6686ede6d739fa547533c5145fea40e files/digest-selinux-samba-20050626 73
 MD5 60147fa77df94c78722e2f6161eb1e49 files/digest-selinux-samba-20041117 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCvppFGSBEIeh4AEYRAp/VAJ91Nnmzxw6mCf+upvVgYVUOMLMslACgjsmW
-NxJt5bdaSQ6HfBpPIJcXQag=
-=BTvw
------END PGP SIGNATURE-----