commit: 44cc9144b0580b76ec748a43c2d07b71331b602c
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Tue Nov 16 21:46:33 2021 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue Nov 16 21:46:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=44cc9144
net-im/abaddon: Bump to 0.1.1
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
net-im/abaddon/Manifest | 2 +-
.../{abaddon-0.1.0.ebuild => abaddon-0.1.1.ebuild} | 4 +--
...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ----------------------
...baddon-0.1.1-remove-vendored-dependencies.patch | 22 ++++++++++++++++
4 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest
index a9031ec07..951679a1f 100644
--- a/net-im/abaddon/Manifest
+++ b/net-im/abaddon/Manifest
@@ -1 +1 @@
-DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B
d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474
SHA512
e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734
+DIST abaddon-0.1.1.tar.gz 12805146 BLAKE2B
7457604fc6f5e2b3932533d67ff52797d67ac4d52d832dd4ff9181bcffb886f335345107b3938cf02e9357896bffb18e6ef7f0367b5e0f40f5c6d1656f346ad6
SHA512
d8c65024fe3bbf94e45232320a37ec85df9eae71e16a38ca2ca33ce42464d45dad0058d66eb54869dd1b58514b20bb3438b8ee32a19956b3ae60af81c7774fbb
diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild
b/net-im/abaddon/abaddon-0.1.1.ebuild
similarity index 90%
rename from net-im/abaddon/abaddon-0.1.0.ebuild
rename to net-im/abaddon/abaddon-0.1.1.ebuild
index 5e1dfdca0..9588b8f1c 100644
--- a/net-im/abaddon/abaddon-0.1.0.ebuild
+++ b/net-im/abaddon/abaddon-0.1.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
- >=dev-cpp/simpleini-4.17_p20210831
+ >=dev-cpp/simpleini-4.17_p20210901
dev-cpp/gtkmm:3.0=
dev-db/sqlite:3
net-misc/curl
@@ -41,5 +41,5 @@ src_install() {
insinto /usr/share/${PN}
doins -r css res
- make_desktop_entry /usr/bin/${PN} ${PN}
+ make_desktop_entry /usr/bin/${PN}
}
diff --git
a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch
b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch
deleted file mode 100644
index b1993cd1d..000000000
--- a/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 82d405f..5a2f75b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,13 +15,7 @@ find_package(CURL)
- find_package(ZLIB REQUIRED)
- find_package(SQLite3 REQUIRED)
- find_package(gtkmm REQUIRED)
--
--find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h)
--find_library(IXWEBSOCKET_LIBRARY ixwebsocket)
--if (NOT IXWEBSOCKET_LIBRARY)
-- add_subdirectory(thirdparty/IXWebSocket)
-- include_directories(IXWEBSOCKET_INCLUDE_DIRS)
--endif()
-+find_package(ixwebsocket REQUIRED)
-
- include_directories(thirdparty/simpleini)
-
-@@ -63,6 +57,9 @@ target_include_directories(abaddon PUBLIC
${GTKMM_INCLUDE_DIRS})
- target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS})
- target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS})
- target_include_directories(abaddon PUBLIC ${NLOHMANN_JSON_INCLUDE_DIRS})
-+target_include_directories(abaddon PUBLIC /usr/include/simpleini)
-+
-+target_link_libraries(abaddon simpleini)
-
- if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
- (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
diff --git
a/net-im/abaddon/files/abaddon-0.1.1-remove-vendored-dependencies.patch
b/net-im/abaddon/files/abaddon-0.1.1-remove-vendored-dependencies.patch
new file mode 100644
index 000000000..b5a29f97e
--- /dev/null
+++ b/net-im/abaddon/files/abaddon-0.1.1-remove-vendored-dependencies.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 638be3e..ea76f4e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,11 +23,7 @@ if (NOT IXWebSocket_FOUND)
+ endif()
+
+ add_compile_definitions(SI_NO_CONVERSION) # only CSimpleIniA is used
+-find_package(simpleini QUIET)
+-if (NOT simpleini_FOUND)
+- message("simpleini was not found and will be included as a submodule")
+- include_directories(thirdparty/simpleini)
+-endif()
++include_directories(/usr/include/simpleini)
+
+ if(MINGW OR WIN32)
+ link_libraries(ws2_32)
+@@ -103,3 +99,4 @@ target_link_libraries(abaddon ${GTKMM_LIBRARIES})
+ target_link_libraries(abaddon ${CURL_LIBRARIES})
+ target_link_libraries(abaddon ${ZLIB_LIBRARY})
+ target_link_libraries(abaddon ${NLOHMANN_JSON_LIBRARIES})
++target_link_libraries(abaddon simpleini)
