summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/hal/ChangeLog7
-rw-r--r--sys-apps/hal/hal-0.5.10.ebuild9
-rw-r--r--sys-apps/hal/hal-0.5.7.1-r5.ebuild4
-rw-r--r--sys-apps/hal/hal-0.5.9-r1.ebuild5
-rw-r--r--sys-apps/hal/hal-0.5.9.1-r1.ebuild5
-rw-r--r--sys-apps/hal/hal-0.5.9.1-r2.ebuild5
-rw-r--r--sys-apps/hal/hal-0.5.9.1-r3.ebuild5
-rw-r--r--sys-apps/pmount/ChangeLog6
-rw-r--r--sys-apps/pmount/pmount-0.9.16.ebuild4
-rw-r--r--sys-apps/pmount/pmount-0.9.17.ebuild4
10 files changed, 27 insertions, 27 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index e7d8b43ad99e..e9a8b68e35ed 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/hal
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.229 2008/04/09 17:23:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.230 2008/04/14 18:36:31 cardoe Exp $
+
+ 14 Apr 2008; Doug Goldstein <cardoe@gentoo.org> hal-0.5.7.1-r5.ebuild,
+ hal-0.5.9-r1.ebuild, hal-0.5.9.1-r1.ebuild, hal-0.5.9.1-r2.ebuild,
+ hal-0.5.9.1-r3.ebuild, hal-0.5.10.ebuild:
+ cryptsetup-luks -> cryptsetup
09 Apr 2008; Raúl Porcel <armin76@gentoo.org> hal-0.5.10.ebuild:
Add ~ia64/~sparc wrt #200050
diff --git a/sys-apps/hal/hal-0.5.10.ebuild b/sys-apps/hal/hal-0.5.10.ebuild
index 0a0e71ed5877..707637d10649 100644
--- a/sys-apps/hal/hal-0.5.10.ebuild
+++ b/sys-apps/hal/hal-0.5.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.13 2008/04/09 17:23:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.14 2008/04/14 18:36:31 cardoe Exp $
inherit eutils linux-info autotools flag-o-matic
@@ -40,12 +40,7 @@ RDEPEND=">=dev-libs/glib-2.6
>=sys-fs/udev-111
>=sys-apps/util-linux-2.13
>=sys-kernel/linux-headers-2.6.19
- crypt? (
- || (
- >=sys-fs/cryptsetup-1.0.5
- >=sys-fs/cryptsetup-luks-1.0.1
- )
- )
+ crypt? ( >=sys-fs/cryptsetup-1.0.5 )
)
kernel_FreeBSD? ( dev-libs/libvolume_id )
x86? ( >=sys-apps/dmidecode-2.7 )
diff --git a/sys-apps/hal/hal-0.5.7.1-r5.ebuild b/sys-apps/hal/hal-0.5.7.1-r5.ebuild
index 028d8f94018d..a6ddee6ea965 100644
--- a/sys-apps/hal/hal-0.5.7.1-r5.ebuild
+++ b/sys-apps/hal/hal-0.5.7.1-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r5.ebuild,v 1.18 2008/02/20 02:49:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r5.ebuild,v 1.19 2008/04/14 18:36:31 cardoe Exp $
inherit eutils linux-info
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.6
dev-libs/libusb
virtual/eject
dmi? ( >=sys-apps/dmidecode-2.7 )
- crypt? ( || ( >=sys-fs/cryptsetup-1.0.5 >=sys-fs/cryptsetup-luks-1.0.1 ) )
+ crypt? ( >=sys-fs/cryptsetup-1.0.5 )
selinux? ( sys-libs/libselinux )"
DEPEND="${RDEPEND}
diff --git a/sys-apps/hal/hal-0.5.9-r1.ebuild b/sys-apps/hal/hal-0.5.9-r1.ebuild
index 9880fba27a3a..0c3495493092 100644
--- a/sys-apps/hal/hal-0.5.9-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9-r1.ebuild,v 1.20 2008/02/20 02:49:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9-r1.ebuild,v 1.21 2008/04/14 18:36:31 cardoe Exp $
inherit eutils linux-info autotools flag-o-matic
@@ -31,8 +31,7 @@ RDEPEND=">=dev-libs/glib-2.6
ia64? ( >=sys-apps/dmidecode-2.7 )
dell? ( >=sys-libs/libsmbios-0.13.4 )
disk-partition? ( <=sys-apps/parted-1.8.6 )
- kernel_linux? ( crypt? ( || ( >=sys-fs/cryptsetup-1.0.5
- >=sys-fs/cryptsetup-luks-1.0.1 ) ) )
+ kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-1.0.5 ) )
selinux? ( sys-libs/libselinux
sec-policy/selinux-hal )"
# pam? ( sys-auth/consolekit )"
diff --git a/sys-apps/hal/hal-0.5.9.1-r1.ebuild b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
index 073395c91ff6..4cc861db1801 100644
--- a/sys-apps/hal/hal-0.5.9.1-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.12 2008/02/20 02:49:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.13 2008/04/14 18:36:31 cardoe Exp $
inherit eutils linux-info autotools flag-o-matic
@@ -31,8 +31,7 @@ RDEPEND=">=dev-libs/glib-2.6
ia64? ( >=sys-apps/dmidecode-2.7 )
dell? ( >=sys-libs/libsmbios-0.13.4 )
disk-partition? ( <=sys-apps/parted-1.8.7 )
- kernel_linux? ( crypt? ( || ( >=sys-fs/cryptsetup-1.0.5
- >=sys-fs/cryptsetup-luks-1.0.1 ) ) )
+ kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-1.0.5 ) )
selinux? ( sys-libs/libselinux
sec-policy/selinux-hal )"
# pam? ( sys-auth/consolekit )"
diff --git a/sys-apps/hal/hal-0.5.9.1-r2.ebuild b/sys-apps/hal/hal-0.5.9.1-r2.ebuild
index 79d1029d9d0e..0278fefa9073 100644
--- a/sys-apps/hal/hal-0.5.9.1-r2.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r2.ebuild,v 1.5 2008/02/20 02:49:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r2.ebuild,v 1.6 2008/04/14 18:36:31 cardoe Exp $
inherit eutils linux-info autotools flag-o-matic
@@ -32,8 +32,7 @@ RDEPEND=">=dev-libs/glib-2.6
ia64? ( >=sys-apps/dmidecode-2.7 )
dell? ( >=sys-libs/libsmbios-0.13.4 )
disk-partition? ( <=sys-apps/parted-1.8.7 )
- kernel_linux? ( crypt? ( || ( >=sys-fs/cryptsetup-1.0.5
- >=sys-fs/cryptsetup-luks-1.0.1 ) ) )
+ kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-1.0.5 ) )
selinux? ( sys-libs/libselinux
sec-policy/selinux-hal )"
# pam? ( sys-auth/consolekit )"
diff --git a/sys-apps/hal/hal-0.5.9.1-r3.ebuild b/sys-apps/hal/hal-0.5.9.1-r3.ebuild
index 514eba0b3469..0a2a441e28d7 100644
--- a/sys-apps/hal/hal-0.5.9.1-r3.ebuild
+++ b/sys-apps/hal/hal-0.5.9.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r3.ebuild,v 1.9 2008/02/20 02:49:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r3.ebuild,v 1.10 2008/04/14 18:36:31 cardoe Exp $
inherit eutils linux-info autotools flag-o-matic
@@ -32,8 +32,7 @@ RDEPEND=">=dev-libs/glib-2.6
ia64? ( >=sys-apps/dmidecode-2.7 )
dell? ( >=sys-libs/libsmbios-0.13.4 )
disk-partition? ( <=sys-apps/parted-1.8.7 )
- kernel_linux? ( crypt? ( || ( >=sys-fs/cryptsetup-1.0.5
- >=sys-fs/cryptsetup-luks-1.0.1 ) ) )
+ kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-1.0.5 ) )
selinux? ( sys-libs/libselinux
sec-policy/selinux-hal )"
# pam? ( sys-auth/consolekit )"
diff --git a/sys-apps/pmount/ChangeLog b/sys-apps/pmount/ChangeLog
index 9adf4e3d116a..1c7f4859eef9 100644
--- a/sys-apps/pmount/ChangeLog
+++ b/sys-apps/pmount/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/pmount
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.57 2008/02/21 13:12:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.58 2008/04/14 18:38:25 cardoe Exp $
+
+ 14 Apr 2008; Doug Goldstein <cardoe@gentoo.org> pmount-0.9.16.ebuild,
+ pmount-0.9.17.ebuild:
+ cryptsetup-luks -> cryptsetup
21 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> pmount-0.9.17.ebuild:
Fix SRC_URI.
diff --git a/sys-apps/pmount/pmount-0.9.16.ebuild b/sys-apps/pmount/pmount-0.9.16.ebuild
index 6046670d6c8c..fb35a9f29000 100644
--- a/sys-apps/pmount/pmount-0.9.16.ebuild
+++ b/sys-apps/pmount/pmount-0.9.16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.16.ebuild,v 1.10 2008/01/27 23:43:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.16.ebuild,v 1.11 2008/04/14 18:38:25 cardoe Exp $
inherit eutils
@@ -15,7 +15,7 @@ IUSE="crypt hal"
RDEPEND="hal? ( >=sys-apps/dbus-0.33 >=sys-apps/hal-0.5.2 )
>=sys-fs/sysfsutils-1.3.0
- crypt? ( || ( >=sys-fs/cryptsetup-1.0.5 sys-fs/cryptsetup-luks ) )"
+ crypt? ( >=sys-fs/cryptsetup-1.0.5 )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.21"
diff --git a/sys-apps/pmount/pmount-0.9.17.ebuild b/sys-apps/pmount/pmount-0.9.17.ebuild
index f37eca646cb0..99f7dbcd014b 100644
--- a/sys-apps/pmount/pmount-0.9.17.ebuild
+++ b/sys-apps/pmount/pmount-0.9.17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.17.ebuild,v 1.2 2008/02/21 13:12:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.17.ebuild,v 1.3 2008/04/14 18:38:25 cardoe Exp $
inherit eutils
@@ -15,7 +15,7 @@ IUSE="crypt hal"
RDEPEND="hal? ( >=sys-apps/dbus-0.33 >=sys-apps/hal-0.5.2 )
>=sys-fs/sysfsutils-1.3.0
- crypt? ( || ( >=sys-fs/cryptsetup-1.0.5 sys-fs/cryptsetup-luks ) )"
+ crypt? ( >=sys-fs/cryptsetup-1.0.5 )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.21"