merge with upstream

(Portage version: 2.0.53_rc7)

5 files changed, 13 insertions, 17 deletions

diff --git a/sec-policy/selinux-gnupg/ChangeLog b/sec-policy/selinux-gnupg/ChangeLog
index f15db2b7ca61..07002a1564b1 100644
--- a/sec-policy/selinux-gnupg/ChangeLog
+++ b/sec-policy/selinux-gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2005/09/18 10:04:26 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/ChangeLog,v 1.15 2005/11/28 09:04:44 kaiowas Exp $
+
+*selinux-gnupg-20051023 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-gnupg-20050626.ebuild, +selinux-gnupg-20051023.ebuild:
+  merge with upstream
 
   18 Sep 2005; petre rodan <kaiowas@gentoo.org>
   selinux-gnupg-20050626.ebuild, selinux-gnupg-20050823.ebuild:
diff --git a/sec-policy/selinux-gnupg/Manifest b/sec-policy/selinux-gnupg/Manifest
index 41289f889a36..eef333bff272 100644
--- a/sec-policy/selinux-gnupg/Manifest
+++ b/sec-policy/selinux-gnupg/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 29386ca787c43e0a44ad713ebea2bd04 ChangeLog 2338
+MD5 2a4ba2ffdcc7c7e2daedfe3ef3254315 files/digest-selinux-gnupg-20050823 73
+MD5 f74cc929ec1ea0d326e586d3c60e5662 files/digest-selinux-gnupg-20051023 73
 MD5 ead6a56acfba29bb5e0b072575e0c83d metadata.xml 383
-MD5 5cd4d9f7812518964e09374be37a5fd0 selinux-gnupg-20050626.ebuild 469
 MD5 f8aca4c2f0c55aa258a917e35706a878 selinux-gnupg-20050823.ebuild 469
-MD5 21fc3844909bff919f6d9316940d84d2 files/digest-selinux-gnupg-20050626 73
-MD5 2a4ba2ffdcc7c7e2daedfe3ef3254315 files/digest-selinux-gnupg-20050823 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDLS9hGSBEIeh4AEYRAs+AAJ42lVh4G5SMPF5waXBFLDFPCbaXvgCfdLCR
-/TqU/jtOt3vRRrW1KLsZGLk=
-=a3wN
------END PGP SIGNATURE-----
+MD5 f9c9f9d0513f5c882d2c069803813440 selinux-gnupg-20051023.ebuild 361
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050626 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050626
deleted file mode 100644
index acaf7b6b9c17..000000000000
--- a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20050626
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4e008230ceaf9744987c94b61a50a1b selinux-gnupg-20050626.tar.bz2 3009
diff --git a/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20051023 b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20051023
new file mode 100644
index 000000000000..6ee9fd16a931
--- /dev/null
+++ b/sec-policy/selinux-gnupg/files/digest-selinux-gnupg-20051023
@@ -0,0 +1 @@
+MD5 b63d9685478229925e497c84379c1fcc selinux-gnupg-20051023.tar.bz2 2934
diff --git a/sec-policy/selinux-gnupg/selinux-gnupg-20050626.ebuild b/sec-policy/selinux-gnupg/selinux-gnupg-20051023.ebuild
index 08aac738f0eb..14e85730964d 100644
--- a/sec-policy/selinux-gnupg/selinux-gnupg-20050626.ebuild
+++ b/sec-policy/selinux-gnupg/selinux-gnupg-20051023.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-20050626.ebuild,v 1.4 2005/09/18 10:04:26 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnupg/selinux-gnupg-20051023.ebuild,v 1.1 2005/11/28 09:04:44 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -12,5 +12,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for GNU privacy guard"
 
-KEYWORDS="amd64 mips ppc sparc x86"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"