Version bump, bug #419033, thank Nikoli for this job.

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

4 files changed, 160 insertions, 5 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index cb352eebb062..729417eff9e1 100644
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/eiskaltdcpp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.37 2012/05/04 06:33:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.38 2012/06/01 16:24:26 pva Exp $
+
+*eiskaltdcpp-2.2.7 (01 Jun 2012)
+
+  01 Jun 2012; Peter Volkov <pva@gentoo.org> +eiskaltdcpp-2.2.7.ebuild,
+  eiskaltdcpp-9999.ebuild:
+  Version bump, bug #419033, thank Nikoli for this job.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> eiskaltdcpp-2.2.1.ebuild,
   eiskaltdcpp-2.2.2.ebuild, eiskaltdcpp-2.2.3.ebuild, eiskaltdcpp-2.2.4.ebuild,
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 5ed60a760544..226fcd473838 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST eiskaltdcpp-2.2.1.tar.xz 1916680 RMD160 e0c10b3eb7482e460f26a03396a03cad3d9f0fbf SHA1 bdb0beb9ef8f4448bb88e22028a72e6b44159898 SHA256 2b2bd627a1325c595f604766404ca4f4787db1b49b4b0c5c5d8e88ddfc2a2c40
 DIST eiskaltdcpp-2.2.2.tar.xz 1928244 RMD160 06935cd72942ba2bdea7a332418020aa98097727 SHA1 183641ef6dda313ae0047e35b2aa69e0bcedaf0e SHA256 9289b23daa3c2683f9b10601233be422e4fcab33b307ad573a7fcaa5dd2194b5
 DIST eiskaltdcpp-2.2.3.tar.xz 2004692 RMD160 230da8beb1fb20d3d1a1c8421572195c4a9f21ab SHA1 29e31d6fe732a444d8710cf8badc0ed9de4ffa88 SHA256 190c0b8ac895b54ab7bdd455cd2b3ef4bf95471d5480441ffaef426959b27064
 DIST eiskaltdcpp-2.2.4.tar.xz 2008920 RMD160 7e27c1bd8b749283d2d887b3b3670c267c7aba05 SHA1 fe9908046981e4eedf036751b9582030eca5618a SHA256 a14d44ad1c48dc97354e17d3d8d8fc9bdd7be646d275603d092c6d9ebf7061b4
 DIST eiskaltdcpp-2.2.6.tar.xz 2139244 RMD160 85a835496d1361e8af9b6b642fa16aea977fd1ee SHA1 696a3a26b551848a336a58c7bb241b8d234851fd SHA256 378645840cb11297a311e915db930fba9e0273e38d99fba488dbef7743400ad8
+DIST eiskaltdcpp-2.2.7.tar.xz 2195324 RMD160 34bf932fd8d4477d8c8147eed3a26f0d66e6127f SHA1 ced990e57764983397c62972f1d2a3841ce4df9c SHA256 23f7855cccace4a6f1c90774033417838aab6771c6b5b10c7362bfbd670de8ad
 EBUILD eiskaltdcpp-2.2.1.ebuild 2566 RMD160 7f00d9743a47d454709eb4b4538c270114324ee8 SHA1 ecef39c60d9b0b0a4feb9731782729d370ba6024 SHA256 343005375a7442c9bc351cab0df4bd5affae42c362b40cc69311d05990380500
 EBUILD eiskaltdcpp-2.2.2.ebuild 2902 RMD160 23ba721695232629674e9c2d5a41b4f39b2f632c SHA1 b402c22abafff03184cf597e16c133aed8c32d54 SHA256 f3f404822bbcafef5dff393dffa1c098cf7113f3879632825dbcb2af78746dcc
 EBUILD eiskaltdcpp-2.2.3.ebuild 2835 RMD160 994a6f2a4b5cd8f7d414a4b04635efea35b4479e SHA1 6a10e0ff1c90cc3094bcf782f06d2112a2362f61 SHA256 48bc68f71e60e6fa7ee74d9de6232c144271e9247ed2577ed93666bd200c2154
 EBUILD eiskaltdcpp-2.2.4.ebuild 3305 RMD160 76b8cf814e3e19ec5463cf9c25852365e282b1ec SHA1 23be124642d2a2e3af20c920ac36f04bd4749601 SHA256 1eb2c7a9e414740f89374c04352924559c33c7766d4b69486ef9d0b979e0d625
 EBUILD eiskaltdcpp-2.2.6.ebuild 3852 RMD160 0d6dd9586605001579eea77115c8a5aadb8c2e1f SHA1 110cf8b9deb01c68efb1e0f75d4358be6650005d SHA256 6d6b25d92c809cbdc19adb238ad4a2a2555ee0c23571857c2fbf67bf276f9d7a
-EBUILD eiskaltdcpp-9999.ebuild 3852 RMD160 c76285d7afda783879900524279c77a7525d6be9 SHA1 fb9e60638aae23feaacccbeca546e2e6a7ae5772 SHA256 8f0c2e76372d80c932dd4ecc20b361e589ecae4451740d015be573cd096334cb
-MISC ChangeLog 6553 RMD160 dc8747fd8b1b7ecb9d499c6905432934a56e673f SHA1 e4c74bffcfe72ccfabd6359d75462ea3e32defb1 SHA256 393fdb558a81deb92b66a63eacd33f5a6db6ffc5159ebad3bd8f207ff4fe586c
+EBUILD eiskaltdcpp-2.2.7.ebuild 3849 RMD160 dc1410344c094ae76123328f6d7989e57d912b2f SHA1 39417b730d9092bd5bf59f1663bc741ce6fba1da SHA256 535d640886b4a23ea3a2043a7ef7554eb50d1184a5f658b737c67d1307e9e13c
+EBUILD eiskaltdcpp-9999.ebuild 3849 RMD160 12f31de93ccc5f950fcd11ec35562b25d3f8284c SHA1 e769f5e2482bb0a7fddd9c2b63eff5f56f30452b SHA256 a6afe1dbe630e719160b9b9db91453e8b8d19ad05f087ee699f836f60d8b89f8
+MISC ChangeLog 6740 RMD160 50772fe587e3993a9320c023808b69dd38c9ca37 SHA1 df3e713be28dcf1a5021574582b069cd5d2aca97 SHA256 8ddd3017610f33638423f2438449f5472f46c4f89793e70304725f8cd68d1c5e
 MISC metadata.xml 1331 RMD160 18fbd077ae6b48f2bee2b3404385bfb52767e4da SHA1 ed485727b74a9624a0899add6d676100e760c74e SHA256 123093a2b8c19790a04ea9615b3877c65303638ddfbeccc40b13aa7a78d43ca3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk/I7MEACgkQGrk+8vGYmwf3pQEA4F19rPWC0eCpKIfwEomfiXvJ
+U0AUjsqJbv29yNRhu2sA/jdxbLEbfA4XxHm7cLnswIR+hQPPOdNie83DpvIyBiRw
+=moHR
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild
new file mode 100644
index 000000000000..d5f00d707b8b
--- /dev/null
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.7.ebuild,v 1.1 2012/06/01 16:24:26 pva Exp $
+
+EAPI="4"
+
+LANGS="be bg cs de el en es fr hu it pl ru sk sr@latin uk"
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || 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 +dht +emoticons examples -gnome -gtk -gtk3 idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+REQUIRED_USE="
+	cli? ( ^^ ( json xmlrpc ) )
+	emoticons? ( || ( gtk qt4 ) )
+	dbus? ( qt4 )
+	gnome? ( gtk )
+	gtk3? ( gtk )
+	javascript? ( qt4 )
+	json? ( !xmlrpc )
+	libcanberra? ( !gnome gtk )
+	libnotify? ( gtk )
+	spell? ( qt4 )
+	sound? ( || ( gtk qt4 ) )
+	sqlite? ( qt4 )
+"
+
+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
+	>=dev-libs/openssl-0.9.8
+	sys-apps/attr
+	sys-devel/gettext
+	sys-libs/zlib
+	virtual/libiconv
+	idn? ( net-dns/libidn )
+	lua? ( >=dev-lang/lua-5.1 )
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	upnp? ( >=net-libs/miniupnpc-1.6 )
+	cli? (
+		>=dev-lang/perl-5.10
+		perl-core/Getopt-Long
+		dev-perl/Data-Dump
+		dev-perl/Term-ShellUI
+		json? ( dev-perl/JSON-RPC dev-perl/Data-Dump )
+		xmlrpc? (  dev-perl/RPC-XML )
+	)
+	daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
+	gtk? (
+		x11-libs/pango
+		gtk3? ( x11-libs/gtk+:3 )
+		!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+		>=dev-libs/glib-2.24:2
+		x11-themes/hicolor-icon-theme
+		gnome? ( gnome-base/libgnome )
+		libcanberra? ( media-libs/libcanberra )
+		libnotify? ( >=x11-libs/libnotify-0.4.1 )
+	)
+	qt4? (
+		>=x11-libs/qt-gui-4.6.0:4[dbus?]
+		javascript? (
+			x11-libs/qt-script
+			x11-libs/qtscriptgenerator
+		)
+		spell? ( app-text/aspell )
+		sqlite? ( x11-libs/qt-sql:4[sqlite] )
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.34.1
+	virtual/pkgconfig
+"
+DOCS="AUTHORS ChangeLog.txt"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
+			&& die "Sorry, but gcc-4.4 and earlier won't work."
+	fi
+}
+
+src_configure() {
+	# linguas
+	local langs x
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
+	done
+
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-Dlinguas="${langs}"
+		-DLOCAL_MINIUPNP=OFF
+		"$(use cli && cmake-utils_use json USE_CLI_JSONRPC)"
+		"$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)"
+		"$(cmake-utils_use daemon NO_UI_DAEMON)"
+		"$(use daemon && cmake-utils_use json JSONRPC_DAEMON)"
+		"$(use daemon && cmake-utils_use xmlrpc XMLRPC_DAEMON)"
+		"$(cmake-utils_use dbus DBUS_NOTIFY)"
+		"$(cmake-utils_use dht WITH_DHT)"
+		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
+		"$(cmake-utils_use examples WITH_EXAMPLES)"
+		"$(cmake-utils_use gnome USE_LIBGNOME2)"
+		"$(cmake-utils_use gtk USE_GTK)"
+		"$(cmake-utils_use gtk3 USE_GTK3)"
+		"$(cmake-utils_use idn USE_IDNA)"
+		"$(cmake-utils_use javascript USE_JS)"
+		"$(cmake-utils_use libcanberra LIBCANBERRA)"
+		"$(cmake-utils_use libnotify USE_LIBNOTIFY)"
+		"$(cmake-utils_use lua LUA_SCRIPT)"
+		"$(cmake-utils_use lua WITH_LUASCRIPTS)"
+		"$(cmake-utils_use !minimal WITH_DEV_FILES)"
+		"$(cmake-utils_use pcre PERL_REGEX)"
+		"$(cmake-utils_use qt4 USE_QT)"
+		"$(cmake-utils_use sound WITH_SOUNDS)"
+		"$(cmake-utils_use spell USE_ASPELL)"
+		"$(cmake-utils_use sqlite USE_QT_SQLITE)"
+		"$(cmake-utils_use upnp USE_MINIUPNP)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 35dcc78666d1..e6b195788984 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.28 2012/05/04 06:33:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.29 2012/06/01 16:24:26 pva Exp $
 
 EAPI="4"
 
@@ -73,7 +73,7 @@ RDEPEND="
 		libnotify? ( >=x11-libs/libnotify-0.4.1 )
 	)
 	qt4? (
-		>=x11-libs/qt-gui-4.4.0:4[dbus?]
+		>=x11-libs/qt-gui-4.6.0:4[dbus?]
 		javascript? (
 			x11-libs/qt-script
 			x11-libs/qtscriptgenerator