summaryrefslogtreecommitdiff
path: root/net-p2p/eiskaltdcpp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-05 09:25:57 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-05 09:25:57 +0000
commit6d691ad5b6239929063441bbd14c489e92e7396e (patch)
treee294f87b1ce66397fee1273bd6c7131aeb586f51 /net-p2p/eiskaltdcpp
parentd99093fb4bb5652015c06274d64083daa2439e4f (diff)
gentoo resync : 05.03.2021
Diffstat (limited to 'net-p2p/eiskaltdcpp')
-rw-r--r--net-p2p/eiskaltdcpp/Manifest8
-rw-r--r--net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild (renamed from net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild)9
-rw-r--r--net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild11
-rw-r--r--net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-cmake_lua_version.patch11
-rw-r--r--net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.4.1-fix_upnp_compilation.patch26
5 files changed, 10 insertions, 55 deletions
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index c2efe775a0c7..be3f93300727 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,6 +1,4 @@
-AUX eiskaltdcpp-2.2.10-cmake_lua_version.patch 304 BLAKE2B d8e3ea40f491c1fbe72cda9bf29af49c12286abf642edb6f9e621d0b6c31fbf4152f85a046e4128282cd6bb22efb1fbce4bb34e13faed1b8dbe15bb23f357962 SHA512 ba2cab9d681b024fa177e48cfca5a1448d94c699d35970b0976910d90379664d607d1d532e649e4b1f0c2141b61c1442b7b217580cb83199a15da6f8dd6af901
-AUX eiskaltdcpp-2.4.1-fix_upnp_compilation.patch 790 BLAKE2B 6fe460a35a2cfd3f2a3a42a60c6b376b4e58cd699607b1ed19c92c1a37e245cde2a3e37cb34d5c3a6ad19c33d96abe0390227d8984b483b9a384a991a38731c1 SHA512 e96e3eacaf3927768c4d2456659b837fb7d2028f3cc5c3f27d8d5c5c7e9d1011d5a87b5b052ebefc7a3eb8dea4d9c85094a9ee97413a1e683ee19164304a3312
-DIST eiskaltdcpp-2.4.1.tar.xz 4301580 BLAKE2B 5fbf17d59686373b06ab7f86c5eaa00d9dd8d16b9ff89367d50024e4af1ea4c7abd281fa294718228544f8e0b8276af89a5d6a79d02fd09ca226387c278829c6 SHA512 05bb31a94081207812787d6d5ee4d8f479b3582f41f09441fbb60a4214a220d9d7fa3ea3e52c6e91a5d084aa92bab6994dbd9769e4d792d95c51dde5bc12ee55
-EBUILD eiskaltdcpp-2.4.1.ebuild 3784 BLAKE2B b6b7519c68c6301c6132d1712318210a46932e06fe8e700bb7e25a2ab68c6a0a861578af97a792d3748838a06c9f8c52fe47cc3fa97fd890bb3d4edca6495114 SHA512 1ad1e80e55127f19951c8dd0731441159eff5426f2df836b11c657dd987a98094be425f06c52c4815c992080c1d1e5a490b314ce5d2908f31a2d055f0b14ef11
-EBUILD eiskaltdcpp-9999.ebuild 3734 BLAKE2B b84ed18ed3cef6a438c72a5fb141acd2f88b3bd24a3e63f0b2422d89022d3a55e1c1d377524280e75a035f5db50196309fef63009d214e8a5935ab2d52a346c7 SHA512 aae37ee4b63dc2921d8f63d33bf6755e76329d9c07b21e02effbfeef5110419c25141dcaacdc0326b3a7ed2cda9553ecc1b693b46d3d3c4789f84f0c10c0a1d3
+DIST eiskaltdcpp-2.4.2.tar.xz 4320140 BLAKE2B 8b58a297934398f106bd200d451b5caab7664bee9dbeb34761571fbc4db065aea0cb7e47cbbd95f11eaceef94a0393b1b92bc832607d3b3b68b8acc84a28441c SHA512 f9309188b209636f205295d1686b6aea5a5b59c160e724a10bf642f051f18f64113978144725371ee67db762f6f573cbc95ae934d232918344a9f250c8c044ea
+EBUILD eiskaltdcpp-2.4.2.ebuild 3689 BLAKE2B 9837ae9ae10dd54af0e59b7a636c22c60a49ee506427f0e57764c99fa5717a5eba693238e4291e9ebf45c5e37a5cd38ed18c92e490ae4352f3d5555e02923222 SHA512 8225fc6b86a417e7a2cf27c2cd0fa9934b487c6286d56697198b4b12d3e44e5aa96d33545d6b6060941dd5c96007f4cad689515ec7ad501d8b419c3c0dd7c0b0
+EBUILD eiskaltdcpp-9999.ebuild 3689 BLAKE2B 9837ae9ae10dd54af0e59b7a636c22c60a49ee506427f0e57764c99fa5717a5eba693238e4291e9ebf45c5e37a5cd38ed18c92e490ae4352f3d5555e02923222 SHA512 8225fc6b86a417e7a2cf27c2cd0fa9934b487c6286d56697198b4b12d3e44e5aa96d33545d6b6060941dd5c96007f4cad689515ec7ad501d8b419c3c0dd7c0b0
MISC metadata.xml 1208 BLAKE2B ec058a3fa5cf64a50eaa1903aa3abee2c1b47c485c17d8893182b80ff017b7c288183703c6ed49173947bfd2c40b3009ca64524d3994208405ec725fabe8078c SHA512 8bb5d7d2718fdc8c73092aa34c224a13413c8ce97f3fa6da56e8d2d307949833e3dee66c2d21fe2b14141bac8baffe0602be9330f6e96c27675ee33824ad00af
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index e9815bef177d..c160df0f27be 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
LUA_COMPAT=( lua5-1 lua5-2 )
-PLOCALES="be bg cs de el en es eu fr hu it pl pt_BR ru sk sr sr@latin sv_SE tr uk vi zh_CN"
+PLOCALES="be bg cs da de el en es eu fr hu ie it pl pt_BR ru sk sr sr@latin sv_SE tr uk vi zh_CN"
inherit cmake l10n lua-single xdg-utils toolchain-funcs
[[ ${PV} = *9999* ]] && inherit git-r3
@@ -92,12 +92,7 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog.txt )
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.10-cmake_lua_version.patch"
- "${FILESDIR}/${P}-fix_upnp_compilation.patch"
-)
-
-CMAKE_REMOVE_MODULES_LIST="FindLua"
+CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
pkg_setup() {
use lua && lua-single_pkg_setup
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 315afa716827..c160df0f27be 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
LUA_COMPAT=( lua5-1 lua5-2 )
-PLOCALES="be bg cs de el en es eu fr hu it pl pt_BR ru sk sr sr@latin sv_SE tr uk vi zh_CN"
+PLOCALES="be bg cs da de el en es eu fr hu ie it pl pt_BR ru sk sr sr@latin sv_SE tr uk vi zh_CN"
inherit cmake l10n lua-single xdg-utils toolchain-funcs
[[ ${PV} = *9999* ]] && inherit git-r3
@@ -92,12 +92,11 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog.txt )
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.10-cmake_lua_version.patch"
- "${FILESDIR}/${P}-fix_upnp_compilation.patch"
-)
+CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
-CMAKE_REMOVE_MODULES_LIST="FindLua"
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
src_prepare() {
cmake_src_prepare
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-cmake_lua_version.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-cmake_lua_version.patch
deleted file mode 100644
index 2cbfb247b589..000000000000
--- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,7 +120,7 @@
- endif (XATTR_FOUND)
-
- if (LUA_SCRIPT)
-- find_package (Lua REQUIRED)
-+ find_package (Lua ${LUA_VERSION} EXACT REQUIRED)
- add_definitions ( -DLUA_SCRIPT )
- message (STATUS "Building with Lua scripts support")
- else (LUA_SCRIPT)
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.4.1-fix_upnp_compilation.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.4.1-fix_upnp_compilation.patch
deleted file mode 100644
index 57ff8d270492..000000000000
--- a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.4.1-fix_upnp_compilation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e534e871c7f22b3c0bb28d9f91f71b824cf68a0e Mon Sep 17 00:00:00 2001
-From: "Francisco Blas (klondike) Izquierdo Riera" <klondike@klondike.es>
-Date: Fri, 26 Feb 2021 11:15:08 +0100
-Subject: [PATCH] Add missing format.h include in the upnp mapping management
- code to fix compile-time issues (Thanks juippis from Gentoo for finding and
- reporting this)
-
----
- dcpp/MappingManager.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dcpp/MappingManager.cpp b/dcpp/MappingManager.cpp
-index 42c4cbb4..c1d84f64 100644
---- a/dcpp/MappingManager.cpp
-+++ b/dcpp/MappingManager.cpp
-@@ -22,6 +22,7 @@
- #include "ConnectionManager.h"
- #include "SearchManager.h"
- #include "LogManager.h"
-+#include "format.h"
- #include "version.h"
- #include "ConnectivityManager.h"
- #ifdef USE_MINIUPNP
---
-2.26.2
-