Version bump, updated to eapi4. Drop older. Proxy commit for Nikoli.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 96 insertions, 45 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index 4f4deab96a02..34c16d5b6478 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.24 2011/03/10 06:43:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.25 2011/04/26 09:29:06 scarabeus Exp $
+
+*eiskaltdcpp-2.2.2 (26 Apr 2011)
+
+  26 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -eiskaltdcpp-2.2.0.ebuild, +eiskaltdcpp-2.2.2.ebuild,
+  eiskaltdcpp-9999.ebuild, metadata.xml:
+  Version bump, updated to eapi4. Drop older. Proxy commit for Nikoli.
 
   10 Mar 2011; Peter Volkov <pva@gentoo.org> eiskaltdcpp-9999.ebuild:
   Sync 9999 with 2.2.1.
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.0.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.2.ebuild
index 55cd638e605b..a4fdb395faea 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.0.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.2.ebuild
@@ -1,35 +1,62 @@
 # 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.0.ebuild,v 1.2 2011/01/19 13:02:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.2.ebuild,v 1.1 2011/04/26 09:29:06 scarabeus Exp $
 
-EAPI="3"
+EAPI="4"
 
 LANGS="be bg cs en es fr hu pl ru sk sr uk"
-inherit qt4-r2 cmake-utils
+
+[[ ${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/"
-SRC_URI="http://${PN/pp/}.googlecode.com/files/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="daemon dbus +emoticons examples -gnome -gtk -javascript libnotify +qt4 pcre sounds spell sqlite upnp"
+IUSE="cli 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
-	sys-libs/zlib
 	>=dev-libs/openssl-0.9.8
-	virtual/libiconv
 	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 )
 	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 )
+		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?]
@@ -40,10 +67,8 @@ RDEPEND="
 		spell? ( app-text/aspell )
 		sqlite? ( x11-libs/qt-sql:4[sqlite] )
 	)
-	pcre? ( >=dev-libs/libpcre-4.2 )
 "
 DEPEND="${RDEPEND}
-	app-arch/xz-utils
 	>=dev-libs/boost-1.34.1
 	dev-util/pkgconfig
 "
@@ -58,25 +83,28 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-DLUA_SCRIPT=OFF
+		-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)"
+		"$(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 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)"
-		-DWITH_LUASCRIPTS=OFF
-		"$(cmake-utils_use pcre PERL_REGEX)"
-		"$(cmake-utils_use sounds WITH_SOUNDS)"
-		"$(cmake-utils_use daemon NO_UI_DAEMON)"
 		-DXMLRPC_DAEMON=OFF
-		-Dlinguas="${langs}"
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 0899b1714481..b8836ad81c21 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,8 +1,8 @@
 # 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.19 2011/03/10 06:43:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.20 2011/04/26 09:29:06 scarabeus Exp $
 
-EAPI="3"
+EAPI="4"
 
 LANGS="be bg cs en es fr hu pl ru sk sr uk"
 
@@ -14,11 +14,22 @@ 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"
+IUSE="cli 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"
@@ -29,20 +40,23 @@ fi
 
 RDEPEND="
 	app-arch/bzip2
-	sys-libs/zlib
 	>=dev-libs/openssl-0.9.8
-	virtual/libiconv
 	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 )
 	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 )
+		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?]
@@ -53,7 +67,6 @@ RDEPEND="
 		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
@@ -70,26 +83,28 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
-		"$(cmake-utils_use lua LUA_SCRIPT)"
+		-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 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 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 cli CLI_DAEMON)"
-		"$(cmake-utils_use daemon NO_UI_DAEMON)"
+		"$(cmake-utils_use spell USE_ASPELL)"
+		"$(cmake-utils_use sqlite USE_QT_SQLITE)"
+		"$(cmake-utils_use upnp USE_MINIUPNP)"
 		-DXMLRPC_DAEMON=OFF
-		-Dlinguas="${langs}"
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index c7d7275c1558..01d96416c914 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -20,6 +20,7 @@
   <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="minimal">Don't install headers</flag>
   <flag name="sounds">Install sound files</flag>
   <flag name="upnp">Forward ports using UPnP</flag>
 </use>