Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: app-editors/kile/files/, app-editors/kile/
Date: Thu, 24 Nov 2022 21:12:11
Message-Id: 1669324267.ecce1571fdd32054b3320e04eca671411723d315.asturm@gentoo
1 commit: ecce1571fdd32054b3320e04eca671411723d315
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 23 19:07:21 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 24 21:11:07 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ecce1571
7
8 app-editors/kile: fix handling of misc files installation
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 .../kile/files/kile-2.9.93_p20221123-cmake.patch | 31 ++++++++++++++++++++++
13 app-editors/kile/kile-9999.ebuild | 10 ++-----
14 2 files changed, 33 insertions(+), 8 deletions(-)
15
16 diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch b/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch
17 new file mode 100644
18 index 0000000000..0095adf954
19 --- /dev/null
20 +++ b/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch
21 @@ -0,0 +1,31 @@
22 +From 2974fba837aef46711d9e1b26cd367aab68ba53a Mon Sep 17 00:00:00 2001
23 +From: Andreas Sturmlechner <asturm@g.o>
24 +Date: Wed, 19 Dec 2018 13:36:12 +0100
25 +Subject: [PATCH] Disable install misc files by cmake
26 +
27 +AUTHORS, README, Changelog etc. are handled by distribution packages.
28 +---
29 + CMakeLists.txt | 7 -------
30 + 1 file changed, 7 deletions(-)
31 +
32 +diff --git a/CMakeLists.txt b/CMakeLists.txt
33 +index 91a732ab..c69c168c 100644
34 +--- a/CMakeLists.txt
35 ++++ b/CMakeLists.txt
36 +@@ -114,13 +114,6 @@ install(
37 + kile2.0-5_upd.pl
38 + DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
39 +
40 +-install(FILES
41 +- AUTHORS
42 +- ChangeLog
43 +- README
44 +- README.cwl
45 +- kile-remote-control.txt
46 +- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
47 +
48 + ki18n_install(po)
49 +
50 +--
51 +2.38.1
52 +
53
54 diff --git a/app-editors/kile/kile-9999.ebuild b/app-editors/kile/kile-9999.ebuild
55 index d8da13a4e4..1e921508fd 100644
56 --- a/app-editors/kile/kile-9999.ebuild
57 +++ b/app-editors/kile/kile-9999.ebuild
58 @@ -58,17 +58,11 @@ RDEPEND="${DEPEND}
59 )
60 "
61
62 -S=${WORKDIR}/${MY_P}
63 -
64 DOCS=( kile-remote-control.txt )
65
66 -src_prepare() {
67 - ecm_src_prepare
68 +S=${WORKDIR}/${MY_P}
69
70 - # I know upstream wants to help us but it doesn't work..
71 - sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
72 - -i CMakeLists.txt || die
73 -}
74 +PATCHES=( "${FILESDIR}/${PN}-2.9.93_p20221123-cmake.patch" )
75
76 src_configure() {
77 local mycmakeargs=(