merge with upstream

(Portage version: 2.0.53_rc7)

7 files changed, 13 insertions, 33 deletions

diff --git a/sec-policy/selinux-dhcp/ChangeLog b/sec-policy/selinux-dhcp/ChangeLog
index 72e715d357ea..af2da3b59efb 100644
--- a/sec-policy/selinux-dhcp/ChangeLog
+++ b/sec-policy/selinux-dhcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-dhcp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.16 2005/10/27 18:57:35 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.17 2005/11/28 09:00:50 kaiowas Exp $
+
+*selinux-dhcp-20051122 (28 Nov 2005)
+
+  28 Nov 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-dhcp-20050219.ebuild, -selinux-dhcp-20050626.ebuild,
+  +selinux-dhcp-20051122.ebuild:
+  merge with upstream
 
   27 Oct 2005; petre rodan <kaiowas@gentoo.org>
   selinux-dhcp-20050918.ebuild:
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 49e9f38fa371..10344ad2e16f 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c759e2efc5805645f2f0c6abf33e8471 ChangeLog 2572
-MD5 c38614a55c5f54b18268f8c541434a7e files/digest-selinux-dhcp-20050219 72
-MD5 95a3f8ad38a7e50ec90cdca31019514d files/digest-selinux-dhcp-20050626 72
 MD5 630924bef3f1b5eed9aeeefc248f0da0 files/digest-selinux-dhcp-20050918 72
+MD5 16b8a57d107cd11d31d8422743e7b1b8 files/digest-selinux-dhcp-20051122 72
 MD5 30408c1d604aa79a5d18881b61cb68c7 metadata.xml 548
-MD5 4f095558e9e2ed863a787c1df9fb2ea4 selinux-dhcp-20050219.ebuild 385
-MD5 0b8870cddfcf292aba53930eef5e4085 selinux-dhcp-20050626.ebuild 437
 MD5 c5ff6e68f848fac7d322f663c933ba59 selinux-dhcp-20050918.ebuild 442
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFDYSQTGSBEIeh4AEYRAim4AKCBvF4n3ZXkWs3sqgxMnQXV8IkqPACaAsOt
-atR7Zj0c0QOvCyQLiysVKyk=
-=FDd1
------END PGP SIGNATURE-----
+MD5 b8ec861d8e641dd64416522d0252fd84 selinux-dhcp-20051122.ebuild 336
diff --git a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219 b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219
deleted file mode 100644
index 7478c04daefd..000000000000
--- a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050219
+++ /dev/null
@@ -1 +0,0 @@
-MD5 322f4a7a575c2d4d04562719e1b0d082 selinux-dhcp-20050219.tar.bz2 1503
diff --git a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050626 b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050626
deleted file mode 100644
index 636061bf7c0b..000000000000
--- a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20050626
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ed7f762462601382d9dd892cd95a469 selinux-dhcp-20050626.tar.bz2 1493
diff --git a/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20051122 b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20051122
new file mode 100644
index 000000000000..de7a276e1050
--- /dev/null
+++ b/sec-policy/selinux-dhcp/files/digest-selinux-dhcp-20051122
@@ -0,0 +1 @@
+MD5 253ef0f65e307059b1011d42d405c104 selinux-dhcp-20051122.tar.bz2 1528
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild
deleted file mode 100644
index b80144d471ce..000000000000
--- a/sec-policy/selinux-dhcp/selinux-dhcp-20050219.ebuild
+++ /dev/null
@@ -1,14 +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-dhcp/selinux-dhcp-20050219.ebuild,v 1.2 2005/03/23 07:38:05 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="dhcpd.te"
-FCFILES="dhcpd.fc"
-IUSE=""
-
-DESCRIPTION="SELinux policy for dhcp server"
-
-KEYWORDS="x86 ppc sparc amd64"
-
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-20050626.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-20051122.ebuild
index 575f7a1dce3e..bc3420486c3e 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-20050626.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-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-dhcp/selinux-dhcp-20050626.ebuild,v 1.2 2005/06/26 16:56:53 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-20051122.ebuild,v 1.1 2005/11/28 09:00:50 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ RDEPEND=">=sec-policy/selinux-base-policy-20050618"
 
 DESCRIPTION="SELinux policy for dhcp server"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"