merge with upstream, removed old ebuilds

(Portage version: 2.0.51.19)

9 files changed, 14 insertions, 54 deletions

diff --git a/sec-policy/selinux-bind/ChangeLog b/sec-policy/selinux-bind/ChangeLog
index 7d27818c8405..7e2e2dbd8be2 100644
--- a/sec-policy/selinux-bind/ChangeLog
+++ b/sec-policy/selinux-bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-bind
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.9 2005/02/25 07:30:11 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.10 2005/04/23 17:09:38 kaiowas Exp $
+
+*selinux-bind-20050408 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-bind-20040428.ebuild, -selinux-bind-20040925.ebuild,
+  -selinux-bind-20041120.ebuild, +selinux-bind-20050408.ebuild:
+  merge with upstream, removed old ebuilds
 
 *selinux-bind-20050219 (25 Feb 2005)
 
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 4a3a4d46342f..88371e028f86 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9fdd010db0c69091b97915b1be7ae533 ChangeLog 1330
 MD5 2578a997bc90b7068228ad83d664c215 metadata.xml 542
 MD5 b9b1e442367252d6acc10e7541089503 selinux-bind-20050219.ebuild 430
-MD5 8e3b204a40a09b5675ae7785b01d7347 selinux-bind-20040428.ebuild 378
-MD5 3151a13402b0fa596cab605fccf9c574 selinux-bind-20040925.ebuild 431
-MD5 ca0a71da485729ff353c22588729cbf1 selinux-bind-20041120.ebuild 431
+MD5 b8dc03c83fe94d8fbb4a4ecbe18b1987 selinux-bind-20050408.ebuild 323
 MD5 644c3b6f3edad8ff3bf816a892abe52a files/digest-selinux-bind-20050219 72
-MD5 e3f94bd06c76ad3637716662af4c12cc files/digest-selinux-bind-20040428 72
-MD5 64511c68ecd55045e382366c578e797b files/digest-selinux-bind-20040925 72
-MD5 796de9cfba32ab842115ab3da83665e1 files/digest-selinux-bind-20041120 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCQRuEGSBEIeh4AEYRAk8ZAJ9GInVRYa4HUWeVXH/F8G42UJgNEACeN5mY
-gyW/eu297DIoskxAhlFXST8=
-=Wmn0
------END PGP SIGNATURE-----
+MD5 16035ec49a17b5daf1249d737a613067 files/digest-selinux-bind-20050408 72
diff --git a/sec-policy/selinux-bind/files/digest-selinux-bind-20040428 b/sec-policy/selinux-bind/files/digest-selinux-bind-20040428
deleted file mode 100644
index 38171f7df599..000000000000
--- a/sec-policy/selinux-bind/files/digest-selinux-bind-20040428
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f705bf67d60a4d81d378ac5460f5738 selinux-bind-20040428.tar.bz2 1760
diff --git a/sec-policy/selinux-bind/files/digest-selinux-bind-20040925 b/sec-policy/selinux-bind/files/digest-selinux-bind-20040925
deleted file mode 100644
index f4337e3fc962..000000000000
--- a/sec-policy/selinux-bind/files/digest-selinux-bind-20040925
+++ /dev/null
@@ -1 +0,0 @@
-MD5 692206d128a49e522ac6d045e025aa55 selinux-bind-20040925.tar.bz2 1748
diff --git a/sec-policy/selinux-bind/files/digest-selinux-bind-20041120 b/sec-policy/selinux-bind/files/digest-selinux-bind-20041120
deleted file mode 100644
index d43c255440dd..000000000000
--- a/sec-policy/selinux-bind/files/digest-selinux-bind-20041120
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9d50e09737c4482c66d58fd3ebe9781 selinux-bind-20041120.tar.bz2 2058
diff --git a/sec-policy/selinux-bind/files/digest-selinux-bind-20050408 b/sec-policy/selinux-bind/files/digest-selinux-bind-20050408
new file mode 100644
index 000000000000..a3aa885a1a1c
--- /dev/null
+++ b/sec-policy/selinux-bind/files/digest-selinux-bind-20050408
@@ -0,0 +1 @@
+MD5 1f21bfab4899da841e61b71ea24ed861 selinux-bind-20050408.tar.bz2 2130
diff --git a/sec-policy/selinux-bind/selinux-bind-20040428.ebuild b/sec-policy/selinux-bind/selinux-bind-20040428.ebuild
deleted file mode 100644
index 8dfdb0011c4c..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-20040428.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-bind/selinux-bind-20040428.ebuild,v 1.4 2005/01/20 09:05:19 kaiowas Exp $
-
-TEFILES="named.te"
-FCFILES="named.fc"
-IUSE=""
-
-inherit selinux-policy
-
-DESCRIPTION="SELinux policy for BIND"
-
-KEYWORDS="x86 ppc sparc amd64"
-
diff --git a/sec-policy/selinux-bind/selinux-bind-20041120.ebuild b/sec-policy/selinux-bind/selinux-bind-20041120.ebuild
deleted file mode 100644
index ba9127ff7b24..000000000000
--- a/sec-policy/selinux-bind/selinux-bind-20041120.ebuild
+++ /dev/null
@@ -1,16 +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-bind/selinux-bind-20041120.ebuild,v 1.2 2005/01/20 09:05:19 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="named.te"
-FCFILES="named.fc"
-IUSE=""
-
-DESCRIPTION="SELinux policy for BIND"
-
-KEYWORDS="x86 ppc sparc amd64"
-
-RDEPEND=">=sec-policy/selinux-base-policy-20041023"
-
diff --git a/sec-policy/selinux-bind/selinux-bind-20040925.ebuild b/sec-policy/selinux-bind/selinux-bind-20050408.ebuild
index 8df9d6dc3264..2ddb526f04bc 100644
--- a/sec-policy/selinux-bind/selinux-bind-20040925.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-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-bind/selinux-bind-20040925.ebuild,v 1.3 2005/01/20 10:04:01 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/selinux-bind-20050408.ebuild,v 1.1 2005/04/23 17:09:38 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="named.te"
 FCFILES="named.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for BIND"
 
-KEYWORDS="x86 ppc sparc amd64"
-
-RDEPEND=">=sec-policy/selinux-base-policy-20041023"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"