Change for bug #188770

Package-Manager: portage-2.1.3.5

5 files changed, 29 insertions, 25 deletions

diff --git a/sys-apps/pmount/ChangeLog b/sys-apps/pmount/ChangeLog
index 7813948469b3..078627b802f6 100644
--- a/sys-apps/pmount/ChangeLog
+++ b/sys-apps/pmount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pmount
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.43 2007/03/28 13:01:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.44 2007/08/14 15:37:11 strerror Exp $
+
+  14 Aug 2007; Benjamin Smee <strerror@gentoo.org> pmount-0.9.9.ebuild,
+  pmount-0.9.11.ebuild, pmount-0.9.13.ebuild:
+  Change for bug #188770
 
   28 Mar 2007; Raúl Porcel <armin76@gentoo.org> pmount-0.9.13.ebuild:
   ia64 stable wrt bug 162992
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 53f585e28d16..e9dd00d453e3 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -5,22 +5,22 @@ SHA256 33962c5f3cf9d29e65c21f72b2c2a479b10bb635c158a70be49085e286a4dec6 files/pm
 DIST pmount-0.9.11.tar.gz 414959 RMD160 b222171274581259bbbe5980183923fb25342ec3 SHA1 6fdadde0a9f0147f92f88b562d8ec4db031c9649 SHA256 a7c8521316114102f3bd19f350b7fe21d38c39a30b055d89613a3eb62f4c9d88
 DIST pmount-0.9.13.tar.gz 415671 RMD160 40bfeacbd8f569d7a2a81574e08689197551e9b7 SHA1 840ff5a8f5499200a6711c2584935004f642bded SHA256 ff6f37fcf89da639e54fca68dafb9093036d3d250305c8f29efd6a58b3c35fa0
 DIST pmount-0.9.9.tar.gz 416898 RMD160 f24e7bab64d4163a1f32a2a69fbd0e12c0ca2049 SHA1 d27ff42a7367bf3a248e643bc2527b5b36e27691 SHA256 19a15780cd1083bfbef432436402db665dac131013a005b4cd27ad49341d465d
-EBUILD pmount-0.9.11.ebuild 1444 RMD160 900e2f168c0a1c1c9452256d879556d1019db2c5 SHA1 803c66000c4cf69cbf20c5af2f360e871c3f9e61 SHA256 a585da05f3830aa579eb19dcaa4812a05b4d2f9602bb3f2cb08368c108d2425c
-MD5 5a5f8eba081e6d2d6242ca2dcd851d12 pmount-0.9.11.ebuild 1444
-RMD160 900e2f168c0a1c1c9452256d879556d1019db2c5 pmount-0.9.11.ebuild 1444
-SHA256 a585da05f3830aa579eb19dcaa4812a05b4d2f9602bb3f2cb08368c108d2425c pmount-0.9.11.ebuild 1444
-EBUILD pmount-0.9.13.ebuild 1546 RMD160 d1e22afcd397a55d1e2f770e3544871b04643ee4 SHA1 e4eec320df11499211b438929731bf52c09d6d6c SHA256 623b364805e561955f2f735462e3caaecd7f35e98c162f7d285d40cb5ef9dd3d
-MD5 b903205049bcbd2d79b3c11879df6203 pmount-0.9.13.ebuild 1546
-RMD160 d1e22afcd397a55d1e2f770e3544871b04643ee4 pmount-0.9.13.ebuild 1546
-SHA256 623b364805e561955f2f735462e3caaecd7f35e98c162f7d285d40cb5ef9dd3d pmount-0.9.13.ebuild 1546
-EBUILD pmount-0.9.9.ebuild 1435 RMD160 e371a3622db8ebb379db2564702e57a1a769d597 SHA1 0dc296e679fc1905feb733ac689385a903c4bb66 SHA256 3c270133cbf03184763df48f6575f9f77c3dda80c3c1f11e3b085265d2c3e861
-MD5 845ed8bec75cb8677bbb902949c57928 pmount-0.9.9.ebuild 1435
-RMD160 e371a3622db8ebb379db2564702e57a1a769d597 pmount-0.9.9.ebuild 1435
-SHA256 3c270133cbf03184763df48f6575f9f77c3dda80c3c1f11e3b085265d2c3e861 pmount-0.9.9.ebuild 1435
-MISC ChangeLog 5539 RMD160 d7c59dbaa244611b6e9ce01d37d8014ab26cf1d8 SHA1 4650c90e617dd3d3324d64b10d1a7e2f48bc7e71 SHA256 3afaeb529b1a5d1e03be74f4ca095fbca8b2317b8237e1f04fcc0ee5ab1e0f96
-MD5 c35bb08774848fcda9e5ba06f898012f ChangeLog 5539
-RMD160 d7c59dbaa244611b6e9ce01d37d8014ab26cf1d8 ChangeLog 5539
-SHA256 3afaeb529b1a5d1e03be74f4ca095fbca8b2317b8237e1f04fcc0ee5ab1e0f96 ChangeLog 5539
+EBUILD pmount-0.9.11.ebuild 1479 RMD160 c25ea71b55a8425e4cc0a6ea96d6bfc307fac2c3 SHA1 5de0769479bf08ba506e9d9fdcafe3406cff01d2 SHA256 115b4d409185594b79eb6b79c85f8e2f3eaac0a4d1bbd8167f23cb35f0070c29
+MD5 7a0bd2ccca49a6e7c5d2c6f92ba8c82c pmount-0.9.11.ebuild 1479
+RMD160 c25ea71b55a8425e4cc0a6ea96d6bfc307fac2c3 pmount-0.9.11.ebuild 1479
+SHA256 115b4d409185594b79eb6b79c85f8e2f3eaac0a4d1bbd8167f23cb35f0070c29 pmount-0.9.11.ebuild 1479
+EBUILD pmount-0.9.13.ebuild 1580 RMD160 1d4f5d8016b1cdf7ae756d1346c8c9452f33a0ba SHA1 0295670959a98e2b696ea2cf97b4970fbf43a4a0 SHA256 2c4af9f18648bdfdbaa597f59479e2ffae7f8a6c08aa876a069171b0ea248ad0
+MD5 977611edc2df15635303e15cee4be5fe pmount-0.9.13.ebuild 1580
+RMD160 1d4f5d8016b1cdf7ae756d1346c8c9452f33a0ba pmount-0.9.13.ebuild 1580
+SHA256 2c4af9f18648bdfdbaa597f59479e2ffae7f8a6c08aa876a069171b0ea248ad0 pmount-0.9.13.ebuild 1580
+EBUILD pmount-0.9.9.ebuild 1470 RMD160 119dec6e16f00cd5ea0ec19456d04193f5e6b60e SHA1 ca2fff13321917a79ca611c3e07c3dfa666fcc53 SHA256 365a83c5a319c06ef9dafbb6b13876af2c3bfcff12fc2d50fcd8904874369ee7
+MD5 9a11864335207b5bed1b0393714ca2ee pmount-0.9.9.ebuild 1470
+RMD160 119dec6e16f00cd5ea0ec19456d04193f5e6b60e pmount-0.9.9.ebuild 1470
+SHA256 365a83c5a319c06ef9dafbb6b13876af2c3bfcff12fc2d50fcd8904874369ee7 pmount-0.9.9.ebuild 1470
+MISC ChangeLog 5684 RMD160 f259e8b0e46534e67f0f091a380a4ca7c7f090e8 SHA1 6c0deb6c3f4a9f505237ad08baa3f45573ece864 SHA256 ea03355696115ae11e86420b054a2cebbb0b0bf2dd83a85d7e6f9e183da77e16
+MD5 fe9286bc3bfefc91d235d2b1aeaaf74c ChangeLog 5684
+RMD160 f259e8b0e46534e67f0f091a380a4ca7c7f090e8 ChangeLog 5684
+SHA256 ea03355696115ae11e86420b054a2cebbb0b0bf2dd83a85d7e6f9e183da77e16 ChangeLog 5684
 MISC metadata.xml 253 RMD160 8b9396b35e9a5813d0be62fbdd0a91c3d15e753c SHA1 7f6c084c9a7f7118b40867f4dbc53dcba38a4e25 SHA256 18c957b52e3003a9b0cd212b7b42ee0829c8e049181003660d3d2d95d379b531
 MD5 aac86bf5e50eb9cef83a6f6800c560af metadata.xml 253
 RMD160 8b9396b35e9a5813d0be62fbdd0a91c3d15e753c metadata.xml 253
diff --git a/sys-apps/pmount/pmount-0.9.11.ebuild b/sys-apps/pmount/pmount-0.9.11.ebuild
index 3c73b90349f1..fbb324214d49 100644
--- a/sys-apps/pmount/pmount-0.9.11.ebuild
+++ b/sys-apps/pmount/pmount-0.9.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.11.ebuild,v 1.4 2006/10/31 01:11:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.11.ebuild,v 1.5 2007/08/14 15:37:11 strerror Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,7 +16,7 @@ IUSE="crypt"
 DEPEND=">=sys-apps/dbus-0.33
 	>=sys-apps/hal-0.5.2
 	>=sys-fs/sysfsutils-1.3.0
-	crypt? ( sys-fs/cryptsetup-luks )"
+	crypt? ( || ( >=sys-fs/cryptsetup-1.0.5 sys-fs/cryptsetup-luks ) )"
 
 pkg_setup() {
 	enewgroup plugdev
diff --git a/sys-apps/pmount/pmount-0.9.13.ebuild b/sys-apps/pmount/pmount-0.9.13.ebuild
index 44d41a59ebfb..90afb3204b2a 100644
--- a/sys-apps/pmount/pmount-0.9.13.ebuild
+++ b/sys-apps/pmount/pmount-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.13.ebuild,v 1.12 2007/03/28 13:01:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.13.ebuild,v 1.13 2007/08/14 15:37:11 strerror Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ IUSE="crypt hal"
 
 DEPEND="hal? ( >=sys-apps/dbus-0.33 >=sys-apps/hal-0.5.2 )
 	>=sys-fs/sysfsutils-1.3.0
-	crypt? ( sys-fs/cryptsetup-luks )"
+	crypt? ( || ( >=sys-fs/cryptsetup-1.0.5 sys-fs/cryptsetup-luks ) )"
 
 pkg_setup() {
 	enewgroup plugdev
diff --git a/sys-apps/pmount/pmount-0.9.9.ebuild b/sys-apps/pmount/pmount-0.9.9.ebuild
index b62d4eb97916..b6b656d1e3f9 100644
--- a/sys-apps/pmount/pmount-0.9.9.ebuild
+++ b/sys-apps/pmount/pmount-0.9.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.9.ebuild,v 1.13 2006/10/31 01:11:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.9.ebuild,v 1.14 2007/08/14 15:37:11 strerror Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,7 +16,7 @@ IUSE="crypt"
 DEPEND=">=sys-apps/dbus-0.33
 	>=sys-apps/hal-0.5.2
 	>=sys-fs/sysfsutils-1.3.0
-	crypt? ( sys-fs/cryptsetup-luks )"
+	crypt? ( || ( >=sys-fs/cryptsetup-1.0.5 sys-fs/cryptsetup-luks ) )"
 
 pkg_setup() {
 	enewgroup plugdev