[patch] revised ebuild patch

paludis.patch (text/plain), 2.04 KB, created by Ian Delaney (RETIRED) on 2011-11-25 23:08:38 UTC

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 06:58:20.130985952 +0800
+++ paludis/paludis-0.70.0.ebuild	2011-11-26 06:56:48.482985993 +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,10 @@
 }
 
 pkg_setup() {
+	if use python-bindings; then
+		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 +107,7 @@
 	fi
 }
 
-src_compile() {
+src_configure() {
 	local repositories=`echo default unavailable unpackaged | tr -s \  ,`
 	local environments=`echo default $(usev portage ) | tr -s \  ,`
 	econf \
@@ -119,15 +127,18 @@
 		--with-repositories=${repositories} \
 		--with-environments=${environments} \
 		|| die "econf failed"
+}
 
+src_compile() {
 	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${ED}" install || die "install failed"
 	dodoc AUTHORS README NEWS
 
-	BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
+	# It seems the change of eclass comes with a truncation of dobashcompletion to dobashcomp
+	BASHCOMPLETION_NAME="cave" dobashcomp bash-completion/cave
 
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions