diff options
| -rw-r--r-- | kde-base/kscreensaver/ChangeLog | 14 | ||||
| -rw-r--r-- | kde-base/kscreensaver/files/kdebase-4.0.1-pam-optional.patch | 29 | ||||
| -rw-r--r-- | kde-base/kscreensaver/kscreensaver-4.0.1.ebuild | 33 |
3 files changed, 13 insertions, 63 deletions
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog index bc4f888c63b4..2fb5c9a654a6 100644 --- a/kde-base/kscreensaver/ChangeLog +++ b/kde-base/kscreensaver/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for kde-base/kscreensaver # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.84 2008/03/10 23:51:40 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.85 2008/03/20 17:53:14 ingmar Exp $ + + 20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -files/kdebase-4.0.1-pam-optional.patch, -kscreensaver-4.0.1.ebuild: + Old. + + 20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -files/kdebase-4.0.1-pam-optional.patch, -kscreensaver-4.0.1.ebuild: + Old. + + 20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -files/kdebase-4.0.1-pam-optional.patch, -kscreensaver-4.0.1.ebuild: + Old. *kscreensaver-4.0.2 (10 Mar 2008) diff --git a/kde-base/kscreensaver/files/kdebase-4.0.1-pam-optional.patch b/kde-base/kscreensaver/files/kdebase-4.0.1-pam-optional.patch deleted file mode 100644 index 6fb54f05c547..000000000000 --- a/kde-base/kscreensaver/files/kdebase-4.0.1-pam-optional.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake -index 3499836..cd1c2bb 100644 ---- a/kdebase/workspace/cmake/modules/FindPAM.cmake -+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake -@@ -5,6 +5,8 @@ - # PAM_INCLUDE_DIR - the pam include directory - # PAM_LIBRARIES - libpam library - -+if (WITH_PAM) -+ - if (PAM_INCLUDE_DIR AND PAM_LIBRARY) - # Already in cache, be silent - set(PAM_FIND_QUIETLY TRUE) -@@ -72,3 +74,5 @@ else (PAM_FOUND) - endif (PAM_FOUND) - - mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST) -+ -+endif (WITH_PAM) -diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake -index ed8ab9e..ce3bcc2 100644 ---- a/kdebase/workspace/cmake/modules/UnixAuth.cmake -+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake -@@ -1,4 +1,4 @@ --find_package(PAM) -+macro_optional_find_package(PAM) - - set(UNIXAUTH_LIBRARIES) - set(UNIXAUTH_INCLUDE_DIRS) diff --git a/kde-base/kscreensaver/kscreensaver-4.0.1.ebuild b/kde-base/kscreensaver/kscreensaver-4.0.1.ebuild deleted file mode 100644 index ca23708c7737..000000000000 --- a/kde-base/kscreensaver/kscreensaver-4.0.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.0.1.ebuild,v 1.2 2008/03/04 03:09:08 jer Exp $ - -EAPI="1" - -KMNAME=kdebase-workspace -inherit kde4-meta - -DESCRIPTION="KDE screensaver framework" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="debug opengl pam" - -COMMONDEPEND=" - dev-libs/glib - >=x11-libs/libxklavier-3.2 - >=x11-libs/libXrandr-1.2.1 - x11-libs/libXtst - opengl? ( virtual/opengl ) - pam? ( >=kde-base/kdebase-pam-7 - sys-libs/pam )" -DEPEND="${COMMONDEPEND} - x11-proto/randrproto" -RDEPEND="${COMMONDEPEND}" - -PATCHES="${FILESDIR}/kdebase-${PV}-pam-optional.patch" - -src_compile() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with pam PAM)" - kde4-meta_src_compile -} |