gentoo auto-resync : 01:03:2024 - 23:41:29

4 files changed, 11 insertions, 92 deletions

diff --git a/net-libs/libtelnet/Manifest b/net-libs/libtelnet/Manifest
index 01b2d613edb9..d9eca70fc5ba 100644
--- a/net-libs/libtelnet/Manifest
+++ b/net-libs/libtelnet/Manifest
@@ -1,5 +1,3 @@
-AUX libtelnet-9999-doc.patch 1317 BLAKE2B 07293a3658b80cccb147a75279ae7f6b9843101a0414233db33d8e4a2b6fd47283dd35a69942aff2f52775c359b5acf67f739434d5161ba13ed84eca62c95c45 SHA512 de7aef7504a3243fe01bcc11a78bc274f8662dc6fa472a1b6ab8fb84a1a518491d2343e4dd9817e6dbb0ba67fbd68406fd85ce4d1ae6e4e6469b3f71c3594d99
 DIST libtelnet-0.23.tar.gz 241922 BLAKE2B 0436c3eb2085c0fc4262f30c86f634af33679a2381a54dbfe92e6f6196b825b100c9c35f78505191b7fea5360a16d9b960e35ff145cd177aaab50968b2fbe946 SHA512 da16a97d04bc6bb5959f431e0aaa03d08ac38e45ba870d7fe6161551ecfdbd5c37a2209cfb40a0f574e6ea0b5c2866c7461cc91d940d5bb5de09fe1584eeb780
-EBUILD libtelnet-0.23-r1.ebuild 771 BLAKE2B 15912266c26f7bfbcd2fcd5baafa6cd97b902037fa43ad335a642bfc83a39ec1ae7ac37e0b95cbfc55696bcd23ab7a564e64e6ebb4f68c1b160f22890a4cdaf5 SHA512 72f6866079adcefcdc92d22d9b53d66939831d8b12fea2111ff4600cc57e815a1a6363fb79681c2733e38cc220efcb8e6f11ba1de0f737a70f8bbdcf7ef9dc25
-EBUILD libtelnet-9999.ebuild 771 BLAKE2B 15912266c26f7bfbcd2fcd5baafa6cd97b902037fa43ad335a642bfc83a39ec1ae7ac37e0b95cbfc55696bcd23ab7a564e64e6ebb4f68c1b160f22890a4cdaf5 SHA512 72f6866079adcefcdc92d22d9b53d66939831d8b12fea2111ff4600cc57e815a1a6363fb79681c2733e38cc220efcb8e6f11ba1de0f737a70f8bbdcf7ef9dc25
+EBUILD libtelnet-0.23-r2.ebuild 622 BLAKE2B 42ed06d3c49d5f2ed84c3eeb67a83b72f5e02283dc0b14207a896b1f0897a0f3b960d7abb8b33114db00ec93548a6cbc133eccb15a0dc14499939b1bdc3edb5f SHA512 f7a3bc295abddadd4dc677d509e46479efc77402749d9f4a6f91fac6ac77a644defb51c3bd03b25596daa46c7af4934411dfba754afc96ee032843e0d5f0044f
 MISC metadata.xml 348 BLAKE2B 2203cf6c479b47de0f66852639fa4a860c2996df8483bedacc088e2ab751e717507e839a9b83c232913fca05d4c9069a9cf1409946030fd45a4fc6554dba5193 SHA512 4204c48e1a0317c9823f3adbddb2fe3df9a3b295c7572705dff567c80d8c3084b95b04b4f67b80ce916220b74ec2e4b40f8bdd687db7bb67c18292ffee06ad10
diff --git a/net-libs/libtelnet/files/libtelnet-9999-doc.patch b/net-libs/libtelnet/files/libtelnet-9999-doc.patch
deleted file mode 100644
index c88f6cc3977b..000000000000
--- a/net-libs/libtelnet/files/libtelnet-9999-doc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4691956375fae84dcfaeb96c1a204a113d8e5a99 Mon Sep 17 00:00:00 2001
-From: Jakov Smolic <jakov.smolic@sartura.hr>
-Date: Tue, 18 Aug 2020 13:22:52 +0200
-Subject: [PATCH] doc: install manpages in standard directory
-
-Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
----
- 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-0.23-r1.ebuild b/net-libs/libtelnet/libtelnet-0.23-r2.ebuild
index f19665475091..6ecf8c0bd972 100644
--- a/net-libs/libtelnet/libtelnet-0.23-r1.ebuild
+++ b/net-libs/libtelnet/libtelnet-0.23-r2.ebuild
@@ -3,20 +3,15 @@
 
 EAPI=8
 
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git"
-	inherit git-r3 cmake
-else
-	inherit autotools
-	SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+inherit autotools
 
 DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library"
 HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
+SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
@@ -27,10 +22,11 @@ BDEPEND="
 
 src_prepare() {
 	default
-	if [[ ${PV} = *9999 ]]; then
-		eapply "${FILESDIR}"/${P}-doc.patch
-		cmake_src_prepare
-	else
-		eautoreconf
-	fi
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/net-libs/libtelnet/libtelnet-9999.ebuild b/net-libs/libtelnet/libtelnet-9999.ebuild
deleted file mode 100644
index f19665475091..000000000000
--- a/net-libs/libtelnet/libtelnet-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/seanmiddleditch/libtelnet.git"
-	inherit git-r3 cmake
-else
-	inherit autotools
-	SRC_URI="https://github.com/seanmiddleditch/libtelnet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple RFC-compliant TELNET implementation as a C library"
-HOMEPAGE="https://github.com/seanmiddleditch/libtelnet"
-
-LICENSE="public-domain"
-SLOT="0"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/doxygen
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} = *9999 ]]; then
-		eapply "${FILESDIR}"/${P}-doc.patch
-		cmake_src_prepare
-	else
-		eautoreconf
-	fi
-}