merge with upstream

(Portage version: 2.0.51.19)

5 files changed, 13 insertions, 18 deletions

diff --git a/sec-policy/selinux-postgresql/ChangeLog b/sec-policy/selinux-postgresql/ChangeLog
index 405eeac563ce..312d9562dbf2 100644
--- a/sec-policy/selinux-postgresql/ChangeLog
+++ b/sec-policy/selinux-postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postgresql
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.9 2005/03/23 07:52:07 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.10 2005/04/23 19:01:46 kaiowas Exp $
+
+*selinux-postgresql-20050408 (23 Apr 2005)
+
+  23 Apr 2005; petre rodan <kaiowas@gentoo.org>
+  -selinux-postgresql-20041211.ebuild, +selinux-postgresql-20050408.ebuild:
+  merge with upstream
 
   23 Mar 2005; petre rodan <kaiowas@gentoo.org>
   selinux-postgresql-20050219.ebuild:
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 1f5ec26640b7..20b139cd4cf0 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6500dfff8a1b49dbfaf141a2847ef94c ChangeLog 1644
 MD5 169761c63f66d24015db4b712ba378b6 metadata.xml 513
 MD5 c519f62cf24c2ca4cb417333fbeaea0a selinux-postgresql-20050219.ebuild 458
-MD5 fb446eda4a75c6fe6af7c4c444de257a selinux-postgresql-20041211.ebuild 459
+MD5 61d3ad6b8c5e0b0efff45d466da6d410 selinux-postgresql-20050408.ebuild 339
 MD5 bb44fcbe364e5daf5c167ab23abfd41d files/digest-selinux-postgresql-20050219 78
-MD5 ae9fb92028c9753a761a169475dc4b87 files/digest-selinux-postgresql-20041211 78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCQR6IGSBEIeh4AEYRAllXAJ9GLRi+ZAg2JRfx4A+AFlQiyUq9CwCggQxR
-FXNhrRGiDg4EzyHzFezNG9s=
-=yE2v
------END PGP SIGNATURE-----
+MD5 94ca7cdaff211c7d63f091b3bd836052 files/digest-selinux-postgresql-20050408 78
diff --git a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041211 b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041211
deleted file mode 100644
index 806be0628325..000000000000
--- a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20041211
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5dab72c1653806130f1379f5a25bc12c selinux-postgresql-20041211.tar.bz2 1694
diff --git a/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050408 b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050408
new file mode 100644
index 000000000000..2e33507ad918
--- /dev/null
+++ b/sec-policy/selinux-postgresql/files/digest-selinux-postgresql-20050408
@@ -0,0 +1 @@
+MD5 d1a19856ce1c6b74f35ea3e684af0212 selinux-postgresql-20050408.tar.bz2 1689
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-20041211.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-20050408.ebuild
index d3205cf07465..0dc4a022c583 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-20041211.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-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-postgresql/selinux-postgresql-20041211.ebuild,v 1.2 2005/01/20 09:32:29 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/selinux-postgresql-20050408.ebuild,v 1.1 2005/04/23 19:01:46 kaiowas Exp $
 
 inherit selinux-policy
 
 TEFILES="postgresql.te"
 FCFILES="postgresql.fc"
 IUSE=""
+RDEPEND=">=sec-policy/selinux-base-policy-20050224"
 
 DESCRIPTION="SELinux policy for PostgreSQL"
 
-KEYWORDS="x86 ppc sparc amd64"
-
-RDEPEND=">=sec-policy/selinux-base-policy-20041023"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"