removed old build, merge with upstream

(Portage version: 2.0.51-r15)

6 files changed, 17 insertions, 20 deletions

diff --git a/sec-policy/selinux-procmail/ChangeLog b/sec-policy/selinux-procmail/ChangeLog
index c6e3880bcabb..c35820b4c876 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.4 2004/11/23 17:14:30 kaiowas Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.5 2005/02/25 08:18:04 kaiowas Exp $
+
+*selinux-procmail-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-procmail-20041028.ebuild, +selinux-procmail-20050219.ebuild:
+  removed old build, merge with upstream
 
   23 Nov 2004; petre rodan <kaiowas@gentoo.org>
   selinux-procmail-20041119.ebuild:
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 55e9afc8295e..c0e007d04884 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2399913bb6a13414600128b7d9c1fc2b ChangeLog 665
 MD5 df50b670def71c1790352df31ff8c44f metadata.xml 303
+MD5 97e804d0ebc9719e9dc14d92f7e99a83 selinux-procmail-20050219.ebuild 333
 MD5 4105ea4ee3e5b6d4fa901e08060100a1 selinux-procmail-20041119.ebuild 396
-MD5 4c9ebd8ffd97af2f4abd32ddca26a742 selinux-procmail-20041028.ebuild 396
+MD5 7016674e43e74e32bc7e8a1ec2ef8110 files/digest-selinux-procmail-20050219 76
 MD5 0e8d168c7687fc4d6f91e92c3c2fa64c files/digest-selinux-procmail-20041119 76
-MD5 c3b9b7fa9b6e7c9bb05020e7246e8396 files/digest-selinux-procmail-20041028 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo235GSBEIeh4AEYRAuwSAJwLByvgiFfkxEIMO7Ki8ilGKLNH3ACfeA/j
-3Ab/vZp7yqB3nqlCyjkUsxY=
-=p0dn
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041028 b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041028
deleted file mode 100644
index cf125f636b6a..000000000000
--- a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20041028
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6444a1ebf1cf3f71c5d3da5e76743cc selinux-procmail-20041028.tar.bz2 1088
diff --git a/sec-policy/selinux-procmail/files/digest-selinux-procmail-20050219 b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20050219
new file mode 100644
index 000000000000..d565dbf09557
--- /dev/null
+++ b/sec-policy/selinux-procmail/files/digest-selinux-procmail-20050219
@@ -0,0 +1 @@
+MD5 051e01d44726347cf2e4478585c57dfe selinux-procmail-20050219.tar.bz2 1110
diff --git a/sec-policy/selinux-procmail/selinux-procmail-20041119.ebuild b/sec-policy/selinux-procmail/selinux-procmail-20041119.ebuild
index b70354795679..ca07db198ab1 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-20041119.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-20041119.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2 2004/11/23 17:14:30 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-20041119.ebuild,v 1.3 2005/02/25 08:18:04 kaiowas Exp $
 
 inherit selinux-policy
 
diff --git a/sec-policy/selinux-procmail/selinux-procmail-20041028.ebuild b/sec-policy/selinux-procmail/selinux-procmail-20050219.ebuild
index 366a1cf92e1b..f9ad93e8d404 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-20041028.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-20050219.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-20041028.ebuild,v 1.1 2004/11/13 20:04:32 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-20050219.ebuild,v 1.1 2005/02/25 08:18:04 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"