Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kwrite/
Date: Mon, 22 Aug 2022 18:14:23
Message-Id: 1661191455.12e1e59ecd47675f44b891c85519b50becfdbe74.asturm@gentoo
1 commit: 12e1e59ecd47675f44b891c85519b50becfdbe74
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 22 18:03:16 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 22 18:04:15 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=12e1e59e
7
8 kde-apps/kwrite: Fix build for live ebuilds
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 kde-apps/kwrite/kwrite-22.08.0.ebuild | 10 +++++-----
13 kde-apps/kwrite/kwrite-22.08.49.9999.ebuild | 10 +++++-----
14 kde-apps/kwrite/kwrite-9999.ebuild | 10 +++++-----
15 3 files changed, 15 insertions(+), 15 deletions(-)
16
17 diff --git a/kde-apps/kwrite/kwrite-22.08.0.ebuild b/kde-apps/kwrite/kwrite-22.08.0.ebuild
18 index bd98b98d47..0994c1be1f 100644
19 --- a/kde-apps/kwrite/kwrite-22.08.0.ebuild
20 +++ b/kde-apps/kwrite/kwrite-22.08.0.ebuild
21 @@ -30,7 +30,7 @@ DEPEND="${RDEPEND}"
22 src_prepare() {
23 ecm_src_prepare
24
25 - # these tests are run in dev-libs/libkate
26 + # these tests are run in kde-apps/kate-lib
27 cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
28
29 # delete colliding kate translations
30 @@ -47,8 +47,8 @@ src_configure() {
31 )
32 use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
33
34 - # provided by dev-libs/libkate
35 - append-libs -l"${ESYSROOT}"/usr/$(get_libdir)/libkateprivate.so.${PV}
36 + # provided by kde-apps/kate-lib
37 + append-libs -lkateprivate
38
39 ecm_src_configure
40 }
41 @@ -56,6 +56,6 @@ src_configure() {
42 src_install() {
43 ecm_src_install
44
45 - # provided by dev-libs/libkate
46 - rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.${PV} || die
47 + # provided by kde-apps/kate-lib
48 + rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
49 }
50
51 diff --git a/kde-apps/kwrite/kwrite-22.08.49.9999.ebuild b/kde-apps/kwrite/kwrite-22.08.49.9999.ebuild
52 index 54f653b791..ef64f07c7e 100644
53 --- a/kde-apps/kwrite/kwrite-22.08.49.9999.ebuild
54 +++ b/kde-apps/kwrite/kwrite-22.08.49.9999.ebuild
55 @@ -30,7 +30,7 @@ DEPEND="${RDEPEND}"
56 src_prepare() {
57 ecm_src_prepare
58
59 - # these tests are run in dev-libs/libkate
60 + # these tests are run in kde-apps/kate-lib
61 cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
62
63 # delete colliding kate translations
64 @@ -47,8 +47,8 @@ src_configure() {
65 )
66 use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
67
68 - # provided by dev-libs/libkate
69 - append-libs -l"${ESYSROOT}"/usr/$(get_libdir)/libkateprivate.so.${PV}
70 + # provided by kde-apps/kate-lib
71 + append-libs -lkateprivate
72
73 ecm_src_configure
74 }
75 @@ -56,6 +56,6 @@ src_configure() {
76 src_install() {
77 ecm_src_install
78
79 - # provided by dev-libs/libkate
80 - rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.${PV} || die
81 + # provided by kde-apps/kate-lib
82 + rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
83 }
84
85 diff --git a/kde-apps/kwrite/kwrite-9999.ebuild b/kde-apps/kwrite/kwrite-9999.ebuild
86 index 54f653b791..ef64f07c7e 100644
87 --- a/kde-apps/kwrite/kwrite-9999.ebuild
88 +++ b/kde-apps/kwrite/kwrite-9999.ebuild
89 @@ -30,7 +30,7 @@ DEPEND="${RDEPEND}"
90 src_prepare() {
91 ecm_src_prepare
92
93 - # these tests are run in dev-libs/libkate
94 + # these tests are run in kde-apps/kate-lib
95 cmake_run_in apps/lib cmake_comment_add_subdirectory autotests
96
97 # delete colliding kate translations
98 @@ -47,8 +47,8 @@ src_configure() {
99 )
100 use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
101
102 - # provided by dev-libs/libkate
103 - append-libs -l"${ESYSROOT}"/usr/$(get_libdir)/libkateprivate.so.${PV}
104 + # provided by kde-apps/kate-lib
105 + append-libs -lkateprivate
106
107 ecm_src_configure
108 }
109 @@ -56,6 +56,6 @@ src_configure() {
110 src_install() {
111 ecm_src_install
112
113 - # provided by dev-libs/libkate
114 - rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.${PV} || die
115 + # provided by kde-apps/kate-lib
116 + rm -v "${ED}"/usr/$(get_libdir)/libkateprivate.so.* || die
117 }