summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-p2p/eiskaltdcpp/Manifest2
-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, 8 insertions, 51 deletions
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index a15238ff7ea..c11cbd20d6c 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1 +1 @@
-DIST eiskaltdcpp-2.4.1.tar.xz 4301580 BLAKE2B 5fbf17d59686373b06ab7f86c5eaa00d9dd8d16b9ff89367d50024e4af1ea4c7abd281fa294718228544f8e0b8276af89a5d6a79d02fd09ca226387c278829c6 SHA512 05bb31a94081207812787d6d5ee4d8f479b3582f41f09441fbb60a4214a220d9d7fa3ea3e52c6e91a5d084aa92bab6994dbd9769e4d792d95c51dde5bc12ee55
+DIST eiskaltdcpp-2.4.2.tar.xz 4320140 BLAKE2B 8b58a297934398f106bd200d451b5caab7664bee9dbeb34761571fbc4db065aea0cb7e47cbbd95f11eaceef94a0393b1b92bc832607d3b3b68b8acc84a28441c SHA512 f9309188b209636f205295d1686b6aea5a5b59c160e724a10bf642f051f18f64113978144725371ee67db762f6f573cbc95ae934d232918344a9f250c8c044ea
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index e9815bef177..c160df0f27b 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 315afa71682..c160df0f27b 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 2cbfb247b58..00000000000
--- 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 57ff8d27049..00000000000
--- 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
-