Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libtelnet/, net-libs/libtelnet/files/
Date: Wed, 19 Aug 2020 14:33:26
Message-Id: 1597847593.a13e1cdc27b95529cd40038763516cd434de102e.sam@gentoo
1 commit: a13e1cdc27b95529cd40038763516cd434de102e
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Tue Aug 18 11:29:57 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 19 14:33:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13e1cdc
7
8 net-libs/libtelnet: install manpages in standard directory
9
10 Closes: https://bugs.gentoo.org/737886
11 Package-Manager: Portage-3.0.3, Repoman-3.0.0
12 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
13 Closes: https://github.com/gentoo/gentoo/pull/17157
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 net-libs/libtelnet/files/libtelnet-9999-doc.patch | 39 +++++++++++++++++++++++
17 net-libs/libtelnet/libtelnet-9999.ebuild | 12 ++++---
18 2 files changed, 47 insertions(+), 4 deletions(-)
19
20 diff --git a/net-libs/libtelnet/files/libtelnet-9999-doc.patch b/net-libs/libtelnet/files/libtelnet-9999-doc.patch
21 new file mode 100644
22 index 00000000000..c88f6cc3977
23 --- /dev/null
24 +++ b/net-libs/libtelnet/files/libtelnet-9999-doc.patch
25 @@ -0,0 +1,39 @@
26 +From 4691956375fae84dcfaeb96c1a204a113d8e5a99 Mon Sep 17 00:00:00 2001
27 +From: Jakov Smolic <jakov.smolic@×××××××.hr>
28 +Date: Tue, 18 Aug 2020 13:22:52 +0200
29 +Subject: [PATCH] doc: install manpages in standard directory
30 +
31 +Signed-off-by: Jakov Smolic <jakov.smolic@×××××××.hr>
32 +---
33 + doc/man/man1/CMakeLists.txt | 4 ++--
34 + doc/man/man3/CMakeLists.txt | 4 ++--
35 + 2 files changed, 4 insertions(+), 4 deletions(-)
36 +
37 +diff --git a/doc/man/man1/CMakeLists.txt b/doc/man/man1/CMakeLists.txt
38 +index 053dc42..0da441c 100644
39 +--- a/doc/man/man1/CMakeLists.txt
40 ++++ b/doc/man/man1/CMakeLists.txt
41 +@@ -1,4 +1,4 @@
42 + install(
43 + FILES telnet-chatd.1 telnet-client.1 telnet-proxy.1
44 +- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
45 +-)
46 +\ No newline at end of file
47 ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
48 ++)
49 +diff --git a/doc/man/man3/CMakeLists.txt b/doc/man/man3/CMakeLists.txt
50 +index b126fea..af40a92 100644
51 +--- a/doc/man/man3/CMakeLists.txt
52 ++++ b/doc/man/man3/CMakeLists.txt
53 +@@ -14,5 +14,5 @@ install(
54 + ${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_zmp_t.3
55 + ${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_mssp_t.3
56 + ${CMAKE_CURRENT_BINARY_DIR}/telnet_telopt_t.3
57 +- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3
58 +-)
59 +\ No newline at end of file
60 ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man3
61 ++)
62 +--
63 +2.26.2
64 +
65
66 diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild
67 index 957f6345e21..44e62916c51 100644
68 --- a/net-libs/libtelnet/libtelnet-9999.ebuild
69 +++ b/net-libs/libtelnet/libtelnet-9999.ebuild
70 @@ -1,9 +1,9 @@
71 -# Copyright 1999-2019 Gentoo Authors
72 +# Copyright 1999-2020 Gentoo Authors
73 # Distributed under the terms of the GNU General Public License v2
74
75 EAPI=7
76
77 -inherit cmake-utils
78 +inherit cmake
79
80 if [[ ${PV} == *9999 ]]; then
81 inherit git-r3
82 @@ -18,7 +18,11 @@ HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
83
84 LICENSE="public-domain"
85 SLOT="0"
86 -IUSE=""
87
88 # needed unconditionally for man pages
89 -DEPEND="app-doc/doxygen"
90 +BDEPEND="app-doc/doxygen"
91 +
92 +PATCHES=(
93 + # https://bugs.gentoo.org/737886
94 + "${FILESDIR}/${P}-doc.patch"
95 +)