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

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

5 files changed, 112 insertions, 50 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/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 9df2491bd086..ec77de6eb231 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST eiskaltdcpp-2.1.1.tar.xz 1755900 RMD160 f37dd7bd24f4824042596e75d1ec724f42c8d238 SHA1 97916e3276676d81f383a1b65155da224d1b3118 SHA256 08fd76e73ebbf2408681043071e73f902b24404bdd8e4f44c2d7d338d5026f06
-DIST eiskaltdcpp-2.2.0.tar.xz 1914024 RMD160 5c03435cb16d858984317e84db983e0988994d77 SHA1 b7033720445ac36933ec495a16c2c07ca6d273ed SHA256 cbec256bf6d5737e6b1af615beff092ff232ba292cea161adebf191a9f794181
 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
 EBUILD eiskaltdcpp-2.1.1.ebuild 2123 RMD160 8746ef9ae5ba81d8c15383b509727d4b1d68b9bc SHA1 08b71228b1c89ae69e39abcfef697db988175a8b SHA256 612604e28cae99cf1bbf1a8a6b70cf4c61ffa9a4cf30ea0a2f1b2f33e1b947ca
-EBUILD eiskaltdcpp-2.2.0.ebuild 2223 RMD160 d217dce891a72782f7378c60b42fd9b7da1c44c7 SHA1 13907c93d5dadcd3491fbb8a0e720f92450aa98e SHA256 fdc1a2fc26aec7cc7177fd41b39414f2b4a3a1b4895e72c688e6af630ef5758b
 EBUILD eiskaltdcpp-2.2.1.ebuild 2566 RMD160 21371e700a8f96545fb5373e866d667a4d16dd32 SHA1 878b11bfb058bc1a181be7017a5a2a4c228029a6 SHA256 0e2343be8b338e1d7f7bc91c28b099cc7f343bba7b7f8f314965c91d88ae5c19
-EBUILD eiskaltdcpp-9999.ebuild 2566 RMD160 6b0329acf224d4944b1f2208d3e40f2641564b8e SHA1 6d445e8e87aa1b2bd9f6295eeeb559c4bc3e261e SHA256 95c1f2101ef59f08b1d386110d5f787a6b470c27d91ba46de045eb3e55db334e
-MISC ChangeLog 4382 RMD160 dee4647e5a988807818d4fb0170d23d899cd7902 SHA1 b92fe7a0d5da639159b413afe71bae89c5b89ae1 SHA256 0e30f38528423b35ddf162a515baf7c63d503acaa9f40951d659ad7e898eaf8c
-MISC metadata.xml 965 RMD160 7615db4886f5425c2cb7c045bc7445f07400aa0b SHA1 fe0a72c32915e7aad906a30df58ee6de8e30e57c SHA256 05fdb1f85bbd4564ab3102afa93ea6e5a777f7c4d1b59028a395a996f9d8136d
+EBUILD eiskaltdcpp-2.2.2.ebuild 2904 RMD160 ac2b38ab9d5ada30d713a0d221d5567bcb8e5a8e SHA1 7b4179324a431f00d81b3753f6e4877bdf93f94f SHA256 1c178410dba1f222c9747159bad6d21ac3068d2226b0d40761bc5734468f968b
+EBUILD eiskaltdcpp-9999.ebuild 2904 RMD160 47f8d12a3c935e33ec4f85951e886b38421a4e77 SHA1 dd3b951d53c36639eb491920417472dbad617bab SHA256 723261590a6130bb7b9c16211b40c9a9bbf315fbab86b1f55757aa32e421a4ff
+MISC ChangeLog 4646 RMD160 6ab2fc3d9e1e31427926ff2b52c2b983b3ca68ae SHA1 f3f9a29b35241b813ffeaf4706eb31296ad8ddfe SHA256 b0bad02735e37f17bb1d25cd3810c1243686026650aa58bc61bba9a6a04ad9b9
+MISC metadata.xml 1017 RMD160 221c868cbd20b5bd89ddede6021121a67c3299a8 SHA1 b2e1a6c46ebf827437da73ae6944083c57ebfafe SHA256 8752e0d7886d012ec3b28188d73de9a3fdfc49b3f955b8be9b1d0731877019e7
+MISC metadata.xml.orig 965 RMD160 7615db4886f5425c2cb7c045bc7445f07400aa0b SHA1 fe0a72c32915e7aad906a30df58ee6de8e30e57c SHA256 05fdb1f85bbd4564ab3102afa93ea6e5a777f7c4d1b59028a395a996f9d8136d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk22kGEACgkQHB6c3gNBRYfTswCcDW+TgGCOI4sFbpVmjPm0LTTL
+wesAn1bfGh9zkJ4ujkYZRXAnyYg35cLB
+=l5Vc
+-----END PGP SIGNATURE-----
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>