Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/libkworkspace/files/, kde-base/libkworkspace/
Date: Fri, 03 Feb 2012 15:03:21
Message-Id: 5b5ce3282bfb45bce44f5f7105e46322aa09ba10.johu@gentoo
1 commit: 5b5ce3282bfb45bce44f5f7105e46322aa09ba10
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 3 14:59:20 2012 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 3 14:59:20 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5b5ce328
7
8 [kde-base/libkworkspace] Remove patch, applied upstream.
9
10 (Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 .../files/libkworkspace-4.8.0-pam-optional.patch | 10 ----------
14 .../libkworkspace/libkworkspace-4.8.49.9999.ebuild | 4 ----
15 kde-base/libkworkspace/libkworkspace-9999.ebuild | 4 ----
16 3 files changed, 0 insertions(+), 18 deletions(-)
17
18 diff --git a/kde-base/libkworkspace/files/libkworkspace-4.8.0-pam-optional.patch b/kde-base/libkworkspace/files/libkworkspace-4.8.0-pam-optional.patch
19 deleted file mode 100644
20 index 263766a..0000000
21 --- a/kde-base/libkworkspace/files/libkworkspace-4.8.0-pam-optional.patch
22 +++ /dev/null
23 @@ -1,10 +0,0 @@
24 -diff --git a/cmake/modules/UnixAuth.cmake b/cmake/modules/UnixAuth.cmake
25 -index 904f0cb..0347251 100644
26 ---- a/cmake/modules/UnixAuth.cmake
27 -+++ b/cmake/modules/UnixAuth.cmake
28 -@@ -1,4 +1,4 @@
29 --find_package(PAM)
30 -+macro_optional_find_package(PAM)
31 -
32 - include(CheckFunctionExists)
33 - include(CheckLibraryExists)
34
35 diff --git a/kde-base/libkworkspace/libkworkspace-4.8.49.9999.ebuild b/kde-base/libkworkspace/libkworkspace-4.8.49.9999.ebuild
36 index 5b6f636..d366d3e 100644
37 --- a/kde-base/libkworkspace/libkworkspace-4.8.49.9999.ebuild
38 +++ b/kde-base/libkworkspace/libkworkspace-4.8.49.9999.ebuild
39 @@ -25,10 +25,6 @@ DEPEND="
40 "
41 RDEPEND=${DEPEND}
42
43 -PATCHES=(
44 - "${FILESDIR}/${PN}-4.8.0-pam-optional.patch"
45 -)
46 -
47 src_prepare() {
48 sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
49 libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
50
51 diff --git a/kde-base/libkworkspace/libkworkspace-9999.ebuild b/kde-base/libkworkspace/libkworkspace-9999.ebuild
52 index 5b6f636..d366d3e 100644
53 --- a/kde-base/libkworkspace/libkworkspace-9999.ebuild
54 +++ b/kde-base/libkworkspace/libkworkspace-9999.ebuild
55 @@ -25,10 +25,6 @@ DEPEND="
56 "
57 RDEPEND=${DEPEND}
58
59 -PATCHES=(
60 - "${FILESDIR}/${PN}-4.8.0-pam-optional.patch"
61 -)
62 -
63 src_prepare() {
64 sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
65 libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"