merge with upstream, no semantic changes

(Portage version: 2.0.51.19)

7 files changed, 14 insertions, 34 deletions

diff --git a/sec-policy/selinux-daemontools/ChangeLog b/sec-policy/selinux-daemontools/ChangeLog
index 94f5966b6527..57a381402400 100644
--- a/sec-policy/selinux-daemontools/ChangeLog
+++ b/sec-policy/selinux-daemontools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sec-policy/selinux-daemontools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/ChangeLog,v 1.13 2005/02/06 17:18:30 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/ChangeLog,v 1.14 2005/04/23 17:35:09 kaiowas Exp $
+
+*selinux-daemontools-20050316 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-daemontools-20041121.ebuild,
+  -selinux-daemontools-20041128.ebuild,
+  +selinux-daemontools-20050316.ebuild:
+  merge with upstream, no semantic changes
 
   06 Feb 2005; petre rodan <kaiowas@gentoo.org>
   selinux-daemontools-20050201.ebuild:
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 45bab5b72ee2..940178ef5cc4 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 99fcb7f74406169e4f75765dda10653b ChangeLog 2114
 MD5 db86a3732cf9576527558b9050c51f33 metadata.xml 533
-MD5 e4102464f0994752579276204364e83d selinux-daemontools-20041121.ebuild 442
-MD5 72882416197145f7b97c9c4cc417374b selinux-daemontools-20041128.ebuild 442
+MD5 c4eb570d10bacc42736e5f131d5209dc selinux-daemontools-20050316.ebuild 321
 MD5 2b21ac45e364666f7559417fcff8eb07 selinux-daemontools-20050201.ebuild 442
-MD5 ed9f3b70e32e0d75571fc6f541b87bad files/digest-selinux-daemontools-20041121 79
-MD5 9886484d0e038c9e6307607088f0ebb3 files/digest-selinux-daemontools-20041128 79
+MD5 37d0f017a220e7507e05954b5ae78326 files/digest-selinux-daemontools-20050316 79
 MD5 d5464eab557e9a6754230e00908e3dbe files/digest-selinux-daemontools-20050201 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCBlEdGSBEIeh4AEYRAgjMAKCN1dGozIC9T7edk+hHSGFps/EDCgCfT1jT
-i59mpIOwBKRYneBTLhekv3Y=
-=TMxB
------END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20041121 b/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20041121
deleted file mode 100644
index 0b474fcaa64b..000000000000
--- a/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20041121
+++ /dev/null
@@ -1 +0,0 @@
-MD5 620d4638d42d5182eba19af70c93b41f selinux-daemontools-20041121.tar.bz2 2198
diff --git a/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20041128 b/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20041128
deleted file mode 100644
index f9fd87da1e3f..000000000000
--- a/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20041128
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9de0ee7966df9e5161c0e18a9fa3be74 selinux-daemontools-20041128.tar.bz2 2245
diff --git a/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20050316 b/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20050316
new file mode 100644
index 000000000000..47c552687e84
--- /dev/null
+++ b/sec-policy/selinux-daemontools/files/digest-selinux-daemontools-20050316
@@ -0,0 +1 @@
+MD5 4361f292e98e660bc22e5abbe8e2724c selinux-daemontools-20050316.tar.bz2 2278
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-20041128.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-20041128.ebuild
deleted file mode 100644
index f764564513fd..000000000000
--- a/sec-policy/selinux-daemontools/selinux-daemontools-20041128.ebuild
+++ /dev/null
@@ -1,15 +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-daemontools/selinux-daemontools-20041128.ebuild,v 1.2 2005/01/20 09:11:46 kaiowas Exp $
-
-inherit selinux-policy
-
-TEFILES="daemontools.te"
-FCFILES="daemontools.fc"
-MACROS="daemontools_macros.te"
-IUSE=""
-
-DESCRIPTION="SELinux policy for daemontools"
-
-KEYWORDS="x86 ppc sparc amd64"
-
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-20041121.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-20050316.ebuild
index ef76e0e60f5f..aeb6c9cc783e 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-20041121.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-20050316.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-daemontools/selinux-daemontools-20041121.ebuild,v 1.3 2005/01/20 09:11:46 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/selinux-daemontools-20050316.ebuild,v 1.1 2005/04/23 17:35:09 kaiowas Exp $
 
 inherit selinux-policy
 
@@ -11,5 +11,5 @@ IUSE=""
 
 DESCRIPTION="SELinux policy for daemontools"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"