Make pam_console checks work with pam-0.99 thanks to Avuton Olrich <avuton@gmail...

Package-Manager: portage-2.1.2_rc1-r2

diff --git a/sys-power/powersave/ChangeLog b/sys-power/powersave/ChangeLog
index 5e7d43ac0db182c0d98a2d31e806f5f3091b6175..d61251d38aac5ba8aeb7e326317cee770cc67b66 100644 (file)
--- a/sys-power/powersave/ChangeLog
+++ b/sys-power/powersave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/powersave
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powersave/ChangeLog,v 1.9 2006/09/08 19:01:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powersave/ChangeLog,v 1.10 2006/11/02 21:04:44 genstef Exp $
+
+  02 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/powersave-0.13.1-asneeded.patch, -powersave-0.12.21.ebuild,
+  -powersave-0.13.5.ebuild, powersave-0.14.0.ebuild:
+  Make pam_console checks work with pam-0.99 thanks to Avuton Olrich
+  <avuton@gmail.com> in bug 153637
 
   08 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
   powersave-0.14.0.ebuild:

diff --git a/sys-power/powersave/powersave-0.14.0.ebuild b/sys-power/powersave/powersave-0.14.0.ebuild
index 12e064a9ae231c2f3cb0a17f06bf17cac148b51b..28dee422601a3fc88ed63af4468ef74c9aeeaeff 100644 (file)
--- a/sys-power/powersave/powersave-0.14.0.ebuild
+++ b/sys-power/powersave/powersave-0.14.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powersave/powersave-0.14.0.ebuild,v 1.2 2006/09/08 19:01:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powersave/powersave-0.14.0.ebuild,v 1.3 2006/11/02 21:04:44 genstef Exp $
 
 inherit eutils libtool kde-functions autotools
 
@@ -16,7 +16,7 @@ IUSE="pam_console doc"
 RDEPEND="|| ( dev-libs/dbus-glib >=sys-apps/dbus-0.30 )
        >=sys-apps/hal-0.5.3
        >=sys-power/cpufrequtils-001
-       pam_console? ( sys-libs/pam )"
+       pam_console? ( || ( sys-auth/pam_console <sys-libs/pam-0.99 ) )"
 DEPEND="${RDEPEND}
        doc? (
                app-doc/doxygen
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
        )"
 
 pkg_setup() {
-       if use pam_console && ! built_with_use sys-libs/pam pam_console ; then
+       if use pam_console && has_version <sys-libs/pam-0.99 && ! built_with_use sys-libs/pam pam_console ; then
                eerror "You need to build pam with pam_console support"
                eerror "Please remerge sys-libs/pam with USE=pam_console"
                die "pam without pam_console detected"