summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-10-19 19:50:45 +0000
committerPeter Volkov <pva@gentoo.org>2011-10-19 19:50:45 +0000
commitce118ae21c363a58596814d067017de684598ee3 (patch)
treeda60b35afec5c9c14cc170d860aa59a5a46d7538 /net-p2p
parentdev-java/ant-eclipse-ecj: added version 3.7 (diff)
downloadgentoo-2-ce118ae21c363a58596814d067017de684598ee3.tar.gz
gentoo-2-ce118ae21c363a58596814d067017de684598ee3.tar.bz2
gentoo-2-ce118ae21c363a58596814d067017de684598ee3.zip
Add cli in 2.2.4, fix cli usage in 9999, thank Nikoli for this job.
(Portage version: 2.1.10.27/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/eiskaltdcpp/ChangeLog6
-rw-r--r--net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild13
-rw-r--r--net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild4
3 files changed, 16 insertions, 7 deletions
diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index 28e5b16fcd26..236f6ca0afdc 100644
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-p2p/eiskaltdcpp
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.33 2011/10/19 08:13:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.34 2011/10/19 19:50:45 pva Exp $
+
+ 19 Oct 2011; Peter Volkov <pva@gentoo.org> eiskaltdcpp-2.2.4.ebuild,
+ eiskaltdcpp-9999.ebuild:
+ Add cli in 2.2.4, fix cli usage in 9999, thank Nikoli for this job.
19 Oct 2011; Peter Volkov <pva@gentoo.org> eiskaltdcpp-9999.ebuild:
dev-perl/Term-ShellUI is in the tree, cli is back. Thank Nikoli for this job.
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild
index c8f9b789fc9d..2fb7a66493ca 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild,v 1.1 2011/10/08 15:49:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild,v 1.2 2011/10/19 19:50:45 pva Exp $
EAPI="4"
@@ -14,7 +14,7 @@ HOMEPAGE="http://eiskaltdc.googlecode.com/"
LICENSE="GPL-2 GPL-3"
SLOT="0"
-IUSE="daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
+IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
for x in ${LANGS}; do
IUSE="${IUSE} linguas_${x}"
done
@@ -49,10 +49,15 @@ RDEPEND="
lua? ( >=dev-lang/lua-5.1 )
pcre? ( >=dev-libs/libpcre-4.2 )
upnp? ( net-libs/miniupnpc )
+ cli? (
+ >=dev-lang/perl-5.10
+ dev-perl/RPC-XML
+ dev-perl/Term-ShellUI
+ )
daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
gtk? (
x11-libs/pango
- >=x11-libs/gtk+-2.24:2
+ >=x11-libs/gtk+-2.18:2
>=dev-libs/glib-2.18:2
x11-themes/hicolor-icon-theme
gnome? ( gnome-base/libgnome )
@@ -93,6 +98,7 @@ src_configure() {
-DLIB_INSTALL_DIR="$(get_libdir)"
-Dlinguas="${langs}"
-DLOCAL_MINIUPNP=OFF
+ "$(cmake-utils_use cli USE_CLI)"
"$(cmake-utils_use daemon NO_UI_DAEMON)"
"$(cmake-utils_use dbus DBUS_NOTIFY)"
"$(cmake-utils_use dht WITH_DHT)"
@@ -113,7 +119,6 @@ src_configure() {
"$(cmake-utils_use sqlite USE_QT_SQLITE)"
"$(cmake-utils_use upnp USE_MINIUPNP)"
"$(cmake-utils_use xmlrpc XMLRPC_DAEMON)"
- -DUSE_CLI=OFF
)
cmake-utils_src_configure
}
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 79b7ae26c2fa..388e08c3f32a 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.25 2011/10/19 08:13:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.26 2011/10/19 19:50:45 pva Exp $
EAPI="4"
@@ -98,7 +98,7 @@ src_configure() {
-DLIB_INSTALL_DIR="$(get_libdir)"
-Dlinguas="${langs}"
-DLOCAL_MINIUPNP=OFF
- "$(cmake-utils_use cli)"
+ "$(cmake-utils_use cli USE_CLI)"
"$(cmake-utils_use daemon NO_UI_DAEMON)"
"$(cmake-utils_use dbus DBUS_NOTIFY)"
"$(cmake-utils_use dht WITH_DHT)"