Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kopete/
Date: Wed, 03 Jul 2013 07:27:57
Message-Id: 1372836321.e3838554cbe07c01e1169ae4ead1f6638ed7e5fb.kensington@gentoo
1 commit: e3838554cbe07c01e1169ae4ead1f6638ed7e5fb
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 3 07:25:21 2013 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 3 07:25:21 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e3838554
7
8 [kde-base/kopete] Remove failing sed wrt bug #475572.
9
10 It hasn't been necessary for some time as upstream now respects LIB_SUFFIX.
11
12 Package-Manager: portage-2.1.12.11
13
14 ---
15 kde-base/kopete/kopete-4.10.49.9999.ebuild | 9 +--------
16 kde-base/kopete/kopete-4.10.90.ebuild | 9 +--------
17 kde-base/kopete/kopete-9999.ebuild | 9 +--------
18 3 files changed, 3 insertions(+), 24 deletions(-)
19
20 diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild
21 index 0274266..801da8e 100644
22 --- a/kde-base/kopete/kopete-4.10.49.9999.ebuild
23 +++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild
24 @@ -12,7 +12,7 @@ else
25 fi
26
27 KDE_HANDBOOK="optional"
28 -inherit kde4-${KDE_ECLASS} multilib
29 +inherit kde4-${KDE_ECLASS}
30
31 DESCRIPTION="KDE multi-protocol IM client"
32 KEYWORDS=""
33 @@ -114,13 +114,6 @@ DEPEND="${COMMONDEPEND}
34 !aqua? ( x11-proto/scrnsaverproto )
35 "
36
37 -src_prepare() {
38 - sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
39 - -i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
40 -
41 - kde4-${KDE_ECLASS}_src_prepare
42 -}
43 -
44 src_configure() {
45 local x x2
46 # Handle common stuff
47
48 diff --git a/kde-base/kopete/kopete-4.10.90.ebuild b/kde-base/kopete/kopete-4.10.90.ebuild
49 index 06a1baa..e828f57 100644
50 --- a/kde-base/kopete/kopete-4.10.90.ebuild
51 +++ b/kde-base/kopete/kopete-4.10.90.ebuild
52 @@ -5,7 +5,7 @@
53 EAPI=5
54
55 KDE_HANDBOOK="optional"
56 -inherit kde4-base multilib
57 +inherit kde4-base
58
59 DESCRIPTION="KDE multi-protocol IM client"
60 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
61 @@ -107,13 +107,6 @@ DEPEND="${COMMONDEPEND}
62 !aqua? ( x11-proto/scrnsaverproto )
63 "
64
65 -src_prepare() {
66 - sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
67 - -i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
68 -
69 - kde4-base_src_prepare
70 -}
71 -
72 src_configure() {
73 local x x2
74 # Handle common stuff
75
76 diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
77 index 3024e3b..10a370a 100644
78 --- a/kde-base/kopete/kopete-9999.ebuild
79 +++ b/kde-base/kopete/kopete-9999.ebuild
80 @@ -5,7 +5,7 @@
81 EAPI=5
82
83 KDE_HANDBOOK="optional"
84 -inherit kde4-base multilib
85 +inherit kde4-base
86
87 DESCRIPTION="KDE multi-protocol IM client"
88 KEYWORDS=""
89 @@ -107,13 +107,6 @@ DEPEND="${COMMONDEPEND}
90 !aqua? ( x11-proto/scrnsaverproto )
91 "
92
93 -src_prepare() {
94 - sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
95 - -i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
96 -
97 - kde4-base_src_prepare
98 -}
99 -
100 src_configure() {
101 local x x2
102 # Handle common stuff