Tighten up versioning to try to prevent mismatch problems as seen in #112348.

Package-Manager: portage-2.0.53

5 files changed, 21 insertions, 16 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 006710bc029f..a03c90c8258a 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.49 2005/12/09 01:02:26 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.50 2005/12/15 21:52:54 pebenito Exp $
+
+  15 Dec 2005; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.22.ebuild, policycoreutils-1.24-r2.ebuild,
+  policycoreutils-1.28.ebuild:
+  Tighten up versioning to try to prevent mismatch problems as seen in #112348.
 
 *policycoreutils-1.28 (09 Dec 2005)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index fb69045d0e22..879acaef6218 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 34e70ed2cea63251759eddc1aeb5fbe4 ChangeLog 7931
+MD5 71c4a281a9b4103d6268aa49289ac104 ChangeLog 8158
 MD5 7a74a3135f746668eccc7a1521bd11cb files/digest-policycoreutils-1.22 146
 MD5 888c48de2a246f60017c7d2f3b6eccd0 files/digest-policycoreutils-1.24-r2 146
 MD5 8b17a28b65ab524d9d67e1933c22d12e files/digest-policycoreutils-1.28 146
@@ -9,13 +9,13 @@ MD5 e4fae02aa0cf1196385194111e1a482c files/policycoreutils-1.22-genhomedircon-qu
 MD5 2afb35c97fdfb93d2c5ee049f1f43b10 files/policycoreutils-1.24-genhomedircon-quiet.diff 1236
 MD5 b506c1ab31feeaa1394d45eedeaa2cc7 files/policycoreutils-1.28-quietlp.diff 817
 MD5 2eeb1df30e87ba2861eddbdc34a48bb8 metadata.xml 836
-MD5 1c03a495acacf417638cc547adbbc501 policycoreutils-1.22.ebuild 3374
-MD5 0323878a39e087e3934272daabf4e88f policycoreutils-1.24-r2.ebuild 3609
-MD5 6e2986f88db435d4dfa24e2f6568bb6d policycoreutils-1.28.ebuild 3548
+MD5 258910c124d547d1bf3945ed62bdf085 policycoreutils-1.22.ebuild 3374
+MD5 6e5218a65a8155983ed7b93dfb30e4fd policycoreutils-1.24-r2.ebuild 3609
+MD5 7b09c81522366f06f5fc491a2c96de2f policycoreutils-1.28.ebuild 3548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDmNewJ+ChZlpDtAoRApRgAJoDHIOyrH5/UuNKcTK8TRJhtSwIXQCcD+Hr
-9fmaZycNSIhw3caON3TopOs=
-=+uLf
+iD8DBQFDoeXDJ+ChZlpDtAoRAmxhAJ9KueIA/pq74tQ89exdFdZmayI1tQCgiqY8
+k2KR9xFW4opZPtU/1UOJ78Y=
+=topr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-1.22.ebuild b/sys-apps/policycoreutils/policycoreutils-1.22.ebuild
index 0d82fec7b9c0..b889f2b52e2a 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.22.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.22.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.22.ebuild,v 1.5 2005/07/11 03:21:46 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.22.ebuild,v 1.6 2005/12/15 21:52:54 pebenito Exp $
 
 IUSE="build nls pam"
 
 inherit eutils
 
 EXTRAS_VER="1.12"
-SEPOL_VER="1.4"
+SEPOL_VER="1.6"
 
 DESCRIPTION="SELinux core utilities"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc amd64 mips"
 
 RDEPEND=">=sys-libs/libselinux-${PV}
-	>=sys-libs/libsepol-${SEPOL_VER}
+	=sys-libs/libsepol-${SEPOL_VER}*
 	!build? ( pam? ( sys-libs/pam ) )
 	build? ( sys-apps/baselayout )"
 
diff --git a/sys-apps/policycoreutils/policycoreutils-1.24-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-1.24-r2.ebuild
index d2732bd9d2c8..be1b752c9ded 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.24-r2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.24-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.24-r2.ebuild,v 1.1 2005/12/08 00:09:42 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.24-r2.ebuild,v 1.2 2005/12/15 21:52:54 pebenito Exp $
 
 IUSE="build nls pam"
 
 inherit eutils
 
 EXTRAS_VER="1.13"
-SEPOL_VER="1.4"
+SEPOL_VER="1.6"
 
 DESCRIPTION="SELinux core utilities"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -19,7 +19,7 @@ KEYWORDS="x86 ppc sparc amd64"
 #KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 RDEPEND=">=sys-libs/libselinux-${PV}
-	!build? ( pam? ( sys-libs/pam ) >=sys-libs/libsepol-${SEPOL_VER} )
+	!build? ( pam? ( sys-libs/pam ) =sys-libs/libsepol-${SEPOL_VER}* )
 	build? ( sys-apps/baselayout )"
 
 DEPEND="${RDEPEND}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.28.ebuild b/sys-apps/policycoreutils/policycoreutils-1.28.ebuild
index 7d9a6ea55d81..e5c2c3780d13 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.28.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.28.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/sys-apps/policycoreutils/policycoreutils-1.28.ebuild,v 1.1 2005/12/09 01:02:26 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.28.ebuild,v 1.2 2005/12/15 21:52:54 pebenito Exp $
 
 IUSE="build nls pam"
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"
 
 RDEPEND=">=sys-libs/libselinux-${PV}
-	!build? ( pam? ( sys-libs/pam ) >=sys-libs/libsemanage-${SEMNG_VER} )
+	!build? ( pam? ( sys-libs/pam ) =sys-libs/libsemanage-${SEMNG_VER}* )
 	build? ( sys-apps/baselayout )"
 
 DEPEND="${RDEPEND}