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.

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

5 files changed, 48 insertions, 25 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/Manifest b/net-p2p/eiskaltdcpp/Manifest
index fd60c967683b..9d0c751b4580 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,5 +1,5 @@
 DIST eiskaltdcpp-2.0.3.tar.xz 956672 RMD160 efee955f70d67b2a6b26b910b09dd15f01141f06 SHA1 0ac701f26427f8d80a3075529ceed4c4dcbc9fb2 SHA256 5f67d10a46d327c1c57edad0819397855f98464b84b78e25db2435a9d6eb1074
-EBUILD eiskaltdcpp-2.0.3.ebuild 1350 RMD160 66c1ab5ef6e26b8bf0c35b97ffac942930b3eacd SHA1 aa2444c50a482b093b6461d3f343658915f73d46 SHA256 519071db8bc733666d4f1d52680984bb2e3f01da182647c0283d5f8d6ad3e310
-EBUILD eiskaltdcpp-9999.ebuild 1513 RMD160 d6e63250e0d11bb7396923427037030a53775d70 SHA1 e1eae2f9f27093d836416baca16bd87e56bdf166 SHA256 5a47babe557c777b3553d7b01bd42380223cacb30285eef2ef0b899d841a3b6d
-MISC ChangeLog 1971 RMD160 e597eff20acc20535912ac32b40d37700e3599cb SHA1 58da134700244231c3ccd509dda51594927b9b91 SHA256 ca9244e00067d8d11baf719b14e1557c5a317f9f11a861c8aca081d6c88c0520
-MISC metadata.xml 706 RMD160 fb1122f11aa84eeded56126ad9ae19bdf37a3a45 SHA1 c814f483384f658ca7d4aada09a12d6a66a65563 SHA256 ee521f0e38dc6420eb9700377df8e6172cd65c735e08c81a07eba1f75002fab2
+EBUILD eiskaltdcpp-2.0.3.ebuild 1319 RMD160 beb6142234fa2e083762bd8c80b177b7489c20e2 SHA1 54c58bcd64b116a9f7d668086eea418f60555fab SHA256 8bc1142b45b219554213fee254907495a58dd1553ba7ac9b8fbf4c54e82acddd
+EBUILD eiskaltdcpp-9999.ebuild 2036 RMD160 d19b8d3c844676ecbf3ab3fe61b95e63de52b786 SHA1 a14e4b6e6bc7ceb0700b30d0393aefe8a7bfeb43 SHA256 de33e313383ee679e05d6ca413bc2388d0dfb189425e8af0e0f517d2f902283d
+MISC ChangeLog 2247 RMD160 6d058702dfd14b770d7536b280ab1326ded5a273 SHA1 d5d4bff837e46e2dd09279b00fbcd88ba4737202 SHA256 a636edfc38e46464b7e0277f44e018abce26379a24b31c3d2468ded2d211f6b8
+MISC metadata.xml 705 RMD160 5b4230be9b5f6a31406be383805f3f4c5fbf47ab SHA1 437e9e999c742761c398ca25a00b749e5e4d3e58 SHA256 6f87de56d56e51d9368f1d8087d66d4652cce1189625057814ffb4409f0a840b
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>
-