merge with upstream

(Portage version: 2.0.51.19)

5 files changed, 13 insertions, 18 deletions

diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog
index 1968923eea0d..ec7f030bffea 100644
--- a/sec-policy/selinux-squid/ChangeLog
+++ b/sec-policy/selinux-squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-squid
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.10 2005/03/23 08:00:05 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.11 2005/04/23 19:15:45 kaiowas Exp $
+
+*selinux-squid-20050408 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-squid-20041120.ebuild, +selinux-squid-20050408.ebuild:
+  merge with upstream
 
   23 Mar 2005; petre rodan <kaiowas@gentoo.org>
   selinux-squid-20050219.ebuild:
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 824cc13ca432..bb2138eb8a60 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f677b4b31a6fff056cb52b8cb0514feb ChangeLog 1565
 MD5 24c0cb2d4ce8da969c77f6ada1f8e60c metadata.xml 530
 MD5 3dd14ccc7f971d9186b70e7a6875f6af selinux-squid-20050219.ebuild 433
-MD5 f417cd5da7f1e285d7432c538e1033e5 selinux-squid-20041120.ebuild 434
+MD5 9e09549e1fd851382017a11f58759554 selinux-squid-20050408.ebuild 324
 MD5 7c0e7cb107511ece967aad7ee227d280 files/digest-selinux-squid-20050219 73
-MD5 3bd772328886d221f62b99987b9e079a files/digest-selinux-squid-20041120 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCQR/LGSBEIeh4AEYRAh5uAJ0QSGnAExmko8PGdMBccdAMfkiAoQCePEVU
-j6sC4ebxH/kF/wp6BNnxHj0=
-=2s3b
------END PGP SIGNATURE-----
+MD5 49200417d4aa7b1e43ec9d41aad4a057 files/digest-selinux-squid-20050408 73
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20041120 b/sec-policy/selinux-squid/files/digest-selinux-squid-20041120
deleted file mode 100644
index d0b0f43f2517..000000000000
--- a/sec-policy/selinux-squid/files/digest-selinux-squid-20041120
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d51143fa950f0bac36d310462d93aa7 selinux-squid-20041120.tar.bz2 1243
diff --git a/sec-policy/selinux-squid/files/digest-selinux-squid-20050408 b/sec-policy/selinux-squid/files/digest-selinux-squid-20050408
new file mode 100644
index 000000000000..96a863c15d5e
--- /dev/null
+++ b/sec-policy/selinux-squid/files/digest-selinux-squid-20050408
@@ -0,0 +1 @@
+MD5 ca2a79defaa1c4c103b9efd10685be08 selinux-squid-20050408.tar.bz2 1291
diff --git a/sec-policy/selinux-squid/selinux-squid-20041120.ebuild b/sec-policy/selinux-squid/selinux-squid-20050408.ebuild
index f5d16ce18cb9..d48b8ce4920a 100644
--- a/sec-policy/selinux-squid/selinux-squid-20041120.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-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-squid/selinux-squid-20041120.ebuild,v 1.3 2005/02/25 08:33:29 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-20050408.ebuild,v 1.1 2005/04/23 19:15:45 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="squid.te"
 FCFILES="squid.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20041023"
 
 DESCRIPTION="SELinux policy for squid"
 
-KEYWORDS="x86 ppc sparc amd64"
-
-RDEPEND=">=sec-policy/selinux-base-policy-20041023"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"