Updated dependencies: works with net-libs/libupnp-1.6 only and boost is build time dependency. Added new features in 9999 ebuild. Thank Nikoly for this job.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 44 insertions, 21 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index 5a5cd8765437..0838afa435f1 100644
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/eiskaltdcpp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.10 2010/07/20 07:10:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.11 2010/09/03 07:41:04 pva Exp $
+
+  03 Sep 2010; Peter Volkov <pva@gentoo.org> eiskaltdcpp-2.0.3.ebuild,
+  eiskaltdcpp-9999.ebuild, metadata.xml:
+  Updated dependencies: works with net-libs/libupnp-1.6 only and boost is
+  build time dependency. Added new features in 9999 ebuild. Thank Nikoly for
+  this job.
 
   20 Jul 2010; Peter Volkov <pva@gentoo.org> -eiskaltdcpp-2.0.2.ebuild,
   eiskaltdcpp-2.0.3.ebuild, eiskaltdcpp-9999.ebuild, metadata.xml:
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild
index fc05421bb1e9..74ddba464975 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild,v 1.2 2010/07/20 07:10:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild,v 1.3 2010/09/03 07:41:04 pva Exp $
 
 EAPI="3"
 
@@ -18,9 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="javascript kde spell"
 
 RDEPEND="
-	>=net-libs/libupnp-1.6.0
-	!>net-libs/libupnp-1.6.9999
-	>=dev-libs/boost-1.34.1
+	=net-libs/libupnp-1.6*
 	app-arch/bzip2
 	sys-libs/zlib
 	>=dev-libs/openssl-0.9.8
@@ -35,6 +33,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
+	>=dev-libs/boost-1.34.1
 	dev-util/pkgconfig
 "
 DOCS="AUTHORS ChangeLog.txt"
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 7165947e4982..965718c51268 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 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.10 2010/07/20 07:10:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.11 2010/09/03 07:41:04 pva Exp $
 
 EAPI="2"
 
-LANGS="be en fr hu pl ru sr uk"
+LANGS="be bg en es fr hu pl ru sr uk"
 CMAKE_MIN_VERSION="2.6.0"
 inherit qt4-r2 cmake-utils subversion
 
@@ -15,31 +15,47 @@ ESVN_REPO_URI="http://${PN%pp}.googlecode.com/svn/branches/trunk/"
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="dbus javascript kde spell upnp"
+IUSE="dbus examples -gnome -gtk -javascript kde lua +qt4 spell upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.34.1
 	app-arch/bzip2
 	sys-libs/zlib
 	>=dev-libs/openssl-0.9.8
 	virtual/libiconv
-	>=x11-libs/qt-gui-4.4.0:4[dbus?]
-	javascript? (
-		x11-libs/qt-script
-		x11-libs/qtscriptgenerator
+	sys-devel/gettext
+	lua? ( >=dev-lang/lua-5.1 )
+	gtk? (
+		x11-libs/pango
+		>=x11-libs/gtk+-2.10:2
+		>=dev-libs/glib-2.10:2
+		>=gnome-base/libglade-2.4:2.0
+		>=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
 		)
-	kde? ( kde-base/oxygen-icons )
-	spell? ( app-text/aspell )
-	upnp? (
-		>=net-libs/libupnp-1.6.0
-		!>net-libs/libupnp-1.6.9999
+		kde? (
+			kde-base/oxygen-icons
+			>=x11-libs/qt-gui-4.6.0:4
 		)
+		spell? ( app-text/aspell )
+		upnp? (	=net-libs/libupnp-1.6* )
+	)
 "
 DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.34.1
 	dev-util/pkgconfig
 "
 DOCS="AUTHORS ChangeLog.txt"
 
+pkg_setup() {
+	use gtk && ewarn "GTK UI is very experimental, only Qt4 frontend is stable."
+}
+
 src_configure() {
 	# linguas
 	local langs
@@ -49,14 +65,17 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-DFREE_SPACE_BAR_C="1"
+		"$(cmake-utils_use lua LUA_SCRIPT)"
 		"$(cmake-utils_use dbus DBUS_NOTIFY)"
 		"$(cmake-utils_use javascript USE_JS)"
 		"$(cmake-utils_use kde USE_ICON_THEME)"
 		"$(cmake-utils_use spell USE_ASPELL)"
-		"-DUSE_QT=ON"
+		"$(cmake-utils_use qt4 USE_QT)"
 		"$(cmake-utils_use upnp USE_LIBUPNP)"
+		"$(cmake-utils_use gtk USE_GTK)"
+		"$(cmake-utils_use gnome USE_LIBGNOME2)"
 		"-DUSE_WT=OFF"
+		"$(cmake-utils_use examples WITH_EXAMPLES)"
 		-Dlinguas="${langs}"
 	)
 	cmake-utils_src_configure
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index b39ce645d7c1..81d42ec4de29 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -20,4 +20,3 @@
   <flag name="upnp">Forward ports using UPnP</flag>
 </use>
 </pkgmetadata>
-