Sort out the dependency over py2/3 wrt bug#426330. Stabilise 0.3.8 on all archs. Remove older.

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

5 files changed, 42 insertions, 137 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 771aa1b2690d..dbc5e247e28c 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.113 2012/06/07 15:22:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.114 2012/08/21 13:28:37 scarabeus Exp $
+
+  21 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> -weechat-0.3.7.ebuild,
+  weechat-0.3.8.ebuild, weechat-9999.ebuild:
+  Sort out the dependency over py2/3 wrt bug#426330. Stabilise 0.3.8 on all
+  archs. Remove older.
 
 *weechat-0.3.8 (07 Jun 2012)
 
@@ -473,4 +478,3 @@
   weechat-0.0.2.ebuild:
   Initial version, ebuild by psk <gentoo@feeleas.org>.
   Closes #29823.
-
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 4b4cfd7c46a6..1bb2b9f5b2a0 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,7 +1,25 @@
-DIST weechat-0.3.7.tar.bz2 2444611 SHA256 8ef5e3daf49e75669e36093c1df852e65b51d512073c6e6b935a7fa90f6b7bca SHA512 85aa608e804768dfdd8cd9b659fde5cb2de3e5619780437070fffe5206a6c0369d9c9ec42b17a3c186de66b0ebccabfcf2d5e09658a9915c03631e6e49d6f0ca WHIRLPOOL 0a1c8cff29117087ba521b0411c2f0be5adaaf77dffc582fbea3e7a42b95ae05c9e357a3d3e4db287fda8b1d54c2aeeeb55c25851f46e67545162bf00b96a5d3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST weechat-0.3.8.tar.bz2 2488165 SHA256 3cb8c88d5471e01fd74d41a2bc0845e2b2b893dd1ea887a672c2cf0a7a1a06a5 SHA512 b6fb1d1220c491e514c478ad376cb8a00ce22621c8ba11c95b9e25ee2e15abc5cfac229a056aa4d4242821de1469504116a60c16b8b0b272d1c88d8e137e9bea WHIRLPOOL 9449e7c93c2db8649a9b23a694f78fd0faa0b5aee48a138e30483c4789cd46e12a3ffc7bfab38fb01cbbbd158d9b773ad7bad40edc75ffe9a755b66354c98495
-EBUILD weechat-0.3.7.ebuild 3195 SHA256 958a993211d6ac7a63d4d9361df0136d20e655197d456405946d4ba434bf1448 SHA512 14706676b5fffc66565bbd2f649c21fab62b67663dfe811a411a0a24a2902e56d915b45f7a31c5b2490898e0aeb54206b78f913a541ff679df6e2f2d8a961804 WHIRLPOOL 94b49157bd8c5756f8acece783a7cd17bf8b7aeac43887eb27dca9a7473b3043812d0ef707d9ee5fd66f123dab08c166bbd505c59e07705daa5a28c65ad99a9b
-EBUILD weechat-0.3.8.ebuild 3013 SHA256 3cc0f3b2ad7837a10fa3fc3c579ac061e0659087c616d47e3278db24b9ab4ac8 SHA512 5770029ceeb00f4533274034c06ea2c6640b5b52f3411208b6f906368462dfe83295356f0db1ca208c762174f9962d361bfcc453eb8c802b806616fb0462d6b8 WHIRLPOOL 8d816659e1a7b70baf2c5e16539ad1bae29a824605ea41652077ad22ad64adfa681cc67ee33590e801f47fa37bd8a32cf738000a3f9af3b5107c5adc40587c63
-EBUILD weechat-9999.ebuild 3013 SHA256 51204016b9576157ae32479690cb68e6fbb5ee7d49f62e84d594672583607563 SHA512 e4cb0671558b691e33e670517368e336ff639d56199c50d51494ad28745f3ddfa74e528103c8184401035c8ca66038df344f39173b3a3c3b56c86cd0fb56df41 WHIRLPOOL ec7b825ee50d10c3d6663e21d09db04aa6f8234c5c23449613526f59987bb12dbb72d61085db3fcfff920186e7324f0dfb77f1897b181bd23f550b801e1f9837
-MISC ChangeLog 15359 SHA256 dc31a764bdfd1a7915de69eed62a8cba84fa0f218e259cedee0628d2de61d0c0 SHA512 6d2d4f0a12b678e90e5235e8b612bbffdd7951653cbb5a33dfa04673de874939a28231a08b50d6b5667f9d7b85ca62d3de2d6a24595633ee06af2c82c8b2386f WHIRLPOOL 521ba72606a4c8cc8c8d5336ee4f585e422577e8195c5dd0b49de71633a4c85d77a66a091515d9593f86781218582e26b900bae4533194e6268c8fb8c5bccc12
+EBUILD weechat-0.3.8.ebuild 3108 SHA256 f550d8e54ce83ad819c7d81765585b67665409da1891de02686250360318ee28 SHA512 eb78b0d7a1bfb176137c124c06efd01a1dcf29274d80a112cbfb173cbd40d666b1ac21094bc7a85e65b872d2affb0a014ba168072bccbe1bc379277ee4e3b7f4 WHIRLPOOL 582759f9403a6d6edf5405abaf4f113ca6d842f816ea4f195a104725571deff727a0b5f3755960e579b9dadce7c32dde1a79e500d6927fe19810929ebb4cc89c
+EBUILD weechat-9999.ebuild 3111 SHA256 636b59e1873f036f885e4492012b8dfa21764cec85e4d69334df50ad38af2c98 SHA512 aa789a36788247faa92ac0dec686cfdd11868ea3e42212358220f015f3acdb07f6aa35f3903c19f44987821485a0c2937259ff01cfc12e2941e34e27f0506c52 WHIRLPOOL 5fd86360e36442944cc49f23a0caec6d13bc710d907d718f94de4fced20cabde08af54d337c6af20ef60dac6f28565b617c0e60fb0a6bcadbc011fc897fe3fad
+MISC ChangeLog 15581 SHA256 d3c298c0aeb6937e24a23778bf1f836e1e263f711f6e34bae92b8256e704d2f9 SHA512 d9f0c798569b62e7867580d8358ab21fee58ade3d651d7b78f93b5c089f02b021aea1b4153c91ccbae6fab8f37b7a3908fa41d421d21f11d4e30e4b617535784 WHIRLPOOL d5cb9a95003abadedcc746c835e721d05279bbedc825ed4e09625f52ba743cc15b682c1c98c87378ef045ca8874de334e7c1f1636c5e970e675cd189ed5eab10
 MISC metadata.xml 775 SHA256 baddf6a8f9e77502d45119a96455031b564e19a864c8540e5c44500aeb1ddc54 SHA512 2aad4ad5d7b4634bf06078f62e8bb6a53e19df95257b150b43e82b2fe8487ed37c5311dc15d364cb1f5d5fc3eb04ae933e54cc9e44fcf06a471348021feb4d4e WHIRLPOOL 0a21b77e3c62b2e3e2ce4ee935a7212aee8517ef83445710855823e5a5c146255dc15e369f049ca20503205afac611957394494a857ea2f40371ebc50c87d25a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQM4zxAAoJEOSiRoyO7jvo4CgQAKg+ptijMC6wwf8Hr/U0nhMn
+YOb3UJ6O7RW/We0SLZZBRYr3wn0zvAvpaHmFoPXR7qSujtaDxJ5UDq7xX1xgA9/9
+WcqpQq+2ZsIYNw/knOBaVvWwF/gZook8ovQHBzt/C9kj2G8cQXcE/Q2W7prSmUDm
+64MfBhGoEGpeC3+jcIIIvnBEGSee+uGtAOJdtrr9r0KQFxlGImmo7RMqMtrVXnn7
+s0S5Rlr7IR11uSgt3et5yTOrMc+nlslN+Hzso9qTWKuXEhlEQTXjyRlsOGCluQQQ
+rpIRhBLzBnZpP4p/2xsaRWeoXKDf1xCTMdT2WVu+iQSSMWBhRDhCkKgnWHeXXZS7
+tqpTiSOIPbRVsfM47/7VqOhE0I8z3fMyeewQLo0XDldljcotA8A/cwn+Ot25aexA
+4d27y3B4RLQbMCdWnhfQALQ0T1pcIxQ0zBbeqZY68WhKrShk1dXA29a7Jy+/db+L
+puq5hWvWvcqc9+dD7Fva2VGnOYBSzv6LYkdk5T0yVDZAfic9e+rZgC0LuTjEx1wo
+e12WnsMfTMm7LFCSM+b06tljRPI9xvoyTM0mTbr2OmTG8jTxlpRAq4W9kGOs9Owi
+VAbuyPXdok4awH3eoeU4Rhj0q2p7ZKjH5cMgcCYHtqcuD7e901Y/ZBfXrvUfWbpK
+3COqACa1yKPG+E5KwigD
+=Vq6C
+-----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/weechat-0.3.7.ebuild b/net-irc/weechat/weechat-0.3.7.ebuild
deleted file mode 100644
index 509a48f261be..000000000000
--- a/net-irc/weechat/weechat-0.3.7.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.7.ebuild,v 1.10 2012/04/16 21:11:28 ranger Exp $
-
-EAPI=3
-
-# Can only add ruby19 support when ruby:1.9 is keyworded.
-#USE_RUBY="ruby18 ruby19"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
-PYTHON_DEPEND="python? *"
-
-EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
-[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
-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="guile lua +perl +python ruby tcl"
-IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} +crypt doc nls +ssl"
-
-RDEPEND="
-	net-misc/curl[ssl]
-	sys-libs/ncurses
-	charset? ( virtual/libiconv )
-	guile? ( dev-scheme/guile )
-	lua? ( dev-lang/lua[deprecated] )
-	perl? ( dev-lang/perl )
-	ruby? ( $(ruby_implementations_depend) )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15 )
-"
-#	ncurses? ( sys-libs/ncurses )
-#	gtk? ( x11-libs/gtk+:2 )
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-#REQUIRED_USE=" || ( ncurses gtk )"
-
-LANGS=( cs de es fr hu it ja pl pt_BR ru )
-for X in "${LANGS[@]}" ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	use python && python_pkg_setup
-	use ruby && ruby-ng_pkg_setup
-}
-
-src_prepare() {
-	local i
-
-	# fix libdir placement
-	sed -i \
-		-e "s:lib/:$(get_libdir)/:g" \
-		-e "s:lib\":$(get_libdir)\":g" \
-		"${S}/CMakeLists.txt" || die "sed failed"
-
-	# install only required translations
-	for i in "${LANGS[@]}" ; do
-		if ! use linguas_${i} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				"${S}/po/CMakeLists.txt" || die
-		fi
-	done
-}
-
-# alias, rmodifier, xfer
-src_configure() {
-	# $(cmake-utils_use_enable gtk)
-	# $(cmake-utils_use_enable ncurses)
-	local mycmakeargs=(
-		"-DENABLE_NCURSES=ON"
-		"-DENABLE_LARGEFILE=ON"
-		"-DENABLE_DEMO=OFF"
-		"-DENABLE_GTK=OFF"
-		$(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 guile)
-		$(cmake-utils_use_enable doc)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use scripts && use python; then
-		elog "You may use the following script from upstream to manage your scripts."
-		elog "It helps with downloading and updating other scripts:"
-		elog "    http://www.weechat.org/scripts/source/stable/weeget.py/"
-	fi
-}
diff --git a/net-irc/weechat/weechat-0.3.8.ebuild b/net-irc/weechat/weechat-0.3.8.ebuild
index 9adc8949a619..d5e40adafa15 100644
--- a/net-irc/weechat/weechat-0.3.8.ebuild
+++ b/net-irc/weechat/weechat-0.3.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.8.ebuild,v 1.1 2012/06/07 15:22:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.3.8.ebuild,v 1.2 2012/08/21 13:28:37 scarabeus Exp $
 
 EAPI=4
 
-PYTHON_DEPEND="python? *"
+PYTHON_DEPEND="python? 2" # it can use only ONE python, so stick with two for now
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
@@ -19,7 +19,7 @@ SLOT="0"
 if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-linux ~amd64-linux"
+	KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 NETWORKS="+irc"
@@ -56,7 +56,10 @@ for X in "${LANGS[@]}" ; do
 done
 
 pkg_setup() {
-	use python && python_pkg_setup
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 src_prepare() {
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index ccaa6f51c9f2..ceca01ebb28a 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 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.19 2012/05/31 11:15:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.20 2012/08/21 13:28:37 scarabeus Exp $
 
 EAPI=4
 
-PYTHON_DEPEND="python? *"
+PYTHON_DEPEND="python? 2" # it can use only ONE python, so stick with two for now
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
@@ -56,7 +56,10 @@ for X in "${LANGS[@]}" ; do
 done
 
 pkg_setup() {
-	use python && python_pkg_setup
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 src_prepare() {