Gentoo Archives: gentoo-commits

From: Ronny Gutbrod <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/drogon/files/, dev-cpp/drogon/
Date: Wed, 20 Oct 2021 19:08:02
Message-Id: 1634756743.b93ab49cb28826409ac1c1baa4ab0775634485af.tastytea@gentoo
1 commit: b93ab49cb28826409ac1c1baa4ab0775634485af
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Wed Oct 20 18:30:22 2021 +0000
4 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
5 CommitDate: Wed Oct 20 19:05:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b93ab49c
7
8 dev-cpp/drogon: Remove old ebuild.
9
10 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
11
12 dev-cpp/drogon/Manifest | 1 -
13 dev-cpp/drogon/drogon-1.7.1.ebuild | 64 ----------------------
14 .../drogon/files/drogon-1.7.1_GNUInstallDirs.patch | 33 -----------
15 3 files changed, 98 deletions(-)
16
17 diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest
18 index 90c964273..d277ad961 100644
19 --- a/dev-cpp/drogon/Manifest
20 +++ b/dev-cpp/drogon/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST drogon-1.7.1.tar.gz 465299 BLAKE2B 72ddcc050333f6ff8d0749c3de5a4db80cf5f36613253d90abcbf8983aa53db44a6a4e71b73cc42c0596684b7a56a1cb69faa348652c0fc673e6be7d3ad383b3 SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6
23 DIST drogon-1.7.2.tar.gz 475266 BLAKE2B dff7cdf76b4d30a7cd44f50efcf3b683eefe06e7b0be1fe167f1891370c55ee76b8f6e14582cbfdf0f2b129211301fd9b97e4dc4db313f28fccb21ca6271a57a SHA512 0546a7a6a1a1e9e1ec068cd45d747ccdd62a9bd9042db4941c004fbe795d051b8d115a71f8000352a2d284f141ebad9b66438dfabc255bb24c92bd5a3dc0ed8a
24 DIST drogon-1.7.3.tar.gz 483306 BLAKE2B b5b89f678f285de6533480d403725f172b40f1c97057b3234dc5a9456c1e13f3d3b2a11769e78a16199495584a9a411ccdd375090b3770acdff24054bba75060 SHA512 20146bf59898704f3b44778fa46e919d9124ef8a33eb1cfcce7f437507c20920829a0074e1c9e2493a1764b8a36b1a91b03f117fd78e740253b15d2146dca628
25
26 diff --git a/dev-cpp/drogon/drogon-1.7.1.ebuild b/dev-cpp/drogon/drogon-1.7.1.ebuild
27 deleted file mode 100644
28 index ce75c0321..000000000
29 --- a/dev-cpp/drogon/drogon-1.7.1.ebuild
30 +++ /dev/null
31 @@ -1,64 +0,0 @@
32 -# Copyright 2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit cmake
38 -
39 -DESCRIPTION="C++14/17 based HTTP web application framework"
40 -HOMEPAGE="https://github.com/drogonframework/drogon"
41 -SRC_URI="https://github.com/drogonframework/drogon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
42 -
43 -LICENSE="MIT"
44 -SLOT="0"
45 -KEYWORDS="~amd64"
46 -IUSE="+brotli examples mariadb postgres redis sqlite +ssl test"
47 -RESTRICT="!test? ( test )"
48 -
49 -RDEPEND="
50 - dev-cpp/trantor
51 - dev-libs/jsoncpp
52 - sys-libs/zlib
53 - brotli? ( app-arch/brotli )
54 - mariadb? ( dev-db/mariadb:= )
55 - postgres? ( dev-db/postgresql:= )
56 - redis? ( dev-libs/hiredis )
57 - sqlite? ( dev-db/sqlite )
58 - ssl? ( dev-libs/openssl )
59 -"
60 -DEPEND="
61 - ${RDEPEND}
62 - test? ( dev-cpp/gtest )
63 -
64 -"
65 -
66 -PATCHES=( "${FILESDIR}/${PN}-1.7.1_GNUInstallDirs.patch" )
67 -
68 -DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md )
69 -
70 -src_prepare() {
71 - sed -i '/add_subdirectory(trantor)/d' CMakeLists.txt || die
72 - sed -i '/${PROJECT_SOURCE_DIR}\/trantor\/trantor\/tests\/server.pem/d' \
73 - lib/tests/CMakeLists.txt || die
74 - use brotli || sed -i '/find_package(Brotli)/d' CMakeLists.txt || die
75 - use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
76 -
77 - use examples && DOCS+=( "${S}/examples" )
78 -
79 - cmake_src_prepare
80 -}
81 -
82 -src_configure() {
83 - # NOTE: Next version has BUILD_DOC switch.
84 - local -a mycmakeargs=(
85 - "-DBUILD_EXAMPLES=NO"
86 - "-DBUILD_DROGON_SHARED=YES"
87 - "-DBUILD_POSTGRESQL=$(usex postgres)"
88 - "-DBUILD_MYSQL=$(usex mariadb)"
89 - "-DBUILD_SQLITE=$(usex sqlite)"
90 - "-DBUILD_REDIS=$(usex redis)"
91 - "-DBUILD_TESTING=$(usex test)"
92 - )
93 -
94 - cmake_src_configure
95 -}
96
97 diff --git a/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch b/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch
98 deleted file mode 100644
99 index bd52972bb..000000000
100 --- a/dev-cpp/drogon/files/drogon-1.7.1_GNUInstallDirs.patch
101 +++ /dev/null
102 @@ -1,33 +0,0 @@
103 -From 318327104fa444f764caccc9ad7ae40ae3452ea9 Mon Sep 17 00:00:00 2001
104 -From: tastytea <tastytea@××××××××.de>
105 -Date: Mon, 16 Aug 2021 22:19:46 +0200
106 -Subject: [PATCH] cmake: Use GNUInstallDirs to figure out install dirs.
107 -
108 ----
109 - CMakeLists.txt | 9 +++++----
110 - 1 file changed, 5 insertions(+), 4 deletions(-)
111 -
112 -diff --git a/CMakeLists.txt b/CMakeLists.txt
113 -index 821cf09..9634bfc 100755
114 ---- a/CMakeLists.txt
115 -+++ b/CMakeLists.txt
116 -@@ -33,11 +33,12 @@ set(DROGON_VERSION
117 - ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
118 - set(DROGON_VERSION_STRING "${DROGON_VERSION}")
119 -
120 -+include(GNUInstallDirs)
121 - # Offer the user the choice of overriding the installation directories
122 --set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
123 --set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
124 --set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
125 --set(DEF_INSTALL_DROGON_CMAKE_DIR lib/cmake/Drogon)
126 -+set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
127 -+set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables")
128 -+set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for header files")
129 -+set(DEF_INSTALL_DROGON_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/Drogon)
130 - set(INSTALL_DROGON_CMAKE_DIR ${DEF_INSTALL_DROGON_CMAKE_DIR}
131 - CACHE PATH "Installation directory for cmake files")
132 -
133 ---
134 -2.31.1
135 -