commit: 34706315a36de754450ca83eda6d40346f388766 Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de> AuthorDate: Tue Sep 28 13:43:10 2021 +0000 Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de> CommitDate: Tue Sep 28 13:43:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34706315
net-im/abaddon: Remove vendored dependencies 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 | 1 - net-im/abaddon/abaddon-0.1.0.ebuild | 12 +++------ ...baddon-0.1.0-remove-vendored-dependencies.patch | 29 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index b9936a57a..a9031ec07 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1,2 +1 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 -DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index f987740f9..5e1dfdca0 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -5,13 +5,10 @@ EAPI=7 inherit cmake desktop -SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" - DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon"; SRC_URI=" https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz " LICENSE="GPL-3" @@ -19,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + >=dev-cpp/simpleini-4.17_p20210831 dev-cpp/gtkmm:3.0= dev-db/sqlite:3 net-misc/curl @@ -31,11 +29,9 @@ DEPEND=" " BDEPEND="" -src_unpack() { - default - rm -r "${S}/thirdparty/simpleini" || die - ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die -} +PATCHES=( + "${FILESDIR}/${P}-remove-vendored-dependencies.patch" +) src_install() { dodoc README.md 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 new file mode 100644 index 000000000..b1993cd1d --- /dev/null +++ b/net-im/abaddon/files/abaddon-0.1.0-remove-vendored-dependencies.patch @@ -0,0 +1,29 @@ +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
