--- /usr/portage/net-irc/weechat/weechat-0.3.8.ebuild 2012-06-07 17:22:49.000000000 +0200 +++ /usr/portage/net-irc/weechat/weechat-0.3.8.ebuild 2012-07-12 22:26:09.000000000 +0200 @@ -4,11 +4,9 @@ EAPI=4 -PYTHON_DEPEND="python? *" - EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git" [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2" -inherit python multilib cmake-utils ${GIT_ECLASS} +inherit eutils python multilib cmake-utils ${GIT_ECLASS} DESCRIPTION="Portable and multi-interface IRC client." HOMEPAGE="http://weechat.org/" @@ -25,7 +23,7 @@ NETWORKS="+irc" PLUGINS="+alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer" #INTERFACES="+ncurses gtk" -SCRIPT_LANGS="guile lua +perl +python ruby tcl" +SCRIPT_LANGS="guile lua +perl +python2 python3 ruby tcl" IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} +crypt doc nls +ssl" RDEPEND=" @@ -35,6 +33,8 @@ guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) + python2? ( =dev-lang/python-2* ) + python3? ( =dev-lang/python-3* ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) @@ -49,6 +49,7 @@ DOCS="AUTHORS ChangeLog NEWS README" #REQUIRED_USE=" || ( ncurses gtk )" +REQUIRED_USE="^^ ( python2 python3 )" LANGS=( cs de es fr hu it ja pl pt_BR ru ) for X in "${LANGS[@]}" ; do @@ -56,7 +57,9 @@ done pkg_setup() { - use python && python_pkg_setup + use python2 && python_set_active_version 2; + use python3 && python_set_active_version 3; + (use python2 || use python3) && python_pkg_setup } src_prepare() { @@ -97,7 +100,8 @@ $(cmake-utils_use_enable relay) $(cmake-utils_use_enable scripts) $(cmake-utils_use_enable perl) - $(cmake-utils_use_enable python) + $(cmake-utils_use_enable python2 python) + $(cmake-utils_use_enable python3 python) $(cmake-utils_use_enable ruby) $(cmake-utils_use_enable lua) $(cmake-utils_use_enable tcl) @@ -105,6 +109,13 @@ $(cmake-utils_use_enable doc) ) + use python2 && mycmakeargs[${#mycmakeargs[@]}]="-DPYTHON_EXECUTABLE=/usr/bin/python2"; + use python3 && mycmakeargs[${#mycmakeargs[@]}]="-DPYTHON_EXECUTABLE=/usr/bin/python3"; + + mycmakeargs[${#mycmakeargs[@]}]="-DPYTHON_LIBRARY="$(python_get_library); + echo "Setting python version to "$(python_get_library); + + cmake-utils_src_configure }