Cleanup, added upnp USE flag in 9999, thank Nikoli for this job.

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

6 files changed, 51 insertions, 76 deletions

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index daf2a4554cd9..5a5cd8765437 100644
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2010/07/13 13:09:56 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.10 2010/07/20 07:10:10 pva Exp $
+
+  20 Jul 2010; Peter Volkov <pva@gentoo.org> -eiskaltdcpp-2.0.2.ebuild,
+  eiskaltdcpp-2.0.3.ebuild, eiskaltdcpp-9999.ebuild, metadata.xml:
+  Cleanup, added upnp USE flag in 9999, thank Nikoli for this job.
 
   13 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 2e10a45a0289..fd60c967683b 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,7 +1,5 @@
-DIST eiskaltdcpp-2.0.2.tar.bz2 1142786 RMD160 679e7c057ee9978704cf398d0296661eff021997 SHA1 5722c0050267cdded25ef20cad683445797289e5 SHA256 e00b2927004e846c144d2543325906740a9adb14e94b353bfcf9ef96feb67612
 DIST eiskaltdcpp-2.0.3.tar.xz 956672 RMD160 efee955f70d67b2a6b26b910b09dd15f01141f06 SHA1 0ac701f26427f8d80a3075529ceed4c4dcbc9fb2 SHA256 5f67d10a46d327c1c57edad0819397855f98464b84b78e25db2435a9d6eb1074
-EBUILD eiskaltdcpp-2.0.2.ebuild 1051 RMD160 3ffe20ca1856f3d9b9e2365e4be384f6711cd59d SHA1 1c4f98b3617c0b7db0e97a08bc43d52e853c4fcd SHA256 d34e6125a8e7eff231b30d8b09e1f83b363c1c55d3d542c99cb2150533fb14bf
-EBUILD eiskaltdcpp-2.0.3.ebuild 1274 RMD160 e20c486ed2efdc8c4684cb8fff8c97d39575f893 SHA1 d6dff4ef201f3eb7bd433d1687e9a447570ed8e5 SHA256 60f7f509b0c41e76c3932fbbd1a700d9cb08a64419191a3fc791ce7c5c195ad8
-EBUILD eiskaltdcpp-9999.ebuild 1261 RMD160 108f7a200b3904292a4576e48e5c1256f567965e SHA1 2c0cc4eeee512b77bb6e937f92d520fb42c2bb52 SHA256 408923d48c665a41d6b63d6dea0400d29b8a68952e8de32cefdfacc46599fe26
-MISC ChangeLog 1771 RMD160 079df87d104a8d50201dfec3e0e3ab0755143efe SHA1 6dfccec85549948386fee7e95bd8b1ba39f2ae10 SHA256 8c1b981e22d920206cc74447fed29a68181310865c1051783ca7eafe1b191c49
-MISC metadata.xml 648 RMD160 a380c5a1094f8f5293ddaf557f0d1eac9ef1a33c SHA1 a11b02f866f46f649efc4e7b8e8789b08c39a3d8 SHA256 c75e3561692fb173ffca28c698a01028bf0153808a3275193b01b23973c0712f
+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
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.2.ebuild
deleted file mode 100644
index 507767bf168d..000000000000
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.2.ebuild,v 1.2 2010/06/11 16:41:24 pva Exp $
-
-EAPI=2
-
-LANGS="be en fr hu pl ru"
-inherit qt4-r2 cmake-utils
-
-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.bz2"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-RDEPEND=">=x11-libs/qt-gui-4.4.0:4[dbus]
-	net-libs/libupnp
-	dev-libs/boost
-	app-arch/bzip2
-	sys-libs/zlib
-	dev-libs/openssl
-	virtual/libiconv
-	spell? ( app-text/aspell )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog.txt"
-
-src_configure() {
-	# linguas
-	local langs
-	for lang in ${LANGS}; do
-		use linguas_${lang} && langs+="${lang} "
-	done
-
-	local mycmakeargs=(
-		-DFREE_SPACE_BAR_C="1"
-		"$(cmake-utils_use spell USE_ASPELL)"
-		-Dlinguas="${langs}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild
index fe86aaab33fc..fc05421bb1e9 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild
@@ -1,10 +1,11 @@
 # 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.1 2010/06/11 16:41:24 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.0.3.ebuild,v 1.2 2010/07/20 07:10:10 pva Exp $
 
-EAPI=3
+EAPI="3"
 
 LANGS="be en fr hu pl ru sr uk"
+CMAKE_MIN_VERSION="2.6.0"
 inherit qt4-r2 cmake-utils
 
 DESCRIPTION="Qt4 based client for DirectConnect and ADC protocols, based on DC++ library"
@@ -16,30 +17,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="javascript kde spell"
 
-RDEPEND=">=x11-libs/qt-gui-4.4.0:4[dbus]
-	net-libs/libupnp
-	dev-libs/boost
+RDEPEND="
+	>=net-libs/libupnp-1.6.0
+	!>net-libs/libupnp-1.6.9999
+	>=dev-libs/boost-1.34.1
 	app-arch/bzip2
 	sys-libs/zlib
-	dev-libs/openssl
+	>=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
 		)
 	kde? ( kde-base/oxygen-icons )
-	spell? ( app-text/aspell )"
+	spell? ( app-text/aspell )
+"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	dev-util/pkgconfig"
-
+	dev-util/pkgconfig
+"
 DOCS="AUTHORS ChangeLog.txt"
 
 src_configure() {
 	# linguas
 	local langs
-	for lang in ${LANGS}; do
-		use linguas_${lang} && langs+="${lang} "
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
 	done
 
 	local mycmakeargs=(
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index d2d46b1cdca7..7165947e4982 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,10 +1,11 @@
 # 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.9 2010/06/11 16:41:24 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.10 2010/07/20 07:10:10 pva Exp $
 
-EAPI=2
+EAPI="2"
 
 LANGS="be en fr hu pl ru sr uk"
+CMAKE_MIN_VERSION="2.6.0"
 inherit qt4-r2 cmake-utils subversion
 
 DESCRIPTION="Qt4 based client for DirectConnect and ADC protocols, based on DC++ library"
@@ -14,38 +15,48 @@ ESVN_REPO_URI="http://${PN%pp}.googlecode.com/svn/branches/trunk/"
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="javascript kde spell"
+IUSE="dbus javascript kde spell upnp"
 
-RDEPEND=">=x11-libs/qt-gui-4.4.0:4[dbus]
-	net-libs/libupnp
-	dev-libs/boost
+RDEPEND="
+	>=dev-libs/boost-1.34.1
 	app-arch/bzip2
 	sys-libs/zlib
-	dev-libs/openssl
+	>=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
 		)
 	kde? ( kde-base/oxygen-icons )
-	spell? ( app-text/aspell )"
+	spell? ( app-text/aspell )
+	upnp? (
+		>=net-libs/libupnp-1.6.0
+		!>net-libs/libupnp-1.6.9999
+		)
+"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
+	dev-util/pkgconfig
+"
 DOCS="AUTHORS ChangeLog.txt"
 
 src_configure() {
 	# linguas
 	local langs
-	for lang in ${LANGS}; do
-		use linguas_${lang} && langs+="${lang} "
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
 	done
 
 	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
 		-DFREE_SPACE_BAR_C="1"
+		"$(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 upnp USE_LIBUPNP)"
+		"-DUSE_WT=OFF"
 		-Dlinguas="${langs}"
 	)
 	cmake-utils_src_configure
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 557a0e4c2cea..b39ce645d7c1 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -11,10 +11,13 @@
   <name>Nikoli</name>
 </maintainer>
 <longdescription lang="en">
-  EiskaltDC++ is a program for UNIX-like systems that uses the Direct Connect and
+  EiskaltDC++ is a multi-platform program that uses the Direct Connect and
   ADC protocol. It is compatible with other DC clients, such as the original DC
   from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all
   common DC hub software. 
 </longdescription>
+<use>
+  <flag name="upnp">Forward ports using UPnP</flag>
+</use>
 </pkgmetadata>