merge with upstream policy

(Portage version: 2.0.51-r15)

5 files changed, 13 insertions, 16 deletions

diff --git a/sec-policy/selinux-dante/ChangeLog b/sec-policy/selinux-dante/ChangeLog
index 146375bfc054..bf56afd7ef80 100644
--- a/sec-policy/selinux-dante/ChangeLog
+++ b/sec-policy/selinux-dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dante
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/ChangeLog,v 1.6 2005/02/06 17:16:35 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/ChangeLog,v 1.7 2005/02/25 07:45:46 kaiowas Exp $
+
+*selinux-dante-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-dante-20041208.ebuild, +selinux-dante-20050219.ebuild:
+  merge with upstream policy
 
   06 Feb 2005; petre rodan <kaiowas@gentoo.org>
   selinux-dante-20050201.ebuild:
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 118cd187bde1..4674303c54ac 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fc5c5b34e10a4f8bac0fa9a02d5de14b ChangeLog 1018
 MD5 e1b947f12fa0217caa27c676ae302b41 metadata.xml 550
+MD5 0103d8a5a513309f51ef7b76b7ddbc31 selinux-dante-20050219.ebuild 315
 MD5 7d6cdb3c2cb4b6e88230fe9c5cded226 selinux-dante-20050201.ebuild 424
-MD5 12564ac897c47ea4d96e82d5a414e1e0 selinux-dante-20041208.ebuild 424
+MD5 44e943b5d12d958474c2b6da6ebefa82 files/digest-selinux-dante-20050219 72
 MD5 ef65e9c0e22e4ec6f52cf584afd8234f files/digest-selinux-dante-20050201 72
-MD5 17c55dc464fd76aefa5a567fc583725f files/digest-selinux-dante-20041208 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCBlDRGSBEIeh4AEYRApvSAJ9K7zXCiNYIv3sShhDlooHf+ZxkjACfVciC
-bVndql2iF7xhPDs8d4Ks0dE=
-=CdX+
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-dante/files/digest-selinux-dante-20041208 b/sec-policy/selinux-dante/files/digest-selinux-dante-20041208
deleted file mode 100644
index e87933290b2c..000000000000
--- a/sec-policy/selinux-dante/files/digest-selinux-dante-20041208
+++ /dev/null
@@ -1 +0,0 @@
-MD5 797fef9a18a1ebe77fd77b1775570695 selinux-dante-20041208.tar.bz2 591
diff --git a/sec-policy/selinux-dante/files/digest-selinux-dante-20050219 b/sec-policy/selinux-dante/files/digest-selinux-dante-20050219
new file mode 100644
index 000000000000..c5481f8b83c9
--- /dev/null
+++ b/sec-policy/selinux-dante/files/digest-selinux-dante-20050219
@@ -0,0 +1 @@
+MD5 58b144f026ba3ac111ae0ee006a0c535 selinux-dante-20050219.tar.bz2 595
diff --git a/sec-policy/selinux-dante/selinux-dante-20041208.ebuild b/sec-policy/selinux-dante/selinux-dante-20050219.ebuild
index bee3185d9af6..f595480213e1 100644
--- a/sec-policy/selinux-dante/selinux-dante-20041208.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-20050219.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-dante/selinux-dante-20041208.ebuild,v 1.2 2005/01/20 09:17:28 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/selinux-dante-20050219.ebuild,v 1.1 2005/02/25 07:45:46 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="dante.te"
 FCFILES="dante.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for dante (free socks4,5 and msproxy implementation)"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"