merge with upstream

Package-Manager: portage-2.0.51.19

5 files changed, 17 insertions, 12 deletions

diff --git a/sec-policy/selinux-ntp/ChangeLog b/sec-policy/selinux-ntp/ChangeLog
index dccf4b2cfbf6..b077afb85804 100644
--- a/sec-policy/selinux-ntp/ChangeLog
+++ b/sec-policy/selinux-ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ntp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.9 2005/03/23 07:46:49 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.10 2005/04/23 18:45:35 kaiowas Exp $
+
+*selinux-ntp-20050408 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-ntp-20041120.ebuild, +selinux-ntp-20050408.ebuild:
+  merge with upstream, no semantic diff
 
   23 Mar 2005; petre rodan <kaiowas@gentoo.org> selinux-ntp-20050219.ebuild:
   mark stable
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index e67e9a086bda..efff3167bd6c 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6996bda7a64b245a4e264ee643ad4707 ChangeLog 1220
+MD5 cd2a919f6333825783bd52e3af290f68 ChangeLog 1409
 MD5 ed58290361b061defc07c7f48ee829af metadata.xml 532
 MD5 827f6946d496062e0ae87893e0698e69 selinux-ntp-20050219.ebuild 454
-MD5 f385f0396f14b7c0f9bdec25748d4e52 selinux-ntp-20041120.ebuild 455
+MD5 2a64f5c8935a5b8b3fb7a7e876bd1209 selinux-ntp-20050408.ebuild 458
 MD5 391a449cd2498f951e7c3e16549d2dff files/digest-selinux-ntp-20050219 71
-MD5 c2734fd896b769d91847de9977f3e303 files/digest-selinux-ntp-20041120 71
+MD5 72e8a746a05d63b3d9ec136c3d12508b files/digest-selinux-ntp-20050408 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCQR21GSBEIeh4AEYRAujNAJ92dRVDIf8yCgmdtswzP4bRMWaB9wCcC/x5
-N6AjmvSEP/z70nWHvXgeakc=
-=OUxu
+iD8DBQFCapCCGSBEIeh4AEYRAkeLAJ4+OiJSSwNDOBao+1uj2RqzeD8zNQCeJyb4
+jHY6sbmpZnbSJtojOaWiiTo=
+=BMsT
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20041120 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20041120
deleted file mode 100644
index de6a5de0612f..000000000000
--- a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20041120
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6bf115f964a5cb8b26cb78d818f7143 selinux-ntp-20041120.tar.bz2 1316
diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050408 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050408
new file mode 100644
index 000000000000..56231af63ec5
--- /dev/null
+++ b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050408
@@ -0,0 +1 @@
+MD5 c7803464275a5f6480c10f457923bc4f selinux-ntp-20050408.tar.bz2 1381
diff --git a/sec-policy/selinux-ntp/selinux-ntp-20041120.ebuild b/sec-policy/selinux-ntp/selinux-ntp-20050408.ebuild
index 9125c22edd7b..3f8a6f7ccd2e 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-20041120.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-20050408.ebuild
@@ -1,16 +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-ntp/selinux-ntp-20041120.ebuild,v 1.2 2005/01/20 09:29:41 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-20050408.ebuild,v 1.1 2005/04/23 18:45:35 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="ntpd.te"
 FCFILES="ntpd.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20041023"
 
 DESCRIPTION="SELinux policy for the network time protocol daemon"
 
-KEYWORDS="x86 ppc sparc amd64"
-
-RDEPEND=">=sec-policy/selinux-base-policy-20041023"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"