[gentoo-commits] repo/proj/guru:master commit in: dev-cpp/trantor/files/, dev-cpp/trantor/

["Florian Schmaus" <flow@gentoo.org>]

commit:     639d81a0d00a656fa4c94e2cb50002107e15f41b
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sat Feb 26 05:46:13 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 05:46:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=639d81a0

dev-cpp/trantor: Remove old ebuild & patches

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>

 dev-cpp/trantor/Manifest                           |  1 -
 .../files/trantor-1.5.1_GNUInstallDirs.patch       | 34 ------------
 dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch | 62 ----------------------
 dev-cpp/trantor/trantor-1.5.3.ebuild               | 49 -----------------
 4 files changed, 146 deletions(-)

diff --git a/dev-cpp/trantor/Manifest b/dev-cpp/trantor/Manifest
index 3e0912219..879cfd20a 100644
--- a/dev-cpp/trantor/Manifest
+++ b/dev-cpp/trantor/Manifest
@@ -1,3 +1,2 @@
-DIST trantor-1.5.3.tar.gz 104794 BLAKE2B 47cebfc81543d050aa26e9aa0ec2fc9a30311ef25ab750dfe0086a917cc6c5588029b839b6c6205c7a23511f570e9d1dd0cbfdb8ef6a6769ee2d06095862c12a SHA512 2d032c59ad1b57bb1711fe99436fbc8eec5400d91bf310986cb4985e2c2ce1143844701a67241d0fe8dc7ab706b828feded3138aef8cf9d5620e581a1a770079
 DIST trantor-1.5.4.tar.gz 104945 BLAKE2B bb4c038ef4b98eb127ddab313b9184af9829e1198d5bee295be49ae3d8f6941f11d8b3782056ebb7a779cb454f6e09daee464f597ce623ad1065df943ae47042 SHA512 adb98a78d254b19ec0866cf3bfa06011123fca4553e73702024ebe4cde6d95fb1de29d6894d89362339b82e1a6738b32ffc1a682cbb33ae94354df4a45cda8c7
 DIST trantor-1.5.5.tar.gz 106134 BLAKE2B 52af020c2b862532f5a473b7714654d5a1ea93415059aa3675e0c48d630a1b5ef43782a60ca1d09752c1ef9b90dfec19155af39673e25eb0c99dfc40a9dc0ddb SHA512 41068dcefcaf55908735126375b65a83a7d7085f30d5eb14e8d73fa255405ec77164c34b9ef0e5e6da3aeae3e66b9d57d4fca8901d63d4414bf8e857bd25dcd4

diff --git a/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch b/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch
deleted file mode 100644
index 2b2b679e8..000000000
--- a/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 68aa2e7d41002d00c5d3bd3c6a7d55b0ebb8154d Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Mon, 16 Aug 2021 21:43:59 +0200
-Subject: [PATCH] cmake: Use GNUInstallDirs to figure out install dirs.
-
-And set initial value for INSTALL_BIN_DIR.
----
- CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ad5a1b3..44ca114 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,12 +11,13 @@ set(TRANTOR_PATCH_VERSION 1)
- set(TRANTOR_VERSION
-     ${TRANTOR_MAJOR_VERSION}.${TRANTOR_MINOR_VERSION}.${TRANTOR_PATCH_VERSION})
- 
-+include(GNUInstallDirs)
- # Offer the user the choice of overriding the installation directories
--set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
-+set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
- set(INSTALL_INCLUDE_DIR
--    include
-+    ${CMAKE_INSTALL_INCLUDEDIR}
-     CACHE PATH "Installation directory for header files")
--set(DEF_INSTALL_TRANTOR_CMAKE_DIR lib/cmake/Trantor)
-+set(DEF_INSTALL_TRANTOR_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/Trantor)
- set(INSTALL_TRANTOR_CMAKE_DIR
-     ${DEF_INSTALL_TRANTOR_CMAKE_DIR}
-     CACHE PATH "Installation directory for cmake files")
--- 
-2.31.1
-

diff --git a/dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch b/dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch
deleted file mode 100644
index 683d987ce..000000000
--- a/dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ce8bbc196f12ebcfc180e9ab546e9a395afceb88 Mon Sep 17 00:00:00 2001
-From: marty1885 <marty188586@gmail.com>
-Date: Tue, 26 Oct 2021 08:37:21 +0800
-Subject: [PATCH] make sure resolvers are added when C-Ares is manually
- disabled
-
----
- CMakeLists.txt | 37 +++++++++++++++++++++----------------
- 1 file changed, 21 insertions(+), 16 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 49872ef..ade3fe3 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -131,26 +131,31 @@ if(OpenSSL_FOUND)
-   target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OPENSSL)
- endif()
- 
-+set(HAVE_C-ARES NO)
- if (BUILD_C-ARES)
-     find_package(c-ares)
-     if(c-ares_FOUND)
-       message(STATUS "c-ares found!")
--      target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib)
--      set(TRANTOR_SOURCES
--          ${TRANTOR_SOURCES}
--          trantor/net/inner/AresResolver.cc)
--      set(private_headers
--          ${private_headers}
--          trantor/net/inner/AresResolver.h)
--    else(c-ares_FOUND)
--      set(TRANTOR_SOURCES
--          ${TRANTOR_SOURCES}
--          trantor/net/inner/NormalResolver.cc)
--      set(private_headers
--          ${private_headers}
--          trantor/net/inner/NormalResolver.h)
--    endif(c-ares_FOUND)
--endif (BUILD_C-ARES)
-+      set(HAVE_C-ARES TRUE)
-+    endif()
-+endif ()
-+
-+if(HAVE_C-ARES)
-+  target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib)
-+  set(TRANTOR_SOURCES
-+      ${TRANTOR_SOURCES}
-+      trantor/net/inner/AresResolver.cc)
-+  set(private_headers
-+      ${private_headers}
-+      trantor/net/inner/AresResolver.h)
-+else()
-+  set(TRANTOR_SOURCES
-+      ${TRANTOR_SOURCES}
-+      trantor/net/inner/NormalResolver.cc)
-+  set(private_headers
-+      ${private_headers}
-+      trantor/net/inner/NormalResolver.h)
-+endif()
- 
- find_package(Threads)
- target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)

diff --git a/dev-cpp/trantor/trantor-1.5.3.ebuild b/dev-cpp/trantor/trantor-1.5.3.ebuild
deleted file mode 100644
index ab1fc953c..000000000
--- a/dev-cpp/trantor/trantor-1.5.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Non-blocking I/O tcp network lib based on c++14/17"
-HOMEPAGE="https://github.com/an-tao/trantor"
-SRC_URI="https://github.com/an-tao/trantor/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="adns doc +ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	adns? ( net-dns/c-ares )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		"-DBUILD_TRANTOR_SHARED=YES"
-		"-DBUILD_DOC=$(usex doc)"
-		"-DBUILD_TESTING=$(usex test)"
-		"-DBUILD_C-ARES=$(usex adns)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS="${BUILD_DIR}/docs/trantor/html/*"
-
-	cmake_src_install
-}