[gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2016-11-27  6:01 Göktürk Yüksek
  0 siblings, 0 replies; 18+ messages in thread
From: Göktürk Yüksek @ 2016-11-27  6:01 UTC (permalink / raw
  To: gentoo-commits

commit:     7463b3ee4d8822df2422ae38435c2d5ad76c9e32
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 05:01:45 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 06:00:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7463b3ee

net-p2p/eiskaltdcpp: migrate away from google code #544092

Package-Manager: portage-2.3.0

 net-p2p/eiskaltdcpp/Manifest                 | 2 +-
 net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild | 6 +++---
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index a9d1493..7deffb0 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1 +1 @@
-DIST eiskaltdcpp-2.2.9.tar.xz 2327732 SHA256 3d9170645450f9cb0a605278b8646fec2110b9637910d86fd27cf245cbe24eaf SHA512 0de95d3dcfb860f262073497e8dacc6bb4371d72a13f23bf7981e96203d7361a2e078b45826c12a81cc8fbe8423ee231232e2874a02bcef76f96b516cb7e301c WHIRLPOOL a1ab51ef32a96cb6af5b6988068f93cade26def068509f269eb95a934e07adfddf850e85d1c48eb5fb3ba75cff97d5e4bf6843a4375c099dcb2658be983c008f
+DIST eiskaltdcpp-2.2.9.tar.gz 3578993 SHA256 99f1f66038ec19ec14992df484f97b88238df5dd260ca72d5023fb9a6fef44b4 SHA512 8b3a58e1fe757b5cef50b3ec534f135b2285d843f0120758f07bd3a1ce82aaf0874d78a04ba1d2eb4f584db50a2bc3315536ebdbabbb4d296b42e8ca90cc630b WHIRLPOOL 0bb140c903556fd82d1e888b2dd581c362375983ad585ea0686e5cb8bebcf257d8356d546af3779103b9173c1f3a1061df383da8932a835eb7c5a1bb0e932c55

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
index 10ce22e..8fc989d 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ inherit cmake-utils eutils l10n fdo-mime gnome2-utils
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt based client for DirectConnect and ADC protocols, based on DC++ library"
-HOMEPAGE="https://code.google.com/p/eiskaltdc/"
+HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
@@ -30,7 +30,7 @@ REQUIRED_USE="
 "
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://eiskaltdc.googlecode.com/files/${P}.tar.xz"
+	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"

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 7490604..3a703d6 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ inherit cmake-utils eutils l10n fdo-mime gnome2-utils
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt based client for DirectConnect and ADC protocols, based on DC++ library"
-HOMEPAGE="https://code.google.com/p/eiskaltdc/"
+HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
@@ -30,7 +30,7 @@ REQUIRED_USE="
 "
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://eiskaltdc.googlecode.com/files/${P}.tar.xz"
+	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"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2017-03-06  1:52 Göktürk Yüksek
  0 siblings, 0 replies; 18+ messages in thread
From: Göktürk Yüksek @ 2017-03-06  1:52 UTC (permalink / raw
  To: gentoo-commits

commit:     84c14ce17a2f7620e490a1f5997e4106d01a8d73
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 01:44:24 2017 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 01:51:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c14ce1

net-p2p/eiskaltdcpp: remove unresponsive proxied maintainer

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 net-p2p/eiskaltdcpp/metadata.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index f6b943b4823..bb47c2c6a40 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>nikoli@gmx.us</email>
-  <name>Nikoli</name>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <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


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2017-09-18 18:00 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2017-09-18 18:00 UTC (permalink / raw
  To: gentoo-commits

commit:     1238c6c6739a78c9a6be226e02f62a63209bc9ff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 23:21:53 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 17:53:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1238c6c6

net-p2p/eiskaltdcpp: EAPI 6, qt4 -> qt5, fdo-mime -> xdg-utils

- add new PLOCALES
- add subslot operators
- drop obsolete GCC check
- drop useless USE flags, simplify REQUIRED_USE
- sort DEPENDs and REQUIRED_USE

Gentoo-bug: 556588
Package-Manager: Portage-2.3.8, Repoman-2.3.1

 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 149 +++++++++++++++-------------
 1 file changed, 82 insertions(+), 67 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index acc4bc90421..8a00e9cfb49 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,31 +1,29 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-PLOCALES="be bg cs de el en es fr hu it pl pt_BR ru sk sr@latin sv_SE uk vi zh_CN"
+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-utils eutils l10n fdo-mime gnome2-utils
+inherit cmake-utils gnome2-utils l10n xdg-utils
 [[ ${PV} = *9999* ]] && inherit git-r3
 
-DESCRIPTION="Qt based client for DirectConnect and ADC protocols, based on DC++ library"
+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 +emoticons examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp -xmlrpc"
+IUSE="cli daemon dbus +dht examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp -xmlrpc"
 
 REQUIRED_USE="
+	?? ( json xmlrpc )
 	cli? ( ^^ ( json xmlrpc ) )
-	emoticons? ( || ( gtk qt4 ) )
-	dbus? ( qt4 )
-	javascript? ( qt4 )
-	json? ( !xmlrpc )
+	dbus? ( qt5 )
+	javascript? ( qt5 )
 	libcanberra? ( gtk )
 	libnotify? ( gtk )
-	spell? ( qt4 )
-	sound? ( || ( gtk qt4 ) )
-	sqlite? ( qt4 )
+	spell? ( qt5 )
+	sqlite? ( qt5 )
 "
 
 if [[ ${PV} != *9999* ]]; then
@@ -38,63 +36,61 @@ fi
 
 RDEPEND="
 	app-arch/bzip2
-	>=dev-libs/boost-1.38:=
-	>=dev-libs/openssl-0.9.8
+	dev-libs/boost:=
+	dev-libs/openssl:0=
 	sys-apps/attr
 	sys-libs/zlib
 	virtual/libiconv
 	virtual/libintl
-	idn? ( net-dns/libidn )
-	lua? ( >=dev-lang/lua-5.1 )
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	upnp? ( >=net-libs/miniupnpc-1.6 )
 	cli? (
-		>=dev-lang/perl-5.10
-		virtual/perl-Getopt-Long
+		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-1.19.0[abyss,cxx] ) )
+	daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) )
 	gtk? (
-		x11-libs/pango
+		dev-libs/glib:2
 		x11-libs/gtk+:3
-		>=dev-libs/glib-2.24:2
+		x11-libs/pango
 		x11-themes/hicolor-icon-theme
 		libcanberra? ( media-libs/libcanberra )
-		libnotify? ( >=x11-libs/libnotify-0.4.1 )
+		libnotify? ( x11-libs/libnotify )
 	)
-	qt4? (
-		>=dev-qt/qtcore-4.6.0:4
-		>=dev-qt/qtgui-4.6.0:4
-		dbus? ( >=dev-qt/qtdbus-4.6.0:4 )
+	idn? ( net-dns/libidn )
+	lua? ( dev-lang/lua:= )
+	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/qtscript:4
-			x11-libs/qtscriptgenerator
+			dev-qt/qtdeclarative:5
+			dev-qt/qtscript:5
 		)
 		spell? ( app-text/aspell )
-		sqlite? ( dev-qt/qtsql:4[sqlite] )
+		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 )
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-			&& die "Sorry, but gcc-4.4 and earlier won't work."
-	fi
-}
+DOCS=( AUTHORS ChangeLog.txt )
 
 src_prepare() {
+	cmake-utils_src_prepare
 	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
-
-	epatch_user
 }
 
 src_configure() {
@@ -103,31 +99,50 @@ src_configure() {
 		-Dlinguas="$(l10n_get_locales)"
 		-DLOCAL_MINIUPNP=OFF
 		-DUSE_GTK=OFF
+		-DUSE_QT=OFF
+		-DUSE_QT_QML=OFF
 		-DUSE_LIBGNOME2=OFF
-		"$(use cli && cmake-utils_use json USE_CLI_JSONRPC)"
-		"$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)"
-		"$(cmake-utils_use daemon NO_UI_DAEMON)"
-		"$(use daemon && cmake-utils_use json JSONRPC_DAEMON)"
-		"$(use daemon && cmake-utils_use xmlrpc XMLRPC_DAEMON)"
-		"$(cmake-utils_use dbus DBUS_NOTIFY)"
-		"$(cmake-utils_use dht WITH_DHT)"
-		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
-		"$(cmake-utils_use examples WITH_EXAMPLES)"
-		"$(cmake-utils_use gtk USE_GTK3)"
-		"$(cmake-utils_use idn USE_IDNA)"
-		"$(cmake-utils_use javascript USE_JS)"
-		"$(cmake-utils_use libcanberra LIBCANBERRA)"
-		"$(cmake-utils_use libnotify USE_LIBNOTIFY)"
-		"$(cmake-utils_use lua LUA_SCRIPT)"
-		"$(cmake-utils_use lua WITH_LUASCRIPTS)"
-		"$(cmake-utils_use !minimal WITH_DEV_FILES)"
-		"$(cmake-utils_use pcre PERL_REGEX)"
-		"$(cmake-utils_use qt4 USE_QT)"
-		"$(cmake-utils_use sound WITH_SOUNDS)"
-		"$(cmake-utils_use spell USE_ASPELL)"
-		"$(cmake-utils_use sqlite USE_QT_SQLITE)"
-		"$(cmake-utils_use upnp USE_MINIUPNP)"
+		-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)
+		-DLUA_SCRIPT=$(usex lua)
+		-DWITH_LUASCRIPTS=$(usex lua)
+		-DWITH_DEV_FILES=$(usex !minimal)
+		-DPERL_REGEX=$(usex pcre)
+		-DUSE_QT5=$(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 qt5 || use gtk; then
+		mycmakeargs+=(
+			-DWITH_EMOTICONS=ON
+			-DWITH_SOUNDS=ON
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_EMOTICONS=OFF
+			-DWITH_SOUNDS=OFF
+		)
+	fi
 	cmake-utils_src_configure
 }
 
@@ -136,11 +151,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2017-09-24 11:57 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2017-09-24 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     8149e9b8f5cb0d67e0e74a259694cf96b90c20dc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 11:52:15 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 11:57:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8149e9b8

net-p2p/eiskaltdcpp: Cleanup old and Qt4-based

metadata.xml indentation.

Gentoo-bug: 631788
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-p2p/eiskaltdcpp/Manifest                 |   1 -
 net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild | 146 ---------------------------
 net-p2p/eiskaltdcpp/metadata.xml             |  37 ++++---
 3 files changed, 18 insertions(+), 166 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 93b7ee2adde..38ddc729845 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,2 +1 @@
 DIST eiskaltdcpp-2.2.10.tar.gz 3843143 SHA256 e461c8c499e459651d6382a6ded6788e5ac9a9c4ff26386c3cf073d94d606127 SHA512 97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818 WHIRLPOOL 463abac15ccabdbe002d6b5e30cf1baa7486055e304ec963a4d50449ff8b451d093beba273d2e11a9002e642d6dcb06e05970898b893a86c7917dfbfa02611ae
-DIST eiskaltdcpp-2.2.9.tar.gz 3578993 SHA256 99f1f66038ec19ec14992df484f97b88238df5dd260ca72d5023fb9a6fef44b4 SHA512 8b3a58e1fe757b5cef50b3ec534f135b2285d843f0120758f07bd3a1ce82aaf0874d78a04ba1d2eb4f584db50a2bc3315536ebdbabbb4d296b42e8ca90cc630b WHIRLPOOL 0bb140c903556fd82d1e888b2dd581c362375983ad585ea0686e5cb8bebcf257d8356d546af3779103b9173c1f3a1061df383da8932a835eb7c5a1bb0e932c55

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
deleted file mode 100644
index 1a40bf8d5bc..00000000000
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="be bg cs de el en es fr hu it pl pt_BR ru sk sr@latin uk"
-
-inherit cmake-utils eutils l10n fdo-mime gnome2-utils
-[[ ${PV} = *9999* ]] && inherit git-r3
-
-DESCRIPTION="Qt based client for DirectConnect and ADC protocols, based on DC++ library"
-HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="cli daemon dbus +dht +emoticons examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp -xmlrpc"
-
-REQUIRED_USE="
-	cli? ( ^^ ( json xmlrpc ) )
-	emoticons? ( || ( gtk qt4 ) )
-	dbus? ( qt4 )
-	javascript? ( qt4 )
-	json? ( !xmlrpc )
-	libcanberra? ( gtk )
-	libnotify? ( gtk )
-	spell? ( qt4 )
-	sound? ( || ( gtk qt4 ) )
-	sqlite? ( qt4 )
-"
-
-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-1.38:=
-	>=dev-libs/openssl-0.9.8
-	sys-apps/attr
-	sys-libs/zlib
-	virtual/libiconv
-	virtual/libintl
-	idn? ( net-dns/libidn )
-	lua? ( >=dev-lang/lua-5.1 )
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	upnp? ( >=net-libs/miniupnpc-1.6 )
-	cli? (
-		>=dev-lang/perl-5.10
-		virtual/perl-Getopt-Long
-		dev-perl/Data-Dump
-		dev-perl/Term-ShellUI
-		json? ( dev-perl/JSON-RPC )
-		xmlrpc? ( dev-perl/RPC-XML )
-	)
-	daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
-	gtk? (
-		x11-libs/pango
-		x11-libs/gtk+:3
-		>=dev-libs/glib-2.24:2
-		x11-themes/hicolor-icon-theme
-		libcanberra? ( media-libs/libcanberra )
-		libnotify? ( >=x11-libs/libnotify-0.4.1 )
-	)
-	qt4? (
-		>=dev-qt/qtcore-4.6.0:4
-		>=dev-qt/qtgui-4.6.0:4
-		dbus? ( >=dev-qt/qtdbus-4.6.0:4 )
-		javascript? (
-			dev-qt/qtscript:4
-			x11-libs/qtscriptgenerator
-		)
-		spell? ( app-text/aspell )
-		sqlite? ( dev-qt/qtsql:4[sqlite] )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DOCS=( AUTHORS ChangeLog.txt )
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-			&& die "Sorry, but gcc-4.4 and earlier won't work."
-	fi
-}
-
-src_prepare() {
-	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
-
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-Dlinguas="$(l10n_get_locales)"
-		-DLOCAL_MINIUPNP=OFF
-		-DUSE_GTK=OFF
-		-DUSE_LIBGNOME2=OFF
-		"$(use cli && cmake-utils_use json USE_CLI_JSONRPC)"
-		"$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)"
-		"$(cmake-utils_use daemon NO_UI_DAEMON)"
-		"$(use daemon && cmake-utils_use json JSONRPC_DAEMON)"
-		"$(use daemon && cmake-utils_use xmlrpc XMLRPC_DAEMON)"
-		"$(cmake-utils_use dbus DBUS_NOTIFY)"
-		"$(cmake-utils_use dht WITH_DHT)"
-		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
-		"$(cmake-utils_use examples WITH_EXAMPLES)"
-		"$(cmake-utils_use gtk USE_GTK3)"
-		"$(cmake-utils_use idn USE_IDNA)"
-		"$(cmake-utils_use javascript USE_JS)"
-		"$(cmake-utils_use libcanberra LIBCANBERRA)"
-		"$(cmake-utils_use libnotify USE_LIBNOTIFY)"
-		"$(cmake-utils_use lua LUA_SCRIPT)"
-		"$(cmake-utils_use lua WITH_LUASCRIPTS)"
-		"$(cmake-utils_use !minimal WITH_DEV_FILES)"
-		"$(cmake-utils_use pcre PERL_REGEX)"
-		"$(cmake-utils_use qt4 USE_QT)"
-		"$(cmake-utils_use sound WITH_SOUNDS)"
-		"$(cmake-utils_use spell USE_ASPELL)"
-		"$(cmake-utils_use sqlite USE_QT_SQLITE)"
-		"$(cmake-utils_use upnp USE_MINIUPNP)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 6661b81a3c9..b65eafebb42 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -1,23 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <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
-  from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all
-  common DC hub software.
-  </longdescription>
-  <use>
-    <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="emoticons">Install emoticon packs</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>
-  </use>
-  <upstream>
-    <remote-id type="github">eiskaltdcpp/eiskaltdcpp</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<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
+	from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all
+	common DC hub software.
+	</longdescription>
+	<use>
+		<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="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>
+	</use>
+	<upstream>
+		<remote-id type="github">eiskaltdcpp/eiskaltdcpp</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2020-12-03 12:54 Marek Szuba
  0 siblings, 0 replies; 18+ messages in thread
From: Marek Szuba @ 2020-12-03 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     c11ec538c0ca56433c8ee13c8dc1345472438467
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 12:36:31 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 12:54:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11ec538

net-p2p/eiskaltdcpp: limit unmigrated ebuilds to dev-lang/lua:0

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild
index 69ba4dfd9af..bfdb1e07348 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,7 @@ RDEPEND="
 	)
 	daemon? ( xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] ) )
 	idn? ( net-dns/libidn )
-	lua? ( dev-lang/lua:= )
+	lua? ( dev-lang/lua:0= )
 	pcre? ( dev-libs/libpcre )
 	qt5? (
 		dev-qt/qtconcurrent:5


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2020-12-15 21:20 Marek Szuba
  0 siblings, 0 replies; 18+ messages in thread
From: Marek Szuba @ 2020-12-15 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     47d52b1d2401aac88b27138808cf76c87a84713d
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 21:19:12 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 21:19:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d52b1d

net-p2p/eiskaltdcpp-9999: migrate to lua-single.eclass

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild | 36 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 8a00e9cfb49..f4478e0ca01 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
 
 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-utils gnome2-utils l10n xdg-utils
+inherit cmake l10n lua-single xdg-utils
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"
@@ -22,6 +24,7 @@ REQUIRED_USE="
 	javascript? ( qt5 )
 	libcanberra? ( gtk )
 	libnotify? ( gtk )
+	lua? ( ${LUA_REQUIRED_USE} )
 	spell? ( qt5 )
 	sqlite? ( qt5 )
 "
@@ -60,7 +63,7 @@ RDEPEND="
 		libnotify? ( x11-libs/libnotify )
 	)
 	idn? ( net-dns/libidn )
-	lua? ( dev-lang/lua:= )
+	lua? ( ${LUA_DEPS} )
 	pcre? ( dev-libs/libpcre )
 	qt5? (
 		dev-qt/qtconcurrent:5
@@ -88,8 +91,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog.txt )
 
+CMAKE_REMOVE_MODULES_LIST="FindLua"
+
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
 }
 
@@ -99,9 +104,9 @@ src_configure() {
 		-Dlinguas="$(l10n_get_locales)"
 		-DLOCAL_MINIUPNP=OFF
 		-DUSE_GTK=OFF
+		-DUSE_LIBGNOME2=OFF
 		-DUSE_QT=OFF
 		-DUSE_QT_QML=OFF
-		-DUSE_LIBGNOME2=OFF
 		-DNO_UI_DAEMON=$(usex daemon)
 		-DDBUS_NOTIFY=$(usex dbus)
 		-DWITH_DHT=$(usex dht)
@@ -111,8 +116,6 @@ src_configure() {
 		-DUSE_JS=$(usex javascript)
 		-DUSE_LIBCANBERRA=$(usex libcanberra)
 		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DLUA_SCRIPT=$(usex lua)
-		-DWITH_LUASCRIPTS=$(usex lua)
 		-DWITH_DEV_FILES=$(usex !minimal)
 		-DPERL_REGEX=$(usex pcre)
 		-DUSE_QT5=$(usex qt5)
@@ -132,6 +135,13 @@ src_configure() {
 			-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
 	if use qt5 || use gtk; then
 		mycmakeargs+=(
 			-DWITH_EMOTICONS=ON
@@ -143,19 +153,15 @@ src_configure() {
 			-DWITH_SOUNDS=OFF
 		)
 	fi
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+	cmake_src_configure
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-01-25 17:38 Marek Szuba
  0 siblings, 0 replies; 18+ messages in thread
From: Marek Szuba @ 2021-01-25 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     dd676e78b6126967f449173cc4aa531cbe417db8
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 14:28:14 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 17:37:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd676e78

net-p2p/eiskaltdcpp: remove old

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild | 149 --------------------------
 1 file changed, 149 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild
deleted file mode 100644
index bfdb1e07348..00000000000
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-utils gnome2-utils l10n 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 )
-	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? ( dev-lang/lua:0= )
-	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}"/${P}-ipv6_upnp.patch
-	"${FILESDIR}"/${P}-miniupnpc{1,2}.patch
-	"${FILESDIR}"/${P}-openssl-1.1.patch
-	"${FILESDIR}"/${P}-tray-close.patch
-)
-
-src_prepare() {
-	cmake-utils_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)
-		-DLUA_SCRIPT=$(usex lua)
-		-DWITH_LUASCRIPTS=$(usex lua)
-		-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
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-02-28  8:05 Joonas Niilola
  0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2021-02-28  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     ea9a84c313855498c26825e578fbc1b2e313135e
Author:     Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 01:34:41 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 08:03:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9a84c3

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 <AT> gentoo.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/eiskaltdcpp/Manifest                       |  1 +
 ...ltdcpp-9999.ebuild => eiskaltdcpp-2.4.1.ebuild} | 34 +++++++++++++++++-----
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild        | 33 ++++++++++++++++-----
 net-p2p/eiskaltdcpp/metadata.xml                   | 10 ++++++-
 4 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index a50fbe6a2ab..d58c59f8511 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-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
similarity index 80%
copy from net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
copy to net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
index 50b6c2dfc1e..db60ca40584 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.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,15 +30,15 @@ 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"
+	KEYWORDS=""
 fi
 
 RDEPEND="
 	app-arch/bzip2
-	dev-libs/boost:=
 	dev-libs/openssl:0=
 	sys-apps/attr
 	sys-libs/zlib
@@ -52,7 +52,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 +85,9 @@ RDEPEND="
 	)
 	upnp? ( net-libs/miniupnpc )
 "
+BDEPEND="
+	gold? ( sys-devel/binutils[gold] )
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -90,6 +96,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 +111,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 +129,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 +155,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/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 50b6c2dfc1e..fe6e41e66ad 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 b65eafebb42..9f4843b1a10 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>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-02-28  8:05 Joonas Niilola
  0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2021-02-28  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c953ddc018bce284d9517c560f1732481c849063
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 08:04:58 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 08:04:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c953ddc0

net-p2p/eiskaltdcpp: use pkg_setup to setup lua correctly in 2.4.1

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
index 315afa71682..e9815bef177 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
@@ -99,6 +99,10 @@ PATCHES=(
 
 CMAKE_REMOVE_MODULES_LIST="FindLua"
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	cmake_src_prepare
 	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-02-28  8:05 Joonas Niilola
  0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2021-02-28  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     27c0a064ddc4c780307282ecbabf46f905a3145c
Author:     Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 12:34:04 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 08:04:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c0a064

net-p2p/eiskaltdcpp: Drop XML-RPC support

It fails to compile with newer versions of Eiskaltdc++ and
upstream is already planning to drop it (see [1]).

Patching the daemon to fix these errors is not trivial and
this codepath may introduce other issues as it is not well
tested.

While we are at this, also merge JSON support with the
daemon and cli USE flags as there is no point on keeping
it as a separated USE flag.

If you intend to readd ZML-RPC, please first write a patch
that addresses the compilation issues.

[1] https://github.com/eiskaltdcpp/eiskaltdcpp/issues/440

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18854
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild | 24 +++++-------------------
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild  | 26 +++++++-------------------
 net-p2p/eiskaltdcpp/metadata.xml             |  1 -
 3 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
index 620632d1c3a..315afa71682 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.1.ebuild
@@ -15,11 +15,9 @@ 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"
+IUSE="cli daemon dbus +dht examples gold gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp"
 
 REQUIRED_USE="
-	?? ( json xmlrpc )
-	cli? ( ^^ ( json xmlrpc ) )
 	dbus? ( qt5 )
 	javascript? ( qt5 )
 	libcanberra? ( gtk )
@@ -49,12 +47,10 @@ RDEPEND="
 		dev-perl/Data-Dump
 		dev-perl/Term-ShellUI
 		virtual/perl-Getopt-Long
-		json? ( dev-perl/JSON-RPC )
-		xmlrpc? ( dev-perl/RPC-XML )
+		dev-perl/JSON-RPC
 	)
 	daemon? (
-		json? ( dev-libs/jsoncpp:= )
-		xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] )
+		dev-libs/jsoncpp:=
 	)
 	gtk? (
 		dev-libs/glib:2
@@ -140,19 +136,9 @@ src_configure() {
 		-DBUILD_STATIC=OFF
 		-DINSTALL_QT_TRANSLATIONS=OFF
 		-DCOMPRESS_MANPAGES=OFF
+		-DUSE_CLI_JSONRPC=$(usex cli)
+		-DJSONRPC_DAEMON=$(usex daemon)
 	)
-	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

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 8467b419629..315afa71682 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -15,11 +15,9 @@ 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"
+IUSE="cli daemon dbus +dht examples gold gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp"
 
 REQUIRED_USE="
-	?? ( json xmlrpc )
-	cli? ( ^^ ( json xmlrpc ) )
 	dbus? ( qt5 )
 	javascript? ( qt5 )
 	libcanberra? ( gtk )
@@ -34,6 +32,7 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	KEYWORDS=""
 fi
 
 RDEPEND="
@@ -48,12 +47,10 @@ RDEPEND="
 		dev-perl/Data-Dump
 		dev-perl/Term-ShellUI
 		virtual/perl-Getopt-Long
-		json? ( dev-perl/JSON-RPC )
-		xmlrpc? ( dev-perl/RPC-XML )
+		dev-perl/JSON-RPC
 	)
 	daemon? (
-		json? ( dev-libs/jsoncpp:= )
-		xmlrpc? ( dev-libs/xmlrpc-c[abyss,cxx] )
+		dev-libs/jsoncpp:=
 	)
 	gtk? (
 		dev-libs/glib:2
@@ -97,6 +94,7 @@ 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"
@@ -138,19 +136,9 @@ src_configure() {
 		-DBUILD_STATIC=OFF
 		-DINSTALL_QT_TRANSLATIONS=OFF
 		-DCOMPRESS_MANPAGES=OFF
+		-DUSE_CLI_JSONRPC=$(usex cli)
+		-DJSONRPC_DAEMON=$(usex daemon)
 	)
-	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

diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 33f2f84657f..e7dbc6c81e7 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -20,7 +20,6 @@
 		<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>
 	</use>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-03-09  9:26 Joonas Niilola
  0 siblings, 0 replies; 18+ messages in thread
From: Joonas Niilola @ 2021-03-09  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     81d28992cf2944137079553831d2b077183846c7
Author:     Francisco Blas (klondike) Izquierdo Riera <klondike <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 17:23:20 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar  9 09:09:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d28992

net-p2p/eiskaltdcpp: Strip ie locale when USE=gtk

Eiskaltdc++ is planning to drop the GTK+ based GUI in the
next version and has asked translators not to consider it
when creating new translations.

As a result of this, the ie translation does not includes
the locale for the GTK library which results in an error
when the ebuild tries to compile it.

To address this, we filter the ie locale from the LINGUAS
variable whenever the gtk USE flag is set, to address the
issue and still allow using GTK if needed.

Closes: https://bugs.gentoo.org/774192
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/19818
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index c160df0f27b..9fc3dc202fe 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -104,6 +104,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use gtk && strip-linguas -i eiskaltdcpp-gtk/po/
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-Dlinguas="$(l10n_get_locales)"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-03-19  4:12 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-03-19  4:12 UTC (permalink / raw
  To: gentoo-commits

commit:     a948e734ce7ff05d3127e6146f5ae3b747409dab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 04:08:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 04:11:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a948e734

net-p2p/eiskaltdcpp: fix MultipleKeywordsLines

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 1 -
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index 9fc3dc202fe..6a9de498c3a 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -32,7 +32,6 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
 fi
 
 RDEPEND="

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index c160df0f27b..2c795225234 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -32,7 +32,6 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
 fi
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-06-30 10:15 Ulrich Müller
  0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2021-06-30 10:15 UTC (permalink / raw
  To: gentoo-commits

commit:     fbe04bc24770c3db6c23fb91dd80e5f157cc9465
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 10:06:07 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 10:15:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe04bc2

net-p2p/eiskaltdcpp: Add strip-linguas to inherit

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index 6a9de498c3a..1449f415e75 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 lua5-2 )
 
 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
+inherit cmake l10n lua-single strip-linguas xdg-utils toolchain-funcs
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-07-04 14:03 Ulrich Müller
  0 siblings, 0 replies; 18+ messages in thread
From: Ulrich Müller @ 2021-07-04 14:03 UTC (permalink / raw
  To: gentoo-commits

commit:     8608f57fd905613ea11157a5650eb008aeb71e61
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 15:46:46 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 14:02:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8608f57f

net-p2p/eiskaltdcpp: Update from l10n.eclass to plocale.eclass

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 6 +++---
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index 1449f415e75..71261a868be 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 lua5-2 )
 
 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 strip-linguas xdg-utils toolchain-funcs
+inherit cmake lua-single plocale strip-linguas xdg-utils toolchain-funcs
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"
@@ -99,14 +99,14 @@ pkg_setup() {
 
 src_prepare() {
 	cmake_src_prepare
-	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
+	plocale_find_changes 'eiskaltdcpp-qt/translations' '' '.ts'
 }
 
 src_configure() {
 	use gtk && strip-linguas -i eiskaltdcpp-gtk/po/
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-Dlinguas="$(l10n_get_locales)"
+		-Dlinguas="$(plocale_get_locales)"
 		-DCREATE_MO=ON
 		-DUSE_GTK=OFF
 		-DUSE_LIBGNOME2=OFF

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 2c795225234..2874c96fd79 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 lua5-2 )
 
 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
+inherit cmake lua-single plocale xdg-utils toolchain-funcs
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"
@@ -99,13 +99,13 @@ pkg_setup() {
 
 src_prepare() {
 	cmake_src_prepare
-	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
+	plocale_find_changes 'eiskaltdcpp-qt/translations' '' '.ts'
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-Dlinguas="$(l10n_get_locales)"
+		-Dlinguas="$(plocale_get_locales)"
 		-DCREATE_MO=ON
 		-DUSE_GTK=OFF
 		-DUSE_LIBGNOME2=OFF


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2021-10-04  0:27 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-10-04  0:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1a37f7b70f18b10f31d470b562f8bda9561b9265
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  4 00:25:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  4 00:25:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a37f7b7

net-p2p/eiskaltdcpp: fix CMake MisplacedEclassVar

Closes: https://bugs.gentoo.org/811582
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 4 +---
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index 71261a868be..c293b4a3b6f 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 lua5-2 )
-
+CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
 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 lua-single plocale strip-linguas xdg-utils toolchain-funcs
@@ -91,8 +91,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog.txt )
 
-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 2874c96fd79..10dbd43956b 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 lua5-2 )
-
+CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
 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 lua-single plocale xdg-utils toolchain-funcs
@@ -91,8 +91,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog.txt )
 
-CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
-
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2022-07-11  3:10 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2022-07-11  3:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b77592e0e2960c2a8a98806fcc6f0ee4eb8a1a95
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 03:03:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 03:03:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77592e0

net-p2p/eiskaltdcpp: fix UnusedInherits

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 4 ++--
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index c293b4a3b6f3..355264d134ad 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 lua5-2 )
 CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
 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 lua-single plocale strip-linguas xdg-utils toolchain-funcs
+inherit cmake lua-single plocale strip-linguas xdg-utils
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 10dbd43956b6..c27953956943 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-1 lua5-2 )
 CMAKE_REMOVE_MODULES_LIST="FindASPELL FindLua"
 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 lua-single plocale xdg-utils toolchain-funcs
+inherit cmake lua-single plocale xdg-utils
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2022-08-08  9:40 Andreas Sturmlechner
  0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2022-08-08  9:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e0044442a62a5f2cdb162fed7ee117f55ff62e1c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 18:16:05 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 09:40:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0044442

net-p2p/eiskaltdcpp: Move dev-qt/linguist-tools:5 to BDEPEND

Bug: https://bugs.gentoo.org/544938
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 9 +++------
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild  | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index 355264d134ad..a17d55bd6c39 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -48,9 +48,7 @@ RDEPEND="
 		virtual/perl-Getopt-Long
 		dev-perl/JSON-RPC
 	)
-	daemon? (
-		dev-libs/jsoncpp:=
-	)
+	daemon? ( dev-libs/jsoncpp:= )
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:3
@@ -80,12 +78,11 @@ RDEPEND="
 	)
 	upnp? ( net-libs/miniupnpc )
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
-	gold? ( sys-devel/binutils[gold] )
-"
-DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
+	gold? ( sys-devel/binutils[gold] )
 	qt5? ( dev-qt/linguist-tools:5 )
 "
 

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index c27953956943..e58477030d47 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -48,9 +48,7 @@ RDEPEND="
 		virtual/perl-Getopt-Long
 		dev-perl/JSON-RPC
 	)
-	daemon? (
-		dev-libs/jsoncpp:=
-	)
+	daemon? ( dev-libs/jsoncpp:= )
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gtk+:3
@@ -80,13 +78,12 @@ RDEPEND="
 	)
 	upnp? ( net-libs/miniupnpc )
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
-	gold? ( sys-devel/binutils[gold] )
-"
-DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 	qt5? ( dev-qt/linguist-tools:5 )
+	gold? ( sys-devel/binutils[gold] )
 "
 
 DOCS=( AUTHORS ChangeLog.txt )


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/
@ 2024-06-29 16:45 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-06-29 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9a0490ed8d476d5f9c30cca4bbc8c21b8ac52b74
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 16:37:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 16:45:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a0490ed

net-p2p/eiskaltdcpp: drop USE=gold

gold is considered dead. Also, this doesn't need a USE flag anyway,
users can specify it via flags.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild | 5 ++---
 net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild  | 5 ++---
 net-p2p/eiskaltdcpp/metadata.xml             | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index 0c3c7b3d3f74..382be035b896 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-IUSE="cli daemon dbus +dht examples gold gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp"
+IUSE="cli daemon dbus +dht examples gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp"
 
 REQUIRED_USE="
 	dbus? ( qt5 )
@@ -82,7 +82,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
-	gold? ( sys-devel/binutils[gold] )
 	qt5? ( dev-qt/linguist-tools:5 )
 "
 
@@ -125,7 +124,7 @@ src_configure() {
 		-DUSE_MINIUPNP=$(usex upnp)
 		-DFORCE_XDG=ON
 		-DENABLE_STACKTRACE=OFF
-		-DUSE_GOLD=$(usex gold)
+		-DUSE_GOLD=OFF
 		-DLOCAL_JSONCPP=OFF
 		-DBUILD_STATIC=OFF
 		-DINSTALL_QT_TRANSLATIONS=OFF

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 6c665b77c46d..9fb49e71e9c1 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-IUSE="cli daemon dbus +dht examples gold gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp"
+IUSE="cli daemon dbus +dht examples gtk idn javascript libcanberra libnotify lua +minimal pcre +qt5 spell sqlite upnp"
 
 REQUIRED_USE="
 	dbus? ( qt5 )
@@ -83,7 +83,6 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	qt5? ( dev-qt/linguist-tools:5 )
-	gold? ( sys-devel/binutils[gold] )
 "
 
 DOCS=( AUTHORS ChangeLog.txt )
@@ -124,7 +123,7 @@ src_configure() {
 		-DUSE_MINIUPNP=$(usex upnp)
 		-DFORCE_XDG=ON
 		-DENABLE_STACKTRACE=OFF
-		-DUSE_GOLD=$(usex gold)
+		-DUSE_GOLD=OFF
 		-DLOCAL_JSONCPP=OFF
 		-DBUILD_STATIC=OFF
 		-DINSTALL_QT_TRANSLATIONS=OFF

diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 73c871c00f3b..92c19d6509fb 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -12,7 +12,6 @@
 		<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="libcanberra">Enable sound notifications support over libcanberra in EiskaltDC++ Gtk</flag>
 		<flag name="minimal">Don't install headers</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2024-06-29 16:45 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-24 11:57 [gentoo-commits] repo/gentoo:master commit in: net-p2p/eiskaltdcpp/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-06-29 16:45 Sam James
2022-08-08  9:40 Andreas Sturmlechner
2022-07-11  3:10 Sam James
2021-10-04  0:27 Sam James
2021-07-04 14:03 Ulrich Müller
2021-06-30 10:15 Ulrich Müller
2021-03-19  4:12 Sam James
2021-03-09  9:26 Joonas Niilola
2021-02-28  8:05 Joonas Niilola
2021-02-28  8:05 Joonas Niilola
2021-02-28  8:05 Joonas Niilola
2021-01-25 17:38 Marek Szuba
2020-12-15 21:20 Marek Szuba
2020-12-03 12:54 Marek Szuba
2017-09-18 18:00 Andreas Sturmlechner
2017-03-06  1:52 Göktürk Yüksek
2016-11-27  6:01 Göktürk Yüksek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox