| 1 |
commit: 5022f268d5169b0d6ae03fb2018248bc71639853 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 3 14:35:13 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 3 14:35:13 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5022f268 |
| 7 |
|
| 8 |
[kde-base/kscreensaver] Remove patch for pam here, because it has no effect. Patched libkworkspace instead bug 398333. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/kdebase-4.0.2-pam-optional.patch | 29 -------------------- |
| 14 |
.../kscreensaver/kscreensaver-4.8.49.9999.ebuild | 1 - |
| 15 |
kde-base/kscreensaver/kscreensaver-9999.ebuild | 1 - |
| 16 |
3 files changed, 0 insertions(+), 31 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 6fb54f0..0000000 |
| 21 |
--- a/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,29 +0,0 @@ |
| 24 |
-diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake |
| 25 |
-index 3499836..cd1c2bb 100644 |
| 26 |
---- a/kdebase/workspace/cmake/modules/FindPAM.cmake |
| 27 |
-+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake |
| 28 |
-@@ -5,6 +5,8 @@ |
| 29 |
- # PAM_INCLUDE_DIR - the pam include directory |
| 30 |
- # PAM_LIBRARIES - libpam library |
| 31 |
- |
| 32 |
-+if (WITH_PAM) |
| 33 |
-+ |
| 34 |
- if (PAM_INCLUDE_DIR AND PAM_LIBRARY) |
| 35 |
- # Already in cache, be silent |
| 36 |
- set(PAM_FIND_QUIETLY TRUE) |
| 37 |
-@@ -72,3 +74,5 @@ else (PAM_FOUND) |
| 38 |
- endif (PAM_FOUND) |
| 39 |
- |
| 40 |
- mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST) |
| 41 |
-+ |
| 42 |
-+endif (WITH_PAM) |
| 43 |
-diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake |
| 44 |
-index ed8ab9e..ce3bcc2 100644 |
| 45 |
---- a/kdebase/workspace/cmake/modules/UnixAuth.cmake |
| 46 |
-+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake |
| 47 |
-@@ -1,4 +1,4 @@ |
| 48 |
--find_package(PAM) |
| 49 |
-+macro_optional_find_package(PAM) |
| 50 |
- |
| 51 |
- set(UNIXAUTH_LIBRARIES) |
| 52 |
- set(UNIXAUTH_INCLUDE_DIRS) |
| 53 |
|
| 54 |
diff --git a/kde-base/kscreensaver/kscreensaver-4.8.49.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.8.49.9999.ebuild |
| 55 |
index 10029c0..cbcbdfa 100644 |
| 56 |
--- a/kde-base/kscreensaver/kscreensaver-4.8.49.9999.ebuild |
| 57 |
+++ b/kde-base/kscreensaver/kscreensaver-4.8.49.9999.ebuild |
| 58 |
@@ -26,7 +26,6 @@ DEPEND="${RDEPEND} |
| 59 |
" |
| 60 |
|
| 61 |
PATCHES=( |
| 62 |
- "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" |
| 63 |
"${FILESDIR}/${PN}-4.5.95-nsfw.patch" |
| 64 |
"${FILESDIR}/${PN}-4.6.4-xf86misc.patch" |
| 65 |
) |
| 66 |
|
| 67 |
diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild |
| 68 |
index 10029c0..cbcbdfa 100644 |
| 69 |
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild |
| 70 |
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild |
| 71 |
@@ -26,7 +26,6 @@ DEPEND="${RDEPEND} |
| 72 |
" |
| 73 |
|
| 74 |
PATCHES=( |
| 75 |
- "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" |
| 76 |
"${FILESDIR}/${PN}-4.5.95-nsfw.patch" |
| 77 |
"${FILESDIR}/${PN}-4.6.4-xf86misc.patch" |
| 78 |
) |
Archives