Version bump. Drop older. Per bug #331513

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 11 insertions, 107 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 5b7282c4d2fa..692993c19786 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.75 2010/06/03 10:42:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.76 2010/08/07 13:05:59 scarabeus Exp $
+
+*weechat-0.3.3 (07 Aug 2010)
+
+  07 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -weechat-0.2.6.2.ebuild, -weechat-0.2.6.3.ebuild, -weechat-0.3.2.ebuild,
+  +weechat-0.3.3.ebuild:
+  Version bump. Drop older. Per bug #331513
 
   03 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
   weechat-0.3.1.1-r1.ebuild:
diff --git a/net-irc/weechat/weechat-0.2.6.2.ebuild b/net-irc/weechat/weechat-0.2.6.2.ebuild
deleted file mode 100644
index e5e296523c65..000000000000
--- a/net-irc/weechat/weechat-0.2.6.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.2.6.2.ebuild,v 1.3 2009/09/26 20:37:00 graaff Exp $
-
-DESCRIPTION="Portable and multi-interface IRC client."
-HOMEPAGE="http://www.weechat.org/"
-SRC_URI="http://www.weechat.org/files/src/${P}.tar.bz2"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="debug perl python ruby ssl lua spell"
-
-DEPEND="sys-libs/ncurses
-	virtual/libiconv
-	perl? ( dev-lang/perl )
-	python? ( virtual/python )
-	ruby? ( dev-lang/ruby )
-	lua? ( >=dev-lang/lua-5.0 )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# The qt and gtk frontends are not usable, so they're disabled
-
-	# this is a hack but solves the issue from bug #248030 (wrong
-	# dblatex being picked up) — flameeyes
-	export ac_cv_prog_DBLATEX_FOUND=no
-
-	econf \
-		--enable-ncurses \
-		--disable-qt \
-		--disable-gtk \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable lua) \
-		$(use_enable ssl gnutls) \
-		$(use_enable spell aspell) \
-		$(use_with debug debug 2) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO || die "dodoc failed"
-}
diff --git a/net-irc/weechat/weechat-0.2.6.3.ebuild b/net-irc/weechat/weechat-0.2.6.3.ebuild
deleted file mode 100644
index 17d8d1a1b56c..000000000000
--- a/net-irc/weechat/weechat-0.2.6.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.2.6.3.ebuild,v 1.2 2009/09/26 20:37:00 graaff Exp $
-
-DESCRIPTION="Portable and multi-interface IRC client."
-HOMEPAGE="http://www.weechat.org/"
-SRC_URI="http://www.weechat.org/files/src/${P}.tar.bz2"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="debug perl python ruby ssl lua spell"
-
-DEPEND="sys-libs/ncurses
-	virtual/libiconv
-	perl? ( dev-lang/perl )
-	python? ( virtual/python )
-	ruby? ( dev-lang/ruby )
-	lua? ( >=dev-lang/lua-5.0 )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# The qt and gtk frontends are not usable, so they're disabled
-
-	# this is a hack but solves the issue from bug #248030 (wrong
-	# dblatex being picked up) — flameeyes
-	export ac_cv_prog_DBLATEX_FOUND=no
-
-	econf \
-		--enable-ncurses \
-		--disable-qt \
-		--disable-gtk \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable lua) \
-		$(use_enable ssl gnutls) \
-		$(use_enable spell aspell) \
-		$(use_with debug debug 2) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO || die "dodoc failed"
-}
diff --git a/net-irc/weechat/weechat-0.3.2.ebuild b/net-irc/weechat/weechat-0.3.3.ebuild
index 426113ccec82..9cc35f0c66d2 100644
--- a/net-irc/weechat/weechat-0.3.2.ebuild
+++ b/net-irc/weechat/weechat-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.2.ebuild,v 1.3 2010/04/19 17:51:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.3.ebuild,v 1.1 2010/08/07 13:05:59 scarabeus Exp $
 
 EAPI=2
 
@@ -18,13 +18,12 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 NETWORKS="+irc"
 PLUGINS="+charset +fifo +logger relay +scripts +spell"
-INTERFACES="+ncurses gtk"
+INTERFACES="+ncurses"
 SCRIPT_LANGS="lua +perl +python ruby tcl"
 IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} doc nls +ssl"
 
 RDEPEND="
 	charset? ( virtual/libiconv )
-	gtk? ( x11-libs/gtk+:2 )
 	lua? ( dev-lang/lua[deprecated] )
 	ncurses? ( sys-libs/ncurses )
 	perl? ( dev-lang/perl )
@@ -55,11 +54,7 @@ src_configure() {
 	local x
 
 	for x in ${IUSE}; do
-		if [[ "${x/+/}" = gtk ]]; then
-			mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable ${x/+/})"
-		else
-			mycmakeargs="${mycmakeargs} $(cmake-utils_use_disable ${x/+/})"
-		fi
+		mycmakeargs="${mycmakeargs} $(cmake-utils_use_disable ${x/+/})"
 	done
 
 	cmake-utils_src_configure