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.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 109 insertions, 4 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/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 8d8437a305d2..f70b8f2283bd 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,7 +1,9 @@
 DIST eiskaltdcpp-2.1.1.tar.xz 1755900 RMD160 f37dd7bd24f4824042596e75d1ec724f42c8d238 SHA1 97916e3276676d81f383a1b65155da224d1b3118 SHA256 08fd76e73ebbf2408681043071e73f902b24404bdd8e4f44c2d7d338d5026f06
 DIST eiskaltdcpp-2.2.0.tar.xz 1914024 RMD160 5c03435cb16d858984317e84db983e0988994d77 SHA1 b7033720445ac36933ec495a16c2c07ca6d273ed SHA256 cbec256bf6d5737e6b1af615beff092ff232ba292cea161adebf191a9f794181
+DIST eiskaltdcpp-2.2.1.tar.xz 1916680 RMD160 e0c10b3eb7482e460f26a03396a03cad3d9f0fbf SHA1 bdb0beb9ef8f4448bb88e22028a72e6b44159898 SHA256 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40
 EBUILD eiskaltdcpp-2.1.1.ebuild 2123 RMD160 8746ef9ae5ba81d8c15383b509727d4b1d68b9bc SHA1 08b71228b1c89ae69e39abcfef697db988175a8b SHA256 612604e28cae99cf1bbf1a8a6b70cf4c61ffa9a4cf30ea0a2f1b2f33e1b947ca
 EBUILD eiskaltdcpp-2.2.0.ebuild 2223 RMD160 d217dce891a72782f7378c60b42fd9b7da1c44c7 SHA1 13907c93d5dadcd3491fbb8a0e720f92450aa98e SHA256 fdc1a2fc26aec7cc7177fd41b39414f2b4a3a1b4895e72c688e6af630ef5758b
+EBUILD eiskaltdcpp-2.2.1.ebuild 2566 RMD160 21371e700a8f96545fb5373e866d667a4d16dd32 SHA1 878b11bfb058bc1a181be7017a5a2a4c228029a6 SHA256 0e2343be8b338e1d7f7bc91c28b099cc7f343bba7b7f8f314965c91d88ae5c19
 EBUILD eiskaltdcpp-9999.ebuild 2347 RMD160 73d91cbcf6a35489e37c1f92f7376ab09b0bb05d SHA1 a7651f82cdcea0631c13e969d001e0df2204a0ce SHA256 f66d439a39191f6bb71d060083d6698c03ef34e1550d13867d3ffe471c7b166b
-MISC ChangeLog 4018 RMD160 5ec253e08c34bbb42f3cd51c51a275c238906308 SHA1 42165a3e71dead038b7efe784d216e32dee46f85 SHA256 2a433abead08067f90624fcaf31a31b53fb2d86c4418281b7506be73b7d837c4
-MISC metadata.xml 864 RMD160 cbc14df9548a4d0ad1dc198a3609e03da91f7fde SHA1 beb6d1dd67e0a71ee49c980f668c4cb3ebc4143e SHA256 be5e361417a0a40b04cc8130616e389a34c87f75bc3d1d366bf7ad9c44978612
+MISC ChangeLog 4287 RMD160 b4f1fe702fd75088307f3e5e931c287c2f4809aa SHA1 4de487b358af846af3ccc7de4406583ec9ace415 SHA256 9841089f15c45a99931415c9c5f434f646c845c0adb953a00dbe8283302df06a
+MISC metadata.xml 965 RMD160 7615db4886f5425c2cb7c045bc7445f07400aa0b SHA1 fe0a72c32915e7aad906a30df58ee6de8e30e57c SHA256 05fdb1f85bbd4564ab3102afa93ea6e5a777f7c4d1b59028a395a996f9d8136d
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>