Version bump: lua fixed, qt4-r2 eclass dropped; thank Nikoli for this job. Fixed Unified sounds and sound USE flag, bug #357661, thank Ulrich Müller for report.

(Portage version: 2.1.9.42/cvs/Linux x86_64)

3 files changed, 105 insertions, 2 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index 8fb9ae7b1d59..1bbcc536d5ee 100644
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2011/01/19 13:02:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.23 2011/03/09 14:03:13 pva Exp $
+
+*eiskaltdcpp-2.2.1 (09 Mar 2011)
+
+  09 Mar 2011; Peter Volkov <pva@gentoo.org> +eiskaltdcpp-2.2.1.ebuild:
+  Version bump: lua fixed, qt4-r2 eclass dropped; thank Nikoli for this job.
+  Fixed Unified sounds and sound USE flag, bug #357661, thank Ulrich Müller
+  for report.
 
   19 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   eiskaltdcpp-2.1.1.ebuild, eiskaltdcpp-2.2.0.ebuild, eiskaltdcpp-9999.ebuild:
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.1.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.1.ebuild
new file mode 100644
index 000000000000..a7e22533cb7f
--- /dev/null
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.1.ebuild
@@ -0,0 +1,95 @@
+# 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.1.ebuild,v 1.1 2011/03/09 14:03:13 pva Exp $
+
+EAPI="3"
+
+LANGS="be bg cs en es fr hu pl ru sk sr uk"
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS=""
+inherit cmake-utils ${VCS_ECLASS}
+
+DESCRIPTION="Qt4 based client for DirectConnect and ADC protocols, based on DC++ library"
+HOMEPAGE="http://eiskaltdc.googlecode.com/"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="cli daemon dbus +emoticons examples -gnome -gtk -javascript libnotify lua +qt4 pcre sound spell sqlite upnp"
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://${PN/pp/}.googlecode.com/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="git://github.com/negativ/${PN}.git"
+	KEYWORDS=""
+fi
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/openssl-0.9.8
+	virtual/libiconv
+	sys-devel/gettext
+	cli? ( sys-libs/readline )
+	lua? ( >=dev-lang/lua-5.1 )
+	upnp? ( net-libs/miniupnpc )
+	gtk? (
+		x11-libs/pango
+		>=x11-libs/gtk+-2.10:2
+		>=dev-libs/glib-2.10:2
+		>=gnome-base/libglade-2.4:2.0
+		libnotify? ( >=x11-libs/libnotify-0.4.1 )
+		gnome? ( gnome-base/libgnome )
+	)
+	qt4? (
+		>=x11-libs/qt-gui-4.4.0:4[dbus?]
+		javascript? (
+			x11-libs/qt-script
+			x11-libs/qtscriptgenerator
+		)
+		spell? ( app-text/aspell )
+		sqlite? ( x11-libs/qt-sql:4[sqlite] )
+	)
+	pcre? ( >=dev-libs/libpcre-4.2 )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.34.1
+	dev-util/pkgconfig
+"
+DOCS="AUTHORS ChangeLog.txt"
+
+src_configure() {
+	# linguas
+	local langs x
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
+	done
+
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+		"$(cmake-utils_use lua LUA_SCRIPT)"
+		"$(cmake-utils_use dbus DBUS_NOTIFY)"
+		"$(cmake-utils_use javascript USE_JS)"
+		"$(cmake-utils_use spell USE_ASPELL)"
+		"$(cmake-utils_use sqlite USE_QT_SQLITE)"
+		"$(cmake-utils_use qt4 USE_QT)"
+		"$(cmake-utils_use upnp USE_MINIUPNP)"
+		-DLOCAL_MINIUPNP="0"
+		"$(cmake-utils_use gtk USE_GTK)"
+		"$(cmake-utils_use gnome USE_LIBGNOME2)"
+		"$(cmake-utils_use libnotify USE_LIBNOTIFY)"
+		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
+		"$(cmake-utils_use examples WITH_EXAMPLES)"
+		"$(cmake-utils_use lua WITH_LUASCRIPTS)"
+		"$(cmake-utils_use pcre PERL_REGEX)"
+		"$(cmake-utils_use sound WITH_SOUNDS)"
+		"$(cmake-utils_use cli CLI_DAEMON)"
+		"$(cmake-utils_use daemon NO_UI_DAEMON)"
+		-DXMLRPC_DAEMON=OFF
+		-Dlinguas="${langs}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 1e64cb66b1a9..c7d7275c1558 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -17,7 +17,8 @@
   common DC hub software. 
 </longdescription>
 <use>
-  <flag name="daemon">Enable eiskaltdcpp-daemon</flag>
+  <flag name="cli">Enable eiskaltdcpp-daemon with sample cli based on readline</flag>
+  <flag name="daemon">Enable eiskaltdcpp-daemon without any UI</flag>
   <flag name="emoticons">Install emoticon packs</flag>
   <flag name="sounds">Install sound files</flag>
   <flag name="upnp">Forward ports using UPnP</flag>