Version bump: de translation, readline daemon is not available any more, for xmlrpc >=xmlrpc-c-1.19 (currently not in tree) is required. Thank Nikoli for this job.

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

5 files changed, 125 insertions, 10 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index dc2d1c06d71f..9bbfd4dc4a75 100644
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.29 2011/05/25 07:22:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.30 2011/06/27 09:20:19 pva Exp $
+
+*eiskaltdcpp-2.2.3 (27 Jun 2011)
+
+  27 Jun 2011; Peter Volkov <pva@gentoo.org> +eiskaltdcpp-2.2.3.ebuild,
+  eiskaltdcpp-9999.ebuild, metadata.xml:
+  Version bump: de translation, readline daemon is not available any more, for
+  xmlrpc >=xmlrpc-c-1.19 (currently not in tree) is required. Thank Nikoli for
+  this job.
 
   25 May 2011; Peter Volkov <pva@gentoo.org> -eiskaltdcpp-2.1.1.ebuild:
   Drop old.
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 7219e3a9059d..9953aaa5aeca 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD eiskaltdcpp-2.2.1.ebuild 2567 RMD160 164067e24486b9b7f7e582888bf7c724c108596a SHA1 6bce31e3d71a640110ab19bc68fed6eed108fd99 SHA256 cf89258d8f85aeed3eaad1517222d0551b636a14067f2142c4fe7d2a5d9b8532
 EBUILD eiskaltdcpp-2.2.2.ebuild 2900 RMD160 a03f80e192ed92a13a8547b980dad2439f34dc2e SHA1 9e75b1829ed521e08b56396fca39f6a526673068 SHA256 5a0301da85d190883306755db2ef28600b9c3c93359d1f4e9a78fdb1205091fc
-EBUILD eiskaltdcpp-9999.ebuild 2900 RMD160 944db7b6c1905d22a038f1a61c9bf21d2fb04793 SHA1 31bb1f37c27f46d0d47bf657ea74227197a71190 SHA256 0becff5bace2c3610ae597ae4e13c072364076e099b6edecffe954ef60f7a0c9
-MISC ChangeLog 5071 RMD160 a4f46c89cbb4ffa524f4be99513bc9ee3ffc0452 SHA1 926241e34ed22b0367da9d938c05c3d2cf1ccf06 SHA256 241ee95d3a0003fd69554419c03b82c54c85830981b62dda188ebeb888352032
-MISC metadata.xml 1017 RMD160 221c868cbd20b5bd89ddede6021121a67c3299a8 SHA1 b2e1a6c46ebf827437da73ae6944083c57ebfafe SHA256 8752e0d7886d012ec3b28188d73de9a3fdfc49b3f955b8be9b1d0731877019e7
+EBUILD eiskaltdcpp-2.2.3.ebuild 2833 RMD160 cfb4e634c6b87f96d0374ac1c5b364c3f754572f SHA1 60cf1a3b1699f6b6111f416708f0710f0d83a276 SHA256 143bd2dbbf2b9523a292ccde5efe78bd6dfd976af05d9a2684c70a69ad7b11e6
+EBUILD eiskaltdcpp-9999.ebuild 2833 RMD160 25b7c586da46fb6f443ef9ad6a5f643d7bb617e6 SHA1 6eb9c3c4479abe7dd95402c2e3315f1704b3a07f SHA256 1b0362457ae430b04255072fab68b527230ca7df436177f178d78d632c10857a
+MISC ChangeLog 5389 RMD160 45fdb8d4947131ed70b0f4f1831f9ecdcbe6b895 SHA1 9a9dbbdb35f9e3ac62a69ef6377a6fc41c2ef2a6 SHA256 2a669f329dedd5f75b68598574ea1f3b9008def219f435e54f8b8327c348a24f
+MISC metadata.xml 968 RMD160 a1810cf6c7c513c6778d2dc7827556ce464c8669 SHA1 5f18ad288be2e9c52d117ad4aadcc59e31bf7469 SHA256 c37dd94b7d5569063eaf4e0aaf5aeb71326e771c5d178033848e6e064486d0bd
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.3.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.3.ebuild
new file mode 100644
index 000000000000..cf784aa82911
--- /dev/null
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.3.ebuild
@@ -0,0 +1,108 @@
+# 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.3.ebuild,v 1.1 2011/06/27 09:20:19 pva Exp $
+
+EAPI="4"
+
+LANGS="be bg cs de 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="daemon dbus +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp"
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+REQUIRED_USE="
+	emoticons? ( || ( gtk qt4 ) )
+	dbus? ( qt4 )
+	gnome? ( gtk )
+	javascript? ( qt4 )
+	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-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 )
+	gtk? (
+		x11-libs/pango
+		>=x11-libs/gtk+-2.10:2
+		>=dev-libs/glib-2.10:2
+		>=gnome-base/libglade-2.4:2.0
+		x11-themes/hicolor-icon-theme
+		gnome? ( gnome-base/libgnome )
+		libnotify? ( >=x11-libs/libnotify-0.4.1 )
+	)
+	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] )
+	)
+"
+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)"
+		-Dlinguas="${langs}"
+		-DLOCAL_MINIUPNP=OFF
+		"$(cmake-utils_use daemon NO_UI_DAEMON)"
+		"$(cmake-utils_use dbus DBUS_NOTIFY)"
+		"$(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 idn USE_IDNA)"
+		"$(cmake-utils_use javascript USE_JS)"
+		"$(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)"
+		-DXMLRPC_DAEMON=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 678e2ceed872..b11f437aa5e2 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,10 +1,10 @@
 # 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-9999.ebuild,v 1.21 2011/04/29 19:58:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.22 2011/06/27 09:20:19 pva Exp $
 
 EAPI="4"
 
-LANGS="be bg cs en es fr hu pl ru sk sr uk"
+LANGS="be bg cs de en es fr hu pl ru sk sr uk"
 
 [[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS=""
 inherit cmake-utils ${VCS_ECLASS}
@@ -14,7 +14,7 @@ HOMEPAGE="http://eiskaltdc.googlecode.com/"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-IUSE="cli daemon dbus +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp"
+IUSE="daemon dbus +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp"
 for x in ${LANGS}; do
 	IUSE="${IUSE} linguas_${x}"
 done
@@ -44,7 +44,6 @@ RDEPEND="
 	sys-devel/gettext
 	sys-libs/zlib
 	virtual/libiconv
-	cli? ( sys-libs/readline )
 	idn? ( net-dns/libidn )
 	lua? ( >=dev-lang/lua-5.1 )
 	pcre? ( >=dev-libs/libpcre-4.2 )
@@ -85,7 +84,6 @@ src_configure() {
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-Dlinguas="${langs}"
 		-DLOCAL_MINIUPNP=OFF
-		"$(cmake-utils_use cli CLI_DAEMON)"
 		"$(cmake-utils_use daemon NO_UI_DAEMON)"
 		"$(cmake-utils_use dbus DBUS_NOTIFY)"
 		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 01d96416c914..67860a11c297 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -21,7 +21,6 @@
   <flag name="daemon">Enable eiskaltdcpp-daemon without any UI</flag>
   <flag name="emoticons">Install emoticon packs</flag>
   <flag name="minimal">Don't install headers</flag>
-  <flag name="sounds">Install sound files</flag>
   <flag name="upnp">Forward ports using UPnP</flag>
 </use>
 </pkgmetadata>