merge with upstream

(Portage version: 2.0.51.22-r1)

5 files changed, 13 insertions, 16 deletions

diff --git a/sec-policy/selinux-snmpd/ChangeLog b/sec-policy/selinux-snmpd/ChangeLog
index f020d46e6c82..8b125df8559d 100644
--- a/sec-policy/selinux-snmpd/ChangeLog
+++ b/sec-policy/selinux-snmpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-snmpd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/ChangeLog,v 1.6 2005/03/23 07:55:17 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/ChangeLog,v 1.7 2005/06/26 17:31:19 kaiowas Exp $
+
+*selinux-snmpd-20050605 (26 Jun 2005)
+
+  26 Jun 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-snmpd-20041128.ebuild, +selinux-snmpd-20050605.ebuild:
+  merge with upstream
 
   23 Mar 2005; petre rodan <kaiowas@gentoo.org>
   selinux-snmpd-20050219.ebuild:
diff --git a/sec-policy/selinux-snmpd/Manifest b/sec-policy/selinux-snmpd/Manifest
index 5fa135d23928..7c407f6946b6 100644
--- a/sec-policy/selinux-snmpd/Manifest
+++ b/sec-policy/selinux-snmpd/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5e8053cb0ca58d6a3a5cf7e1251a3049 ChangeLog 1076
 MD5 b99cfd64dc18e0af6e9328ece6d0f38b metadata.xml 515
 MD5 3eca34a26f46241eb731897e3ae372ab selinux-snmpd-20050219.ebuild 440
-MD5 443e3fc14f2a8a6bbd3dac597cf9556c selinux-snmpd-20041128.ebuild 388
+MD5 6dfea9a16565911a4dc5cd09a834348e selinux-snmpd-20050605.ebuild 331
 MD5 cf1f3be63e5d6fe9052bd36e8b001aaa files/digest-selinux-snmpd-20050219 73
-MD5 89762f06cdb38fb95039b679b7085f73 files/digest-selinux-snmpd-20041128 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCQR8KGSBEIeh4AEYRAiYaAJ9XgLiYhMqnNIJpQqLgyaehlSAPDQCgiMv3
-G9ixbGY3K/b4gqTaTY/lTFU=
-=tyKy
------END PGP SIGNATURE-----
+MD5 aa78a41c0c9da2412dd6e3873436fa7c files/digest-selinux-snmpd-20050605 73
diff --git a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041128 b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041128
deleted file mode 100644
index 6396dfd3e70f..000000000000
--- a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20041128
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb0a9c8d10cc8b6a4906b4019b861afb selinux-snmpd-20041128.tar.bz2 1188
diff --git a/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20050605 b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20050605
new file mode 100644
index 000000000000..f22315a96486
--- /dev/null
+++ b/sec-policy/selinux-snmpd/files/digest-selinux-snmpd-20050605
@@ -0,0 +1 @@
+MD5 69bf9ef41cabf123068be0c12154de33 selinux-snmpd-20050605.tar.bz2 1191
diff --git a/sec-policy/selinux-snmpd/selinux-snmpd-20041128.ebuild b/sec-policy/selinux-snmpd/selinux-snmpd-20050605.ebuild
index 499d0c2ab4f5..4d94622d5897 100644
--- a/sec-policy/selinux-snmpd/selinux-snmpd-20041128.ebuild
+++ b/sec-policy/selinux-snmpd/selinux-snmpd-20050605.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-snmpd/selinux-snmpd-20041128.ebuild,v 1.2 2005/01/20 09:37:00 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmpd/selinux-snmpd-20050605.ebuild,v 1.1 2005/06/26 17:31:19 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="snmpd.te"
 FCFILES="snmpd.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for snmp daemons"
 
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"