Version bump. Update live ebuild. Per bug #352508.

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

4 files changed, 126 insertions, 12 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index d739645e8e42..1fdbf022cd40 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,12 @@
 # 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.80 2010/11/28 13:57:20 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.81 2011/01/23 17:27:49 scarabeus Exp $
+
+*weechat-0.3.4 (23 Jan 2011)
+
+  23 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> +weechat-0.3.4.ebuild,
+  weechat-9999.ebuild:
+  Version bump. Update live ebuild. Per bug #352508.
 
   28 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> -weechat-0.2.6.1.ebuild:
   old
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 49731ac589d9..f0ce49eccfef 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,5 +1,7 @@
 DIST weechat-0.3.3.tar.bz2 1761944 RMD160 f32a8bb60c421fc0b992b6e6103bd7d7cb0e8a90 SHA1 4069a660093e908ec56c11ad5c5eba86d59a0b5a SHA256 02113765aa91f10302f38f9f4cd29ea57355bee5e2fdb98c86ae70f64b6cc77c
+DIST weechat-0.3.4.tar.bz2 1936679 RMD160 5d613dca4e71244563b822c9ecb0e23fba78842f SHA1 2601804e445f9885422f15c2b95f47699e2c8b98 SHA256 391762a8d3a18e236fd6bdceae126af01c55be4605b3e1274f8d59f8def9cbd4
 EBUILD weechat-0.3.3.ebuild 1406 RMD160 6d1bd8e7742f749c298d00fbf0327a84b1d122d1 SHA1 f44af109cdb6bf47ff46ce3eeae0f1065499d1fe SHA256 57b1bbb51f51f43d85ac1cde3dfabbba3a6880820ba3e5ea24ffb1d5a0d62243
-EBUILD weechat-9999.ebuild 1824 RMD160 f68efa1efc0ec8abb0f8a8163d9db033e9c321cf SHA1 af1e7d52b1af74705b08a6fa99f2074ec3d22a8c SHA256 d635c6036398ccfe04b7971ae800768aa6f13080939647836bd62b65b1f0c8f1
-MISC ChangeLog 10712 RMD160 55814e48eb2b2182ac360f053adac299c95c6a5b SHA1 2ae5312fa845571de4b590d4960b3f22cec54261 SHA256 7b4fb5c6e76f6ca56c0028f19eab93a38c4b813a16222f978820150a2921a7bd
+EBUILD weechat-0.3.4.ebuild 2254 RMD160 57ac4787f2c4262f7194ca3c01b11772bc518a7b SHA1 2b5f99198b009620393802149f499173e9bfbccc SHA256 df4d1bad9be262250566fb084e0ca119f49b5f002251798d94880898ecb78542
+EBUILD weechat-9999.ebuild 2253 RMD160 c00358e572a959e9c765c06143a5fad929d07665 SHA1 99ac5ed8178ca1b74107f6f9ff7edfc1d93a6809 SHA256 c072e3333fbd57a112baad8a4a1ba7c40ba625559c67814b5fc95ffc649784e0
+MISC ChangeLog 10897 RMD160 b6e80be30949116cb83acc5bc69cb05b3b75c70b SHA1 1b184824c340e65867c420e94d8beccefeff6b1c SHA256 41fe7aa362c0e7278f54372de48fc4253efbef1246ce7ba3eec7bca90249b918
 MISC metadata.xml 870 RMD160 4e8caaf43405e97c11bff91598d005ee54608b82 SHA1 193a559cf7f77d82816c81d6ba30592386b4b64d SHA256 c395dbc3ee5f8a6061fffe6aec41a67b59b8ed4c7dd7a213f69949e9dc6b2ea1
diff --git a/net-irc/weechat/weechat-0.3.4.ebuild b/net-irc/weechat/weechat-0.3.4.ebuild
new file mode 100644
index 000000000000..79d99e06acca
--- /dev/null
+++ b/net-irc/weechat/weechat-0.3.4.ebuild
@@ -0,0 +1,86 @@
+# 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.1 2011/01/23 17:27:49 scarabeus Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+
+EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git"
+inherit python multilib 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"
+fi
+
+NETWORKS="jabber +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 )
+	gtk? ( x11-libs/gtk+:2 )
+	jabber? ( dev-libs/iksemel )
+	lua? ( dev-lang/lua[deprecated] )
+	ncurses? ( sys-libs/ncurses )
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15 )
+"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+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"
+		$(cmake-utils_use_enable ncurses)
+		$(cmake-utils_use_enable gtk)
+		$(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-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index a92bc4cc6010..1c9fc8cd7fa1 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,17 +1,26 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-9999.ebuild,v 1.2 2010/12/13 22:35:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.3 2011/01/23 17:27:49 scarabeus Exp $
 
-EAPI=2
-inherit cmake-utils git
+EAPI=3
+
+PYTHON_DEPEND="python? 2"
+
+EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git"
+inherit python multilib cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.org/"
-EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
+[[ ${PV} == "9999" ]] || SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+if [[ ${PV} == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+fi
 
 NETWORKS="jabber +irc"
 PLUGINS="+alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer"
@@ -26,7 +35,6 @@ RDEPEND="
 	lua? ( dev-lang/lua[deprecated] )
 	ncurses? ( sys-libs/ncurses )
 	perl? ( dev-lang/perl )
-	python? ( virtual/python )
 	ruby? ( dev-lang/ruby )
 	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
@@ -36,7 +44,19 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.15 )
 "
 
-DOCS="AUTHORS ChangeLog NEWS README "
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+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() {