net-p2p/eiskaltdcpp: Update to 2.4.1

* Update to 2.4.1
* Add gold USE flag
* make.defaults has USE=cli enable json by default too to keep CI happy
* Correctly indicate support for lua-5.2
* Drop boost dependency
* All gcc and clang versions on the portage tree support c++14
  so no need for a explicit check
* Port also these changes to the live ebuild
* Take ownership of the package
* Fix compilation when lua is disabled and lua is not available on the
  system.
* Update longdescription. (Thanks tehnick).

Closes: https://bugs.gentoo.org/749249
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

4 files changed, 219 insertions, 9 deletions

diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index a50fbe6a2abf..d58c59f8511e 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1 +1,2 @@
 DIST eiskaltdcpp-2.2.10.tar.gz 3843143 BLAKE2B 907b54271e7bf990a7826168728619020fd05b3d7826ba155763a3a2bef1154978e94978082513ca32a40866e275a8ea0da71f1eca0d77353320c0aefb7065ac SHA512 97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818
+DIST eiskaltdcpp-2.4.1.tar.xz 4301580 BLAKE2B 5fbf17d59686373b06ab7f86c5eaa00d9dd8d16b9ff89367d50024e4af1ea4c7abd281fa294718228544f8e0b8276af89a5d6a79d02fd09ca226387c278829c6 SHA512 05bb31a94081207812787d6d5ee4d8f479b3582f41f09441fbb60a4214a220d9d7fa3ea3e52c6e91a5d084aa92bab6994dbd9769e4d792d95c51dde5bc12ee55
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
new file mode 100644
index 000000000000..db60ca405840
--- /dev/null
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+inherit cmake l10n lua-single xdg-utils toolchain-funcs
+[[ ${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 -gold -gtk idn -javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
+
+REQUIRED_USE="
+	?? ( json xmlrpc )
+	cli? ( ^^ ( json xmlrpc ) )
+	dbus? ( qt5 )
+	javascript? ( qt5 )
+	libcanberra? ( gtk )
+	libnotify? ( gtk )
+	lua? ( ${LUA_REQUIRED_USE} )
+	spell? ( qt5 )
+	sqlite? ( qt5 )
+"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://sourceforge/project/${PN}/Sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	KEYWORDS=""
+fi
+
+RDEPEND="
+	app-arch/bzip2
+	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? (
+		json? ( dev-libs/jsoncpp:= )
+		xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] )
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-themes/hicolor-icon-theme
+		libcanberra? ( media-libs/libcanberra )
+		libnotify? ( x11-libs/libnotify )
+	)
+	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 )
+"
+BDEPEND="
+	gold? ( sys-devel/binutils[gold] )
+"
+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"
+)
+
+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)"
+		-DCREATE_MO=ON
+		-DUSE_GTK=OFF
+		-DUSE_LIBGNOME2=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_GTK3=$(usex gtk)
+		-DUSE_IDNA=$(usex idn)
+		-DUSE_JS=$(usex javascript)
+		-DUSE_LIBCANBERRA=$(usex libcanberra)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DWITH_DEV_FILES=$(usex !minimal)
+		-DPERL_REGEX=$(usex pcre)
+		-DUSE_QT5=$(usex qt5)
+		-DUSE_ASPELL=$(usex spell)
+		-DLOCAL_ASPELL_DATA=OFF
+		-DUSE_QT_SQLITE=$(usex sqlite)
+		-DUSE_MINIUPNP=$(usex upnp)
+		-DFORCE_XDG=ON
+		-DENABLE_STACKTRACE=OFF
+		-DUSE_GOLD=$(usex gold)
+		-DLOCAL_JSONCPP=OFF
+		-DBUILD_STATIC=OFF
+		-DINSTALL_QT_TRANSLATIONS=OFF
+		-DCOMPRESS_MANPAGES=OFF
+	)
+	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=$(usex examples)
+			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+		)
+	fi
+	if use qt5 || use gtk; then
+		mycmakeargs+=(
+			-DWITH_EMOTICONS=ON
+			-DWITH_SOUNDS=ON
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_EMOTICONS=OFF
+			-DWITH_SOUNDS=OFF
+		)
+	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/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 50b6c2dfc1e3..fe6e41e66adf 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-1 )
+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"
 
-inherit cmake l10n lua-single xdg-utils
+inherit cmake l10n lua-single xdg-utils toolchain-funcs
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-IUSE="cli daemon dbus +dht examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
+IUSE="cli daemon dbus +dht examples -gold -gtk idn -javascript +json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
 
 REQUIRED_USE="
 	?? ( json xmlrpc )
@@ -30,7 +30,7 @@ REQUIRED_USE="
 "
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="mirror://sourceforge/project/${PN}/Sources/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -38,7 +38,6 @@ fi
 
 RDEPEND="
 	app-arch/bzip2
-	dev-libs/boost:=
 	dev-libs/openssl:0=
 	sys-apps/attr
 	sys-libs/zlib
@@ -52,7 +51,10 @@ RDEPEND="
 		json? ( dev-perl/JSON-RPC )
 		xmlrpc? ( dev-perl/RPC-XML )
 	)
-	daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) )
+	daemon? (
+		json? ( dev-libs/jsoncpp:= )
+		xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] )
+	)
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:3
@@ -82,6 +84,9 @@ RDEPEND="
 	)
 	upnp? ( net-libs/miniupnpc )
 "
+BDEPEND="
+	gold? ( sys-devel/binutils[gold] )
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -90,6 +95,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog.txt )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.10-cmake_lua_version.patch"
+)
+
 CMAKE_REMOVE_MODULES_LIST="FindLua"
 
 src_prepare() {
@@ -101,7 +110,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-Dlinguas="$(l10n_get_locales)"
-		-DLOCAL_MINIUPNP=OFF
+		-DCREATE_MO=ON
 		-DUSE_GTK=OFF
 		-DUSE_LIBGNOME2=OFF
 		-DUSE_QT=OFF
@@ -119,8 +128,16 @@ src_configure() {
 		-DPERL_REGEX=$(usex pcre)
 		-DUSE_QT5=$(usex qt5)
 		-DUSE_ASPELL=$(usex spell)
+		-DLOCAL_ASPELL_DATA=OFF
 		-DUSE_QT_SQLITE=$(usex sqlite)
 		-DUSE_MINIUPNP=$(usex upnp)
+		-DFORCE_XDG=ON
+		-DENABLE_STACKTRACE=OFF
+		-DUSE_GOLD=$(usex gold)
+		-DLOCAL_JSONCPP=OFF
+		-DBUILD_STATIC=OFF
+		-DINSTALL_QT_TRANSLATIONS=OFF
+		-DCOMPRESS_MANPAGES=OFF
 	)
 	if use cli; then
 		mycmakeargs+=(
@@ -137,7 +154,7 @@ src_configure() {
 	if use lua; then
 		mycmakeargs+=(
 			-DLUA_SCRIPT=ON
-			-DWITH_LUASCRIPTS=ON
+			-DWITH_LUASCRIPTS=$(usex examples)
 			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
 		)
 	fi
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index b65eafebb426..9f4843b1a105 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>klondike@gentoo.org</email>
+		<name>Francisco Blas (klondike) Izquierdo Riera</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	EiskaltDC++ is a multi-platform program that uses the Direct Connect and
 	ADC protocol. It is compatible with other DC clients, such as the original DC
@@ -12,6 +19,7 @@
 		<flag name="cli">Enable sample cli based on readline</flag>
 		<flag name="daemon">Enable eiskaltdcpp-daemon</flag>
 		<flag name="dht">Enable DHT (distributed hash table) support for libeiskaltdcpp</flag>
+		<flag name="gold">Use gold.ld instead of ld</flag>
 		<flag name="json">Enable JSON for cli and daemon</flag>
 		<flag name="libcanberra">Enable sound notifications support over libcanberra in EiskaltDC++ Gtk</flag>
 		<flag name="minimal">Don't install headers</flag>