diff -ur paludis.orig//paludis-0.70.0.ebuild paludis/paludis-0.70.0.ebuild --- paludis.orig//paludis-0.70.0.ebuild 2011-11-26 19:17:45.478000061 +0800 +++ paludis/paludis-0.70.0.ebuild 2011-11-26 19:35:18.667000055 +0800 @@ -2,7 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.70.0.ebuild,v 1.2 2011/11/11 20:12:43 vapier Exp $ -inherit bash-completion eutils +EAPI="3" + +PYTHON_DEPEND="python-bindings? 2:2.6" + +inherit bash-completion-r1 eutils python DESCRIPTION="paludis, the other package mangler" HOMEPAGE="http://paludis.pioto.org/" @@ -20,7 +24,7 @@ dev-libs/libpcre sys-apps/file pbins? ( >=app-arch/libarchive-2.8.4 ) - python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 ) + python-bindings? ( >=dev-libs/boost-1.41.0 ) ruby-bindings? ( >=dev-lang/ruby-1.8 ) xml? ( >=dev-libs/libxml2-2.6 ) search-index? ( >=dev-db/sqlite-3 )" @@ -54,6 +58,11 @@ } pkg_setup() { + if use python-bindings; then + python_set_active_version 2 + python_pkg_setup + fi + if ! built_with_use dev-libs/libpcre cxx ; then eerror "Paludis needs dev-libs/libpcre built with C++ support" eerror "Please build dev-libs/libpcre with USE=cxx support" @@ -99,7 +108,7 @@ fi } -src_compile() { +src_configure() { local repositories=`echo default unavailable unpackaged | tr -s \ ,` local environments=`echo default $(usev portage ) | tr -s \ ,` econf \ @@ -119,7 +128,9 @@ --with-repositories=${repositories} \ --with-environments=${environments} \ || die "econf failed" +} +src_compile() { emake || die "emake failed" } @@ -127,7 +138,7 @@ emake DESTDIR="${D}" install || die "install failed" dodoc AUTHORS README NEWS - BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave + dobashcomp bash-completion/cave if use zsh-completion ; then insinto /usr/share/zsh/site-functions