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, 17 insertions, 75 deletions

diff --git a/net-im/leechcraft-azoth/ChangeLog b/net-im/leechcraft-azoth/ChangeLog
index 4c20dbaec352..1ac6f8cb3d6b 100644
--- a/net-im/leechcraft-azoth/ChangeLog
+++ b/net-im/leechcraft-azoth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/leechcraft-azoth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/ChangeLog,v 1.8 2011/12/24 18:58:22 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/ChangeLog,v 1.9 2011/12/31 12:08:41 maksbotan Exp $
+
+*leechcraft-azoth-0.4.97 (31 Dec 2011)
+
+  31 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org>
+  -leechcraft-azoth-0.4.85.ebuild, -leechcraft-azoth-0.4.90.ebuild,
+  +leechcraft-azoth-0.4.97.ebuild:
+  Bump to 0.4.97, remove 0.4.80 and 0.4.90
 
   24 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org>
   leechcraft-azoth-9999.ebuild, metadata.xml:
diff --git a/net-im/leechcraft-azoth/leechcraft-azoth-0.4.85.ebuild b/net-im/leechcraft-azoth/leechcraft-azoth-0.4.85.ebuild
deleted file mode 100644
index 2593627daa08..000000000000
--- a/net-im/leechcraft-azoth/leechcraft-azoth-0.4.85.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/leechcraft-azoth-0.4.85.ebuild,v 1.2 2011/08/25 15:13:22 maksbotan Exp $
-
-EAPI="2"
-
-inherit leechcraft
-
-DESCRIPTION="Azoth, the modular IM client for LeechCraft."
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt
-		+depester +embedmedia +herbicide +hili +juick +lastseen +metacontacts
-		+modnok +nativeemoticons +p100q +rosenthal +standardstyles +xoox
-		+xtazy"
-
-DEPEND="=net-misc/leechcraft-core-${PV}
-		x11-libs/qt-webkit
-		x11-libs/qt-multimedia
-		xoox? ( net-libs/qxmpp[extras] media-libs/speex )
-		xtazy? ( x11-libs/qt-dbus )
-		crypt? ( app-crypt/qca app-crypt/qca-gnupg )
-		"
-RDEPEND="${DEPEND}
-	modnok? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable crypt CRYPT)
-		$(cmake-utils_use_enable acetamide AZOTH_ACETAMIDE)
-		$(cmake-utils_use_enable adiumstyles AZOTH_ADIUMSTYLES)
-		$(cmake-utils_use_enable autoidler AZOTH_AUTOIDLER)
-		$(cmake-utils_use_enable autopaste AZOTH_AUTOPASTE)
-		$(cmake-utils_use_enable chathistory AZOTH_CHATHISTORY)
-		$(cmake-utils_use_enable depester AZOTH_DEPESTER)
-		$(cmake-utils_use_enable embedmedia AZOTH_EMBEDMEDIA)
-		$(cmake-utils_use_enable herbicide AZOTH_HERBICIDE)
-		$(cmake-utils_use_enable hili AZOTH_HILI)
-		$(cmake-utils_use_enable juick AZOTH_JUICK)
-		$(cmake-utils_use_enable lastseen AZOTH_LASTSEEN)
-		$(cmake-utils_use_enable metacontacts AZOTH_LASTSEEN)
-		$(cmake-utils_use_enable modnok AZOTH_MODNOK)
-		$(cmake-utils_use_enable nativeemoticons AZOTH_NATIVEEMOTICONS)
-		$(cmake-utils_use_enable p100q AZOTH_P100Q)
-		$(cmake-utils_use_enable rosenthal AZOTH_ROSENTHAL)
-		$(cmake-utils_use_enable standardstyles AZOTH_STANDARDSTYLES)
-		$(cmake-utils_use_enable xoox AZOTH_XOOX)
-		$(cmake-utils_use_enable xtazy AZOTH_XTAZY)
-		"
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use rosenthal; then
-		elog "You have enabled the Azoth Rosenthal plugin for"
-		elog "spellchecking. It uses Hunspell/Myspell dictionaries,"
-		elog "so install the ones for languages you use to enable"
-		elog "spellchecking."
-	fi
-}
diff --git a/net-im/leechcraft-azoth/leechcraft-azoth-0.4.90.ebuild b/net-im/leechcraft-azoth/leechcraft-azoth-0.4.97.ebuild
index 398d243bf06a..f1ae5c6aa6f1 100644
--- a/net-im/leechcraft-azoth/leechcraft-azoth-0.4.90.ebuild
+++ b/net-im/leechcraft-azoth/leechcraft-azoth-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-im/leechcraft-azoth/leechcraft-azoth-0.4.90.ebuild,v 1.1 2011/09/15 05:28:20 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/leechcraft-azoth/leechcraft-azoth-0.4.97.ebuild,v 1.1 2011/12/31 12:08:41 maksbotan Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit leechcraft
 
@@ -11,13 +11,14 @@ DESCRIPTION="Azoth, the modular IM client for LeechCraft."
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +acetamide +adiumstyles +autoidler +autopaste +chathistory +crypt
-		+depester +embedmedia +herbicide +hili +juick +lastseen +metacontacts
-		+modnok +nativeemoticons +p100q +rosenthal +standardstyles +xoox
-		+xtazy"
+		+depester +embedmedia +herbicide +hili +isterique +juick +lastseen
+		+metacontacts +modnok +nativeemoticons +otroid +p100q +rosenthal
+		+standardstyles +xoox +xtazy"
 
-DEPEND="=net-misc/leechcraft-core-${PV}
+DEPEND="~net-misc/leechcraft-core-${PV}
 		x11-libs/qt-webkit
 		x11-libs/qt-multimedia
+		otroid? ( net-libs/libotr )
 		xoox? ( net-libs/qxmpp[extras] media-libs/speex )
 		xtazy? ( x11-libs/qt-dbus )
 		crypt? ( app-crypt/qca app-crypt/qca-gnupg )"
@@ -42,11 +43,13 @@ src_configure() {
 		$(cmake-utils_use_enable embedmedia AZOTH_EMBEDMEDIA)
 		$(cmake-utils_use_enable herbicide AZOTH_HERBICIDE)
 		$(cmake-utils_use_enable hili AZOTH_HILI)
+		$(cmake-utils_use_enable isterique AZOTH_ISTERIQUE)
 		$(cmake-utils_use_enable juick AZOTH_JUICK)
 		$(cmake-utils_use_enable lastseen AZOTH_LASTSEEN)
 		$(cmake-utils_use_enable metacontacts AZOTH_LASTSEEN)
 		$(cmake-utils_use_enable modnok AZOTH_MODNOK)
 		$(cmake-utils_use_enable nativeemoticons AZOTH_NATIVEEMOTICONS)
+		$(cmake-utils_use_enable otroid AZOTH_OTROID)
 		$(cmake-utils_use_enable p100q AZOTH_P100Q)
 		$(cmake-utils_use_enable rosenthal AZOTH_ROSENTHAL)
 		$(cmake-utils_use_enable standardstyles AZOTH_STANDARDSTYLES)