amd64 stable wrt bug #359259

(Portage version: 2.2.0_alpha34/cvs/Linux x86_64)

3 files changed, 7 insertions, 94 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index e63dd898a1a1..5105d54519dc 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.93 2011/05/27 07:15:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.94 2011/05/27 08:01:01 scarabeus Exp $
+
+  27 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -weechat-0.3.4.ebuild,
+  weechat-0.3.5.ebuild:
+  amd64 stable wrt bug #359259
 
   27 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> weechat-0.3.5.ebuild:
   x86 stable wrt security bug #359259
diff --git a/net-irc/weechat/weechat-0.3.4.ebuild b/net-irc/weechat/weechat-0.3.4.ebuild
deleted file mode 100644
index 8fcf5dc04107..000000000000
--- a/net-irc/weechat/weechat-0.3.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.4.ebuild,v 1.8 2011/05/09 08:45:58 phajdan.jr Exp $
-
-EAPI=3
-
-USE_RUBY="ruby18 ruby19"
-RUBY_OPTIONAL="yes"
-
-PYTHON_DEPEND="python? 2"
-
-EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
-[[ ${PV} == "9999" ]] && GIT_ECLASS="git"
-inherit python multilib ruby-ng cmake-utils ${GIT_ECLASS}
-
-DESCRIPTION="Portable and multi-interface IRC client."
-HOMEPAGE="http://weechat.org/"
-[[ ${PV} == "9999" ]] || SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-NETWORKS="+irc"
-PLUGINS="+alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer"
-INTERFACES="+ncurses" # gtk"
-SCRIPT_LANGS="lua +perl +python ruby tcl"
-IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} +crypt doc nls +ssl"
-
-RDEPEND="
-	charset? ( virtual/libiconv )
-	lua? ( dev-lang/lua[deprecated] )
-	ncurses? ( sys-libs/ncurses )
-	perl? ( dev-lang/perl )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15 )
-"
-#	gtk? ( x11-libs/gtk+:2 )
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-#REQUIRED_USE=" || ( ncurses )" # || ( ncurses gtk )
-
-pkg_setup() {
-	python_set_active_version 2
-
-	ruby-ng_pkg_setup
-}
-
-src_prepare() {
-	# fix libdir placement
-	sed -i \
-		-e "s:lib/:$(get_libdir)/:g" \
-		-e "s:lib\":$(get_libdir)\":g" \
-		CMakeLists.txt || die "sed failed"
-}
-
-# alias, rmodifier, xfer
-src_configure() {
-	mycmakeargs=(
-		"-DENABLE_LARGEFILE=ON"
-		"-DENABLE_DEMO=OFF"
-		"-DENABLE_GTK=OFF"
-		$(cmake-utils_use_enable ncurses)
-		$(cmake-utils_use_enable nls)
-		$(cmake-utils_use_enable crypt GCRYPT)
-		$(cmake-utils_use_enable spell ASPELL)
-		$(cmake-utils_use_enable charset)
-		$(cmake-utils_use_enable fifo)
-		$(cmake-utils_use_enable irc)
-		$(cmake-utils_use_enable logger)
-		$(cmake-utils_use_enable relay)
-		$(cmake-utils_use_enable scripts)
-		$(cmake-utils_use_enable perl)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable ruby)
-		$(cmake-utils_use_enable lua)
-		$(cmake-utils_use_enable tcl)
-		$(cmake-utils_use_enable doc)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-0.3.5.ebuild b/net-irc/weechat/weechat-0.3.5.ebuild
index 60df2a35ab42..7d680f0a5d6c 100644
--- a/net-irc/weechat/weechat-0.3.5.ebuild
+++ b/net-irc/weechat/weechat-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.5.ebuild,v 1.3 2011/05/27 07:15:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.5.ebuild,v 1.4 2011/05/27 08:01:01 scarabeus Exp $
 
 EAPI=3
 
@@ -22,7 +22,7 @@ SLOT="0"
 if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 NETWORKS="+irc"