removed old builds, merge with upstream policy

(Portage version: 2.0.51-r15)

7 files changed, 13 insertions, 33 deletions

diff --git a/sec-policy/selinux-gnupg/ChangeLog b/sec-policy/selinux-gnupg/ChangeLog
index d14252969bad..eb3b4705d712 100644
--- a/sec-policy/selinux-gnupg/ChangeLog
+++ b/sec-policy/selinux-gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-gnupg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.5 2005/01/20 10:31:03 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.6 2005/02/25 07:57:25 kaiowas Exp $
+
+*selinux-gnupg-20050219 (25 Feb 2005)
+
+  25 Feb 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-gnupg-20041109.ebuild, -selinux-gnupg-20050119.ebuild,
+  +selinux-gnupg-20050219.ebuild:
+  removed old builds, merge with upstream policy
 
 *selinux-gnupg-20050119 (20 Jan 2005)
 
diff --git a/sec-policy/selinux-gnupg/Manifest b/sec-policy/selinux-gnupg/Manifest
index 5d8d3f77bce5..66be31346a29 100644
--- a/sec-policy/selinux-gnupg/Manifest
+++ b/sec-policy/selinux-gnupg/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4c742f59362306c35320e46359aa6a4e ChangeLog 924
 MD5 ead6a56acfba29bb5e0b072575e0c83d metadata.xml 383
+MD5 1caa4a3f5f02937000b1ef8fcc5f5a6f selinux-gnupg-20050219.ebuild 355
 MD5 ccaf53b93f11f24488aea5fff26fed74 selinux-gnupg-20041120.ebuild 412
-MD5 57dcddc7a0bba68bdbda9a56d95262c4 selinux-gnupg-20041109.ebuild 412
-MD5 05bece1d52bc3ca1342a361f71fbdb95 selinux-gnupg-20050119.ebuild 416
+MD5 82b6a02e8207eb676edf956e40cb3193 files/digest-selinux-gnupg-20050219 73
 MD5 51414e8b6c8cc0305e3268b5419e86eb files/digest-selinux-gnupg-20041120 73
-MD5 85659b1ffa22c0704e3f1362d0dc6c34 files/digest-selinux-gnupg-20041109 73
-MD5 a13d83e7ef7832aa15f699335ede71ab files/digest-selinux-gnupg-20050119 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB7331GSBEIeh4AEYRAp7eAKCGJVA471+w6vbMWqWLGP06PC3uZACfbUic
-6FluJfg/Yx8KPA42JqCLrX4=
-=Wce+
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041109 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041109
deleted file mode 100644
index ed6c187fcc37..000000000000
--- a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20041109
+++ /dev/null
@@ -1 +0,0 @@
-MD5 092598702d0ca4126712384026552bc9 selinux-gnupg-20041109.tar.bz2 2666
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050119 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050119
deleted file mode 100644
index e5c1579838f6..000000000000
--- a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050119
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b66e4f8dab18bc726f6c6a2e4777b17 selinux-gnupg-20050119.tar.bz2 2948
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050219 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050219
new file mode 100644
index 000000000000..b8e18e51f6d6
--- /dev/null
+++ b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050219
@@ -0,0 +1 @@
+MD5 8de31268847afcf5dad43b2fbf8c4ebd selinux-gnupg-20050219.tar.bz2 2936
diff --git a/sec-policy/selinux-gnupg/selinux-gnupg-20041109.ebuild b/sec-policy/selinux-gnupg/selinux-gnupg-20041109.ebuild
deleted file mode 100644
index 5f1aec33edf8..000000000000
--- a/sec-policy/selinux-gnupg/selinux-gnupg-20041109.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/selinux-gnupg-20041109.ebuild,v 1.2 2005/01/20 09:23:33 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="gpg.te"
-FCFILES="gpg.fc"
-MACROS="gpg_macros.te"
-IUSE=""
-
-DESCRIPTION="SELinux policy for GNU privacy guard"
-
-KEYWORDS="x86 ppc sparc amd64"
-
diff --git a/sec-policy/selinux-gnupg/selinux-gnupg-20050119.ebuild b/sec-policy/selinux-gnupg/selinux-gnupg-20050219.ebuild
index c4f09cbe2f00..c31f82ca32ba 100644
--- a/sec-policy/selinux-gnupg/selinux-gnupg-20050119.ebuild
+++ b/sec-policy/selinux-gnupg/selinux-gnupg-20050219.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-gnupg/selinux-gnupg-20050119.ebuild,v 1.1 2005/01/20 10:31:03 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/selinux-gnupg-20050219.ebuild,v 1.1 2005/02/25 07:57:25 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -8,6 +8,7 @@ TEFILES="gpg.te"
 FCFILES="gpg.fc"
 MACROS="gpg_macros.te"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for GNU privacy guard"