1 |
commit: 639d81a0d00a656fa4c94e2cb50002107e15f41b |
2 |
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> |
3 |
AuthorDate: Sat Feb 26 05:46:13 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 26 05:46:13 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=639d81a0 |
7 |
|
8 |
dev-cpp/trantor: Remove old ebuild & patches |
9 |
|
10 |
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de> |
11 |
|
12 |
dev-cpp/trantor/Manifest | 1 - |
13 |
.../files/trantor-1.5.1_GNUInstallDirs.patch | 34 ------------ |
14 |
dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch | 62 ---------------------- |
15 |
dev-cpp/trantor/trantor-1.5.3.ebuild | 49 ----------------- |
16 |
4 files changed, 146 deletions(-) |
17 |
|
18 |
diff --git a/dev-cpp/trantor/Manifest b/dev-cpp/trantor/Manifest |
19 |
index 3e0912219..879cfd20a 100644 |
20 |
--- a/dev-cpp/trantor/Manifest |
21 |
+++ b/dev-cpp/trantor/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST trantor-1.5.3.tar.gz 104794 BLAKE2B 47cebfc81543d050aa26e9aa0ec2fc9a30311ef25ab750dfe0086a917cc6c5588029b839b6c6205c7a23511f570e9d1dd0cbfdb8ef6a6769ee2d06095862c12a SHA512 2d032c59ad1b57bb1711fe99436fbc8eec5400d91bf310986cb4985e2c2ce1143844701a67241d0fe8dc7ab706b828feded3138aef8cf9d5620e581a1a770079 |
24 |
DIST trantor-1.5.4.tar.gz 104945 BLAKE2B bb4c038ef4b98eb127ddab313b9184af9829e1198d5bee295be49ae3d8f6941f11d8b3782056ebb7a779cb454f6e09daee464f597ce623ad1065df943ae47042 SHA512 adb98a78d254b19ec0866cf3bfa06011123fca4553e73702024ebe4cde6d95fb1de29d6894d89362339b82e1a6738b32ffc1a682cbb33ae94354df4a45cda8c7 |
25 |
DIST trantor-1.5.5.tar.gz 106134 BLAKE2B 52af020c2b862532f5a473b7714654d5a1ea93415059aa3675e0c48d630a1b5ef43782a60ca1d09752c1ef9b90dfec19155af39673e25eb0c99dfc40a9dc0ddb SHA512 41068dcefcaf55908735126375b65a83a7d7085f30d5eb14e8d73fa255405ec77164c34b9ef0e5e6da3aeae3e66b9d57d4fca8901d63d4414bf8e857bd25dcd4 |
26 |
|
27 |
diff --git a/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch b/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch |
28 |
deleted file mode 100644 |
29 |
index 2b2b679e8..000000000 |
30 |
--- a/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch |
31 |
+++ /dev/null |
32 |
@@ -1,34 +0,0 @@ |
33 |
-From 68aa2e7d41002d00c5d3bd3c6a7d55b0ebb8154d Mon Sep 17 00:00:00 2001 |
34 |
-From: tastytea <tastytea@××××××××.de> |
35 |
-Date: Mon, 16 Aug 2021 21:43:59 +0200 |
36 |
-Subject: [PATCH] cmake: Use GNUInstallDirs to figure out install dirs. |
37 |
- |
38 |
-And set initial value for INSTALL_BIN_DIR. |
39 |
---- |
40 |
- CMakeLists.txt | 7 ++++--- |
41 |
- 1 file changed, 4 insertions(+), 3 deletions(-) |
42 |
- |
43 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
44 |
-index ad5a1b3..44ca114 100755 |
45 |
---- a/CMakeLists.txt |
46 |
-+++ b/CMakeLists.txt |
47 |
-@@ -11,12 +11,13 @@ set(TRANTOR_PATCH_VERSION 1) |
48 |
- set(TRANTOR_VERSION |
49 |
- ${TRANTOR_MAJOR_VERSION}.${TRANTOR_MINOR_VERSION}.${TRANTOR_PATCH_VERSION}) |
50 |
- |
51 |
-+include(GNUInstallDirs) |
52 |
- # Offer the user the choice of overriding the installation directories |
53 |
--set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries") |
54 |
-+set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") |
55 |
- set(INSTALL_INCLUDE_DIR |
56 |
-- include |
57 |
-+ ${CMAKE_INSTALL_INCLUDEDIR} |
58 |
- CACHE PATH "Installation directory for header files") |
59 |
--set(DEF_INSTALL_TRANTOR_CMAKE_DIR lib/cmake/Trantor) |
60 |
-+set(DEF_INSTALL_TRANTOR_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/Trantor) |
61 |
- set(INSTALL_TRANTOR_CMAKE_DIR |
62 |
- ${DEF_INSTALL_TRANTOR_CMAKE_DIR} |
63 |
- CACHE PATH "Installation directory for cmake files") |
64 |
--- |
65 |
-2.31.1 |
66 |
- |
67 |
|
68 |
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 |
69 |
deleted file mode 100644 |
70 |
index 683d987ce..000000000 |
71 |
--- a/dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch |
72 |
+++ /dev/null |
73 |
@@ -1,62 +0,0 @@ |
74 |
-From ce8bbc196f12ebcfc180e9ab546e9a395afceb88 Mon Sep 17 00:00:00 2001 |
75 |
-From: marty1885 <marty188586@×××××.com> |
76 |
-Date: Tue, 26 Oct 2021 08:37:21 +0800 |
77 |
-Subject: [PATCH] make sure resolvers are added when C-Ares is manually |
78 |
- disabled |
79 |
- |
80 |
---- |
81 |
- CMakeLists.txt | 37 +++++++++++++++++++++---------------- |
82 |
- 1 file changed, 21 insertions(+), 16 deletions(-) |
83 |
- |
84 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
85 |
-index 49872ef..ade3fe3 100755 |
86 |
---- a/CMakeLists.txt |
87 |
-+++ b/CMakeLists.txt |
88 |
-@@ -131,26 +131,31 @@ if(OpenSSL_FOUND) |
89 |
- target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OPENSSL) |
90 |
- endif() |
91 |
- |
92 |
-+set(HAVE_C-ARES NO) |
93 |
- if (BUILD_C-ARES) |
94 |
- find_package(c-ares) |
95 |
- if(c-ares_FOUND) |
96 |
- message(STATUS "c-ares found!") |
97 |
-- target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) |
98 |
-- set(TRANTOR_SOURCES |
99 |
-- ${TRANTOR_SOURCES} |
100 |
-- trantor/net/inner/AresResolver.cc) |
101 |
-- set(private_headers |
102 |
-- ${private_headers} |
103 |
-- trantor/net/inner/AresResolver.h) |
104 |
-- else(c-ares_FOUND) |
105 |
-- set(TRANTOR_SOURCES |
106 |
-- ${TRANTOR_SOURCES} |
107 |
-- trantor/net/inner/NormalResolver.cc) |
108 |
-- set(private_headers |
109 |
-- ${private_headers} |
110 |
-- trantor/net/inner/NormalResolver.h) |
111 |
-- endif(c-ares_FOUND) |
112 |
--endif (BUILD_C-ARES) |
113 |
-+ set(HAVE_C-ARES TRUE) |
114 |
-+ endif() |
115 |
-+endif () |
116 |
-+ |
117 |
-+if(HAVE_C-ARES) |
118 |
-+ target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) |
119 |
-+ set(TRANTOR_SOURCES |
120 |
-+ ${TRANTOR_SOURCES} |
121 |
-+ trantor/net/inner/AresResolver.cc) |
122 |
-+ set(private_headers |
123 |
-+ ${private_headers} |
124 |
-+ trantor/net/inner/AresResolver.h) |
125 |
-+else() |
126 |
-+ set(TRANTOR_SOURCES |
127 |
-+ ${TRANTOR_SOURCES} |
128 |
-+ trantor/net/inner/NormalResolver.cc) |
129 |
-+ set(private_headers |
130 |
-+ ${private_headers} |
131 |
-+ trantor/net/inner/NormalResolver.h) |
132 |
-+endif() |
133 |
- |
134 |
- find_package(Threads) |
135 |
- target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads) |
136 |
|
137 |
diff --git a/dev-cpp/trantor/trantor-1.5.3.ebuild b/dev-cpp/trantor/trantor-1.5.3.ebuild |
138 |
deleted file mode 100644 |
139 |
index ab1fc953c..000000000 |
140 |
--- a/dev-cpp/trantor/trantor-1.5.3.ebuild |
141 |
+++ /dev/null |
142 |
@@ -1,49 +0,0 @@ |
143 |
-# Copyright 2021 Gentoo Authors |
144 |
-# Distributed under the terms of the GNU General Public License v2 |
145 |
- |
146 |
-EAPI=8 |
147 |
- |
148 |
-inherit cmake |
149 |
- |
150 |
-DESCRIPTION="Non-blocking I/O tcp network lib based on c++14/17" |
151 |
-HOMEPAGE="https://github.com/an-tao/trantor" |
152 |
-SRC_URI="https://github.com/an-tao/trantor/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" |
153 |
- |
154 |
-LICENSE="BSD" |
155 |
-SLOT="0" |
156 |
-KEYWORDS="~amd64" |
157 |
-IUSE="adns doc +ssl test" |
158 |
-RESTRICT="!test? ( test )" |
159 |
- |
160 |
-RDEPEND=" |
161 |
- adns? ( net-dns/c-ares ) |
162 |
- ssl? ( dev-libs/openssl ) |
163 |
-" |
164 |
-DEPEND=" |
165 |
- ${RDEPEND} |
166 |
- test? ( dev-cpp/gtest ) |
167 |
-" |
168 |
-BDEPEND="doc? ( app-doc/doxygen )" |
169 |
- |
170 |
-src_prepare() { |
171 |
- use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die |
172 |
- |
173 |
- cmake_src_prepare |
174 |
-} |
175 |
- |
176 |
-src_configure() { |
177 |
- local -a mycmakeargs=( |
178 |
- "-DBUILD_TRANTOR_SHARED=YES" |
179 |
- "-DBUILD_DOC=$(usex doc)" |
180 |
- "-DBUILD_TESTING=$(usex test)" |
181 |
- "-DBUILD_C-ARES=$(usex adns)" |
182 |
- ) |
183 |
- |
184 |
- cmake_src_configure |
185 |
-} |
186 |
- |
187 |
-src_install() { |
188 |
- use doc && HTML_DOCS="${BUILD_DIR}/docs/trantor/html/*" |
189 |
- |
190 |
- cmake_src_install |
191 |
-} |