merge with upstream

(Portage version: 2.0.51.19)

5 files changed, 23 insertions, 6 deletions

diff --git a/sec-policy/selinux-arpwatch/ChangeLog b/sec-policy/selinux-arpwatch/ChangeLog
index 12fa5fe299cf..5bc5434cfec0 100644
--- a/sec-policy/selinux-arpwatch/ChangeLog
+++ b/sec-policy/selinux-arpwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-arpwatch
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/ChangeLog,v 1.5 2005/03/23 07:31:04 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/ChangeLog,v 1.6 2005/04/23 16:38:18 kaiowas Exp $
+
+*selinux-arpwatch-20050408 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-arpwatch-20041208.ebuild, +selinux-arpwatch-20050408.ebuild:
+  merge with upstream
 
 *selinux-arpwatch-20050219 (23 Mar 2005)
 
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 1d637bcca538..6a28fadcd277 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -1,6 +1,16 @@
-MD5 2b807538b44381d9af2154081dc0f95d ChangeLog 988
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a265e5f95fd9b48a40379bda80f1afde ChangeLog 1173
 MD5 33ce69af63f7ed3517790f2af7695d3d metadata.xml 510
 MD5 81db7436af922848650e7033e745b1f3 selinux-arpwatch-20050219.ebuild 448
-MD5 9e016f1bce1bccdd63facdef7ac14fa7 selinux-arpwatch-20050408.ebuild 333
+MD5 a87039eda5b0bd8c6ed9d49f495601de selinux-arpwatch-20050408.ebuild 452
 MD5 f2e0fc09a31ce731f1984a7c4bc00a1d files/digest-selinux-arpwatch-20050219 75
 MD5 ac1d5b2f4899f1eae41da55df2be950c files/digest-selinux-arpwatch-20050408 75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCapLqGSBEIeh4AEYRAhj4AJ448A3X1uxfr2XodvZAVTb05issBACcCQ83
+NsLPkrzpR7fqYRI1c11prhs=
+=6JZY
+-----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041208 b/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041208
deleted file mode 100644
index bec028a65399..000000000000
--- a/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20041208
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c94a0bac365719697ef788badc73d116 selinux-arpwatch-20041208.tar.bz2 783
diff --git a/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20050408 b/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20050408
new file mode 100644
index 000000000000..05e65172c365
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/files/digest-selinux-arpwatch-20050408
@@ -0,0 +1 @@
+MD5 86ca690e2825093cf0b8981e96918c7a selinux-arpwatch-20050408.tar.bz2 920
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-20041208.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-20050408.ebuild
index 1158d24a2fef..276b3fd4c1cc 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-20041208.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-20050408.ebuild
@@ -1,14 +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-arpwatch/selinux-arpwatch-20041208.ebuild,v 1.2 2005/01/20 08:54:00 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/selinux-arpwatch-20050408.ebuild,v 1.1 2005/04/23 16:38:19 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="arpwatch.te"
 FCFILES="arpwatch.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"