merge with upstream

(Portage version: 2.0.53_rc7)

10 files changed, 24 insertions, 32 deletions

diff --git a/sec-policy/selinux-mysql/ChangeLog b/sec-policy/selinux-mysql/ChangeLog
index 412a02b3b1da..04a4f22f65c2 100644
--- a/sec-policy/selinux-mysql/ChangeLog
+++ b/sec-policy/selinux-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mysql
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.15 2005/10/27 19:01:38 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.16 2005/11/28 09:07:19 kaiowas Exp $
+
+*selinux-mysql-20051122 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-mysql-20050605.ebuild, +selinux-mysql-20051122.ebuild:
+  merge with upstream
 
   27 Oct 2005; petre rodan <kaiowas@gentoo.org>
   selinux-mysql-20051023.ebuild:
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 6ae1430c5a29..4b491b13fd0f 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fa9807bad61f09a5308c88dda08e3c6c ChangeLog 2337
-MD5 95b181aed42460f40e3aabd98bf6bcbb files/digest-selinux-mysql-20050605 73
 MD5 2080fa4a60e9b1e15f533a6685124fb8 files/digest-selinux-mysql-20051023 73
+MD5 d30135f78d0f9a4110b760747512e19b files/digest-selinux-mysql-20051122 73
 MD5 46e72c8d2f5d2d58d53e25b822d9e4c9 metadata.xml 507
-MD5 a9091c4fc27d6312a1942f60d0715047 selinux-mysql-20050605.ebuild 435
 MD5 7af3ba42bb882d2f6ab17db4d5bf167c selinux-mysql-20051023.ebuild 440
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDYST2GSBEIeh4AEYRAu4/AJ4/J+CKyzNHWdMAteWihLRk/q4fHgCfTIaI
-TwXD1x9QFvz1iq41pQCbM0w=
-=Ssb3
------END PGP SIGNATURE-----
+MD5 fd3f989400f72c073d2050f72d0fac12 selinux-mysql-20051122.ebuild 332
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605
deleted file mode 100644
index f60d1aba5865..000000000000
--- a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20050605
+++ /dev/null
@@ -1 +0,0 @@
-MD5 caf039db9bb2085462e10c7740542067 selinux-mysql-20050605.tar.bz2 1168
diff --git a/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122 b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122
new file mode 100644
index 000000000000..13294f5882f8
--- /dev/null
+++ b/sec-policy/selinux-mysql/files/digest-selinux-mysql-20051122
@@ -0,0 +1 @@
+MD5 925cdc451364a2870320990220abc93a selinux-mysql-20051122.tar.bz2 1235
diff --git a/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild b/sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild
index 161a850ab571..48b9775bda48 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-20050605.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-20051122.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-mysql/selinux-mysql-20050605.ebuild,v 1.2 2005/06/27 11:34:54 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-20051122.ebuild,v 1.1 2005/11/28 09:07:19 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for mysql"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
 
diff --git a/sec-policy/selinux-ntp/ChangeLog b/sec-policy/selinux-ntp/ChangeLog
index db992d352440..0dbace0b2966 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.17 2005/10/27 19:03:26 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.18 2005/11/28 09:09:55 kaiowas Exp $
+
+*selinux-ntp-20051122 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-ntp-20050918.ebuild, +selinux-ntp-20051122.ebuild:
+  merge with upstream
 
   27 Oct 2005; petre rodan <kaiowas@gentoo.org> selinux-ntp-20051023.ebuild:
   mark stable on amd64 mips ppc sparc x86
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 17002325d349..2433f153c70c 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 64fb8645db41149e5692179069015307 ChangeLog 2364
-MD5 61c66db11638dd8eb879fa487fa4750b files/digest-selinux-ntp-20050918 71
 MD5 e0719cd21ec4ffcd66c3c1d57cbcc596 files/digest-selinux-ntp-20051023 71
+MD5 6874234b1f5a59a5f421fd50c8a56bdc files/digest-selinux-ntp-20051122 71
 MD5 ed58290361b061defc07c7f48ee829af metadata.xml 532
-MD5 8f7d71e14e5f15877334aef6bfb809d1 selinux-ntp-20050918.ebuild 459
 MD5 848b9309a916d59d15da445e5759749f selinux-ntp-20051023.ebuild 459
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDYSVuGSBEIeh4AEYRAgDrAJ9hYpq0I/oHqgliKw44M8p8xjeVkgCggUus
-8F69oY4XeqljhWBDOqNI1AQ=
-=fWxG
------END PGP SIGNATURE-----
+MD5 9462ef5eebc48ad0691093b9fd576b0b selinux-ntp-20051122.ebuild 355
diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918
deleted file mode 100644
index ebb302ea7ed9..000000000000
--- a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20050918
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62b7c72ba016b7cb32d19860fd1eb666 selinux-ntp-20050918.tar.bz2 1437
diff --git a/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122 b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122
new file mode 100644
index 000000000000..0e81caa0b1e9
--- /dev/null
+++ b/sec-policy/selinux-ntp/files/digest-selinux-ntp-20051122
@@ -0,0 +1 @@
+MD5 70378c6a643440032eee2961da70a39c selinux-ntp-20051122.tar.bz2 1483
diff --git a/sec-policy/selinux-ntp/selinux-ntp-20050918.ebuild b/sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild
index 94e3ca70f2c6..a455151fcc84 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-20050918.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-20051122.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-ntp/selinux-ntp-20050918.ebuild,v 1.2 2005/10/18 10:42:19 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-20051122.ebuild,v 1.1 2005/11/28 09:09:55 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for the network time protocol daemon"
 
-KEYWORDS="amd64 mips ppc sparc x86"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"