From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9170A138359 for ; Wed, 19 Aug 2020 14:33:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7135DE0964; Wed, 19 Aug 2020 14:33:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55FD0E0961 for ; Wed, 19 Aug 2020 14:33:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB59F34F48F for ; Wed, 19 Aug 2020 14:33:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A92431C for ; Wed, 19 Aug 2020 14:33:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1597847593.a13e1cdc27b95529cd40038763516cd434de102e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libtelnet/, net-libs/libtelnet/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libtelnet/files/libtelnet-9999-doc.patch net-libs/libtelnet/libtelnet-9999.ebuild X-VCS-Directories: net-libs/libtelnet/files/ net-libs/libtelnet/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a13e1cdc27b95529cd40038763516cd434de102e X-VCS-Branch: master Date: Wed, 19 Aug 2020 14:33:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b220794-2b0a-4051-a9ca-047120228ae1 X-Archives-Hash: bcd9bab9acc4e290b036c46c36844f5e commit: a13e1cdc27b95529cd40038763516cd434de102e Author: Jakov Smolic sartura hr> AuthorDate: Tue Aug 18 11:29:57 2020 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 19 14:33:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13e1cdc net-libs/libtelnet: install manpages in standard directory Closes: https://bugs.gentoo.org/737886 Package-Manager: Portage-3.0.3, Repoman-3.0.0 Signed-off-by: Jakov Smolic sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/17157 Signed-off-by: Sam James gentoo.org> net-libs/libtelnet/files/libtelnet-9999-doc.patch | 39 +++++++++++++++++++++++ net-libs/libtelnet/libtelnet-9999.ebuild | 12 ++++--- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/net-libs/libtelnet/files/libtelnet-9999-doc.patch b/net-libs/libtelnet/files/libtelnet-9999-doc.patch new file mode 100644 index 00000000000..c88f6cc3977 --- /dev/null +++ b/net-libs/libtelnet/files/libtelnet-9999-doc.patch @@ -0,0 +1,39 @@ +From 4691956375fae84dcfaeb96c1a204a113d8e5a99 Mon Sep 17 00:00:00 2001 +From: Jakov Smolic +Date: Tue, 18 Aug 2020 13:22:52 +0200 +Subject: [PATCH] doc: install manpages in standard directory + +Signed-off-by: Jakov Smolic +--- + doc/man/man1/CMakeLists.txt | 4 ++-- + doc/man/man3/CMakeLists.txt | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/man/man1/CMakeLists.txt b/doc/man/man1/CMakeLists.txt +index 053dc42..0da441c 100644 +--- a/doc/man/man1/CMakeLists.txt ++++ b/doc/man/man1/CMakeLists.txt +@@ -1,4 +1,4 @@ + install( + FILES telnet-chatd.1 telnet-client.1 telnet-proxy.1 +- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1 +-) +\ No newline at end of file ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 ++) +diff --git a/doc/man/man3/CMakeLists.txt b/doc/man/man3/CMakeLists.txt +index b126fea..af40a92 100644 +--- a/doc/man/man3/CMakeLists.txt ++++ b/doc/man/man3/CMakeLists.txt +@@ -14,5 +14,5 @@ install( + ${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_zmp_t.3 + ${CMAKE_CURRENT_BINARY_DIR}/telnet_event_t_mssp_t.3 + ${CMAKE_CURRENT_BINARY_DIR}/telnet_telopt_t.3 +- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3 +-) +\ No newline at end of file ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man3 ++) +-- +2.26.2 + diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild index 957f6345e21..44e62916c51 100644 --- a/net-libs/libtelnet/libtelnet-9999.ebuild +++ b/net-libs/libtelnet/libtelnet-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils +inherit cmake if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -18,7 +18,11 @@ HOMEPAGE="https://github.com/seanmiddleditch/libtelnet" LICENSE="public-domain" SLOT="0" -IUSE="" # needed unconditionally for man pages -DEPEND="app-doc/doxygen" +BDEPEND="app-doc/doxygen" + +PATCHES=( + # https://bugs.gentoo.org/737886 + "${FILESDIR}/${P}-doc.patch" +)