diff options
| author | Johannes Huber <johu@gentoo.org> | 2012-02-03 15:14:25 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-02-03 15:14:25 +0100 |
| commit | e804d3a225c430b0c1deae5f7f1ea7aabcb82712 (patch) | |
| tree | bc2ad8de4e01b518cac414dd71cf7726389c09f0 | |
| parent | 6771016c9d7c18c3d1591e8cd1a2640d86e3d8cf (diff) | |
| download | kde-e804d3a225c430b0c1deae5f7f1ea7aabcb82712.tar.gz kde-e804d3a225c430b0c1deae5f7f1ea7aabcb82712.tar.bz2 kde-e804d3a225c430b0c1deae5f7f1ea7aabcb82712.zip | |
[kde-base/kdm] Remove patch for pam here, because it has no effect. Patched libkworkspace instead bug 398333.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch | 29 | ||||
| -rw-r--r-- | kde-base/kdm/kdm-4.8.49.9999.ebuild | 1 | ||||
| -rw-r--r-- | kde-base/kdm/kdm-9999.ebuild | 1 |
3 files changed, 0 insertions, 31 deletions
diff --git a/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch deleted file mode 100644 index 6fb54f05c54..00000000000 --- a/kde-base/kdm/files/kdebase-4.0.2-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/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.49.9999.ebuild index ed4932fecfc..93e9fec948f 100644 --- a/kde-base/kdm/kdm-4.8.49.9999.ebuild +++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild @@ -38,7 +38,6 @@ KMEXTRA=" " PATCHES=( - "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" ) diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild index ed4932fecfc..93e9fec948f 100644 --- a/kde-base/kdm/kdm-9999.ebuild +++ b/kde-base/kdm/kdm-9999.ebuild @@ -38,7 +38,6 @@ KMEXTRA=" " PATCHES=( - "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" ) |