we have upstream now, so merge with it

Package-Manager: portage-2.0.51.19

5 files changed, 16 insertions, 10 deletions

diff --git a/sec-policy/selinux-ucspi-tcp/ChangeLog b/sec-policy/selinux-ucspi-tcp/ChangeLog
index 71117579ca86..097d5ede7fce 100644
--- a/sec-policy/selinux-ucspi-tcp/ChangeLog
+++ b/sec-policy/selinux-ucspi-tcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ucspi-tcp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspi-tcp/ChangeLog,v 1.8 2005/01/20 09:55:55 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspi-tcp/ChangeLog,v 1.9 2005/04/23 19:21:07 kaiowas Exp $
+
+*selinux-ucspi-tcp-20050316 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-ucspi-tcp-20041111.ebuild, +selinux-ucspi-tcp-20050316.ebuild:
+  we have upstream now, so merge with it
 
   20 Jan 2005; petre rodan <kaiowas@gentoo.org>
   selinux-ucspi-tcp-20041211.ebuild:
diff --git a/sec-policy/selinux-ucspi-tcp/Manifest b/sec-policy/selinux-ucspi-tcp/Manifest
index 55faaf5871d5..8c82e1212486 100644
--- a/sec-policy/selinux-ucspi-tcp/Manifest
+++ b/sec-policy/selinux-ucspi-tcp/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cb17334b88ce5b0f00d487805aef7efd ChangeLog 745
+MD5 4ffc64ca3afd05788de74f7f41d8ed65 ChangeLog 952
 MD5 f4d91f7617ad4c2a053060b0105e726d metadata.xml 549
+MD5 d9e51850c7088e04196c98321606bf73 selinux-ucspi-tcp-20050316.ebuild 405
 MD5 6d2ebc45bf4e9df44541ac5a8915361c selinux-ucspi-tcp-20041211.ebuild 401
-MD5 d735c57aafc6052c2994e9af07ee3760 selinux-ucspi-tcp-20041111.ebuild 401
+MD5 56328a8a5a770aaff2bf878513e95a68 files/digest-selinux-ucspi-tcp-20050316 76
 MD5 e8f3cc9a60eb09190f15cd32b5100cfa files/digest-selinux-ucspi-tcp-20041211 76
-MD5 ae5e0e5f0b8c77c03955315df16eaf80 files/digest-selinux-ucspi-tcp-20041111 76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB73jwGSBEIeh4AEYRAmWXAJsHJDn45hSiLk92NqrDZQt4zwGCWQCfYcAd
-NHk2FowdT6gnPDLDx40l9ow=
-=DKg/
+iD8DBQFCapYdGSBEIeh4AEYRAoR2AJ9CnIkf34u4z8nfBDwbzACijBsZrwCfT9zH
+c4O+0s/6jFZ/HeyjqNa9g5s=
+=Yz1U
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ucspi-tcp/files/digest-selinux-ucspi-tcp-20041111 b/sec-policy/selinux-ucspi-tcp/files/digest-selinux-ucspi-tcp-20041111
deleted file mode 100644
index 12ca44d437ab..000000000000
--- a/sec-policy/selinux-ucspi-tcp/files/digest-selinux-ucspi-tcp-20041111
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6daffbac413fcdd748988072fb975cdb selinux-ucspi-tcp-20041111.tar.bz2 666
diff --git a/sec-policy/selinux-ucspi-tcp/files/digest-selinux-ucspi-tcp-20050316 b/sec-policy/selinux-ucspi-tcp/files/digest-selinux-ucspi-tcp-20050316
new file mode 100644
index 000000000000..fd4075bf04e1
--- /dev/null
+++ b/sec-policy/selinux-ucspi-tcp/files/digest-selinux-ucspi-tcp-20050316
@@ -0,0 +1 @@
+MD5 45d698b99d0b5b5a48c9979754b7d277 selinux-ucspi-tcp-20050316.tar.bz2 812
diff --git a/sec-policy/selinux-ucspi-tcp/selinux-ucspi-tcp-20041111.ebuild b/sec-policy/selinux-ucspi-tcp/selinux-ucspi-tcp-20050316.ebuild
index 3421e4c5a275..bed35d1789f6 100644
--- a/sec-policy/selinux-ucspi-tcp/selinux-ucspi-tcp-20041111.ebuild
+++ b/sec-policy/selinux-ucspi-tcp/selinux-ucspi-tcp-20050316.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-ucspi-tcp/selinux-ucspi-tcp-20041111.ebuild,v 1.2 2005/01/20 09:55:55 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspi-tcp/selinux-ucspi-tcp-20050316.ebuild,v 1.1 2005/04/23 19:21:07 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -10,5 +10,5 @@ IUSE=""
 
 DESCRIPTION="SELinux policy for ucspi-tcp"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"