Bump LeechCraft to 0.4.97, remove 0.4.85 and 0.4.90

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 12 insertions, 55 deletions

diff --git a/net-p2p/leechcraft-eiskaltdcpp/ChangeLog b/net-p2p/leechcraft-eiskaltdcpp/ChangeLog
index 8e0750361d8e..cfbdb04eab7f 100644
--- a/net-p2p/leechcraft-eiskaltdcpp/ChangeLog
+++ b/net-p2p/leechcraft-eiskaltdcpp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/leechcraft-eiskaltdcpp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-eiskaltdcpp/ChangeLog,v 1.4 2011/12/16 18:48:26 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-eiskaltdcpp/ChangeLog,v 1.5 2011/12/31 12:18:55 maksbotan Exp $
+
+*leechcraft-eiskaltdcpp-0.4.97 (31 Dec 2011)
+
+  31 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org>
+  -leechcraft-eiskaltdcpp-0.4.85.ebuild, -leechcraft-eiskaltdcpp-0.4.90.ebuild,
+  +leechcraft-eiskaltdcpp-0.4.97.ebuild:
+  Bump to 0.4.97, remove 0.4.80 and 0.4.90
 
 *leechcraft-eiskaltdcpp-0.4.96-r1 (16 Dec 2011)
 
diff --git a/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.90.ebuild b/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.90.ebuild
deleted file mode 100644
index 43c3802bb7ea..000000000000
--- a/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.90.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.90.ebuild,v 1.2 2011/10/11 16:20:18 maksbotan Exp $
-
-EAPI="2"
-
-inherit leechcraft
-
-DESCRIPTION="EiskaltDC++ ported to LeechCraft."
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +emoticons examples javascript lua pcre spell sqlite upnp"
-
-RDEPEND="=net-misc/leechcraft-core-${PV}
-		app-arch/bzip2
-		sys-libs/zlib
-		>=dev-libs/openssl-0.9.8
-		virtual/libiconv
-		sys-devel/gettext
-		lua? ( >=dev-lang/lua-5.1 )
-		upnp? ( net-libs/miniupnpc )
-		javascript? (
-			x11-libs/qt-script
-			x11-libs/qtscriptgenerator
-		)
-		spell? ( app-text/aspell )
-		sqlite? ( x11-libs/qt-sql:4[sqlite] )
-		pcre? ( >=dev-libs/libpcre-4.2 )
-		virtual/leechcraft-task-show
-		!!net-p2p/eiskaltdcpp"
-DEPEND="=net-misc/leechcraft-core-${PV}
-		dev-util/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use lua LUA_SCRIPT)"
-		"$(cmake-utils_use lua WITH_LUASCRIPTS)"
-		"$(cmake-utils_use javascript USE_JS)"
-		"$(cmake-utils_use spell USE_ASPELL)"
-		"$(cmake-utils_use sqlite USE_QT_SQLITE)"
-		"$(cmake-utils_use upnp USE_MINIUPNP)"
-		-DLOCAL_MINIUPNP="0"
-		"$(cmake-utils_use emoticons WITH_EMOTICONS)"
-		"$(cmake-utils_use examples WITH_EXAMPLES)"
-		"$(cmake-utils_use pcre PERL_REGEX)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.85.ebuild b/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.97.ebuild
index b58f47f57b42..3235f48553ce 100644
--- a/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.85.ebuild
+++ b/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.97.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/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.85.ebuild,v 1.2 2011/10/11 16:20:18 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/leechcraft-eiskaltdcpp/leechcraft-eiskaltdcpp-0.4.97.ebuild,v 1.1 2011/12/31 12:18:55 maksbotan Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit leechcraft
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +emoticons examples javascript lua pcre spell sqlite upnp"
 
-RDEPEND="=net-misc/leechcraft-core-${PV}
+RDEPEND="~net-misc/leechcraft-core-${PV}
 		app-arch/bzip2
 		sys-libs/zlib
 		>=dev-libs/openssl-0.9.8
@@ -29,7 +29,7 @@ RDEPEND="=net-misc/leechcraft-core-${PV}
 		pcre? ( >=dev-libs/libpcre-4.2 )
 		virtual/leechcraft-task-show
 		!!net-p2p/eiskaltdcpp"
-DEPEND="=net-misc/leechcraft-core-${PV}
+DEPEND="~net-misc/leechcraft-core-${PV}
 		dev-util/pkgconfig"
 
 src_configure() {