gentoo resync : 25.11.2020

3 files changed, 169 insertions, 0 deletions

diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index e4b00145586e..5b9b75f865cd 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,9 +1,11 @@
+AUX eiskaltdcpp-2.2.10-cmake_lua_version.patch 304 BLAKE2B d8e3ea40f491c1fbe72cda9bf29af49c12286abf642edb6f9e621d0b6c31fbf4152f85a046e4128282cd6bb22efb1fbce4bb34e13faed1b8dbe15bb23f357962 SHA512 ba2cab9d681b024fa177e48cfca5a1448d94c699d35970b0976910d90379664d607d1d532e649e4b1f0c2141b61c1442b7b217580cb83199a15da6f8dd6af901
 AUX eiskaltdcpp-2.2.10-ipv6_upnp.patch 4793 BLAKE2B 5924fb6916fab0597f871abaa7dac9f7802526fd3cc1441cfb7489c83fc669173ffe1f92f973d4764bceae1901e5466bd768515a89d1ed39ecac32f08e4517b4 SHA512 d1be465da6cc13584f074bf9b96a0355127b4e2e0b3d571473116fa55a2bca617786988f0dae58ddf50a4f31531658cdc6258eb92ab2eb7599165b5ca6d11cf5
 AUX eiskaltdcpp-2.2.10-miniupnpc1.patch 1511 BLAKE2B 38ac851d31012a819232ee6dd33664551500ec2dfcba0be860626d502eb701c54bb71248d9310f73e11b5c60b5c32169f052e05d9c3c7084b199c52bc946e664 SHA512 fb97a5b2a43433ec3b3bb557b1b6c488e6f3b38bf507eade67468636a1cc7721de2ef005664e248945e5d68bc82e479849c88628598d53aaecdef438fffa3e09
 AUX eiskaltdcpp-2.2.10-miniupnpc2.patch 1123 BLAKE2B 146d4fc6cd84ee8c318871ea6460f01029ff388d54917e7eb0f8b6e25e4e59f8c9f7d6dbf63e62d9bfe0016126a2ba6c614c6f2c8a4b54e1b7f53a3d64f01ea4 SHA512 14cd68087aeaa755eeae58fd1265af35fb4f4e1651e7f083f09fd9e660a1b8df5bb8d6e31add6ba30796c99058030386432a69ef4338d969c692a80931361e36
 AUX eiskaltdcpp-2.2.10-openssl-1.1.patch 5482 BLAKE2B c3e33ddd45458a02bcbd20696bf08ea343cd4044f8887d6c344005ee95ea77054e35fb0c4ecae137352e55178b85cdc35d0c817b0c01426b2f3118edb20dfe20 SHA512 52433c16a95aefa9e5fd36c812b6f4cc5729cd870885fada69fe5529da11ab1edf4701879c62db0befab17e60da1168bf724ae8c39ee5f22d24eafda4f808485
 AUX eiskaltdcpp-2.2.10-tray-close.patch 788 BLAKE2B 61cf8368a6aea0f7b69864a317ffc6cc97ca1b468a948d0a6264e3c49fb65bf83d634f8aa843357c1ba8eb0a8cad4eba8685b772650e816512d64ec35289f1f4 SHA512 f1f59590b7ded55bc6351450cbe1efcf15ca8db2c532d2871512c8866809f06572076a586c968fade8d0f2fe8d33eb06d1b0359fb810748b6ad9d812c188155d
 DIST eiskaltdcpp-2.2.10.tar.gz 3843143 BLAKE2B 907b54271e7bf990a7826168728619020fd05b3d7826ba155763a3a2bef1154978e94978082513ca32a40866e275a8ea0da71f1eca0d77353320c0aefb7065ac SHA512 97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818
+EBUILD eiskaltdcpp-2.2.10-r100.ebuild 3439 BLAKE2B e8c9d1897066682738c270fd215b59fd8ec2bf3c6a1ebb6cf688ece922743910abe84038f9d61b10a734063bf9eb617f88c673e093e69fe9e1aa6d03e6dbdc3a SHA512 62fe7f8ff043a5a2f05ba1b4f7d0d1242b0929e9164b1680792ca4c6cfcbf708cf4d0bf43b70d0cd64d18daa3c6aaff58d1a5ace8cd957791830affb6cadc926
 EBUILD eiskaltdcpp-2.2.10.ebuild 3260 BLAKE2B b51179c7d180fd8665eb82c991d28bdc0f1356ab7f692e588242bb60794833d0ff8b6785ad6b6f6d77cb65e072d857509abc74e1e2af3e0f2fa202675a8b88fb SHA512 e8c0310563413d235ed03b814e672dc09e0a35f882cc9124ed80e3ed47e129fffee553e82ff09341bc0e5a6a0bb1b01a5a2f486dbdeb63a316b234fc6ebef606
 EBUILD eiskaltdcpp-9999.ebuild 3489 BLAKE2B 600f24fab78110d082e088b9074f681bac7366dcfaa3fe64502cd3a1fd88709353606c1d0e075eadfe46279ae00927eba7d09a88a823b6aea628377278829ae4 SHA512 1e42ac5f1ff745f48299088953bedcddeadb4cfd74a11ddb5ac52748861d97f3811c127d721b6d687cb544fc26fb423e1e0101d8e5581ebaf844f6a53e93576c
 MISC metadata.xml 996 BLAKE2B aa14839e332a549f62b99fdf693388dc03988a316a5feb8da916008b4592d7ced6cc95062727a7f9e16ee8fd294a20124586b1e7c6a1b9d860065573f03bc9d0 SHA512 c36a94f827751c9a4ad080470d52576ea7a679a709605dec744f6bd55b0c4bb7566cc4e17aa499e09087cda45f839e0aa6a9e0d29ce5ce089fa25bf07a3e7325
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild
new file mode 100644
index 000000000000..1355b15934bd
--- /dev/null
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+PLOCALES="be bg cs de el en es eu fr hu it pl pt_BR ru sk sr@latin sr sv_SE uk vi zh_CN"
+
+inherit cmake l10n lua-single xdg-utils
+[[ ${PV} = *9999* ]] && inherit git-r3
+
+DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"
+HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="cli daemon dbus +dht examples idn -javascript json lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
+
+REQUIRED_USE="
+	?? ( json xmlrpc )
+	cli? ( ^^ ( json xmlrpc ) )
+	dbus? ( qt5 )
+	javascript? ( qt5 )
+	lua? ( ${LUA_REQUIRED_USE} )
+	spell? ( qt5 )
+	sqlite? ( qt5 )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	KEYWORDS=""
+fi
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	sys-apps/attr
+	sys-libs/zlib
+	virtual/libiconv
+	virtual/libintl
+	cli? (
+		dev-lang/perl
+		dev-perl/Data-Dump
+		dev-perl/Term-ShellUI
+		virtual/perl-Getopt-Long
+		json? ( dev-perl/JSON-RPC )
+		xmlrpc? ( dev-perl/RPC-XML )
+	)
+	daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) )
+	idn? ( net-dns/libidn )
+	lua? ( ${LUA_DEPS} )
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dbus? ( dev-qt/qtdbus:5 )
+		javascript? (
+			dev-qt/qtdeclarative:5
+			dev-qt/qtscript:5
+		)
+		spell? ( app-text/aspell )
+		sqlite? ( dev-qt/qtsql:5[sqlite] )
+	)
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+DOCS=( AUTHORS ChangeLog.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.10-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-2.2.10-ipv6_upnp.patch
+	"${FILESDIR}"/${PN}-2.2.10-miniupnpc{1,2}.patch
+	"${FILESDIR}"/${PN}-2.2.10-openssl-1.1.patch
+	"${FILESDIR}"/${PN}-2.2.10-tray-close.patch
+)
+
+CMAKE_REMOVE_MODULES_LIST="FindLua"
+
+src_prepare() {
+	cmake_src_prepare
+	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-Dlinguas="$(l10n_get_locales)"
+		-DLOCAL_MINIUPNP=OFF
+		-DUSE_GTK=OFF
+		-DUSE_GTK3=OFF
+		-DUSE_LIBGNOME2=OFF
+		-DUSE_LIBCANBERRA=OFF
+		-DUSE_LIBNOTIFY=OFF
+		-DUSE_QT=OFF
+		-DUSE_QT_QML=OFF
+		-DNO_UI_DAEMON=$(usex daemon)
+		-DDBUS_NOTIFY=$(usex dbus)
+		-DWITH_DHT=$(usex dht)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DUSE_IDNA=$(usex idn)
+		-DUSE_JS=$(usex javascript)
+		-DWITH_DEV_FILES=$(usex !minimal)
+		-DPERL_REGEX=$(usex pcre)
+		-DUSE_QT5=$(usex qt5)
+		-DWITH_EMOTICONS=$(usex qt5)
+		-DWITH_SOUNDS=$(usex qt5)
+		-DUSE_ASPELL=$(usex spell)
+		-DUSE_QT_SQLITE=$(usex sqlite)
+		-DUSE_MINIUPNP=$(usex upnp)
+	)
+	if use cli; then
+		mycmakeargs+=(
+			-DUSE_CLI_JSONRPC=$(usex json)
+			-DUSE_CLI_XMLRPC=$(usex xmlrpc)
+		)
+	fi
+	if use daemon; then
+		mycmakeargs+=(
+			-DJSONRPC_DAEMON=$(usex json)
+			-DXMLRPC_DAEMON=$(usex xmlrpc)
+		)
+	fi
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_SCRIPT=ON
+			-DWITH_LUASCRIPTS=ON
+			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+		)
+	fi
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
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
new file mode 100644
index 000000000000..2cbfb247b589
--- /dev/null
+++ b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- 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)