Fix dependencies. Set SUPPORT_PYTHON_ABIS (bug #324383).

(Portage version: 2.2.0_alpha14_p1/cvs/Linux x86_64)

2 files changed, 33 insertions, 16 deletions

diff --git a/dev-util/comparator/ChangeLog b/dev-util/comparator/ChangeLog
index 124e511ecd6b..ff658f28c17f 100644
--- a/dev-util/comparator/ChangeLog
+++ b/dev-util/comparator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/comparator
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/comparator/ChangeLog,v 1.16 2009/09/29 20:35:34 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/comparator/ChangeLog,v 1.17 2011/01/11 21:38:50 arfrever Exp $
+
+  11 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  comparator-2.5.ebuild:
+  Fix dependencies. Set SUPPORT_PYTHON_ABIS (bug #324383).
 
   29 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> comparator-2.5.ebuild:
   Rename distutils_src_install to distutils_src_compile in src_compile wrt
diff --git a/dev-util/comparator/comparator-2.5.ebuild b/dev-util/comparator/comparator-2.5.ebuild
index 6988d1e366af..2137ccfcc15b 100644
--- a/dev-util/comparator/comparator-2.5.ebuild
+++ b/dev-util/comparator/comparator-2.5.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/comparator/comparator-2.5.ebuild,v 1.6 2009/09/29 20:35:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/comparator/comparator-2.5.ebuild,v 1.7 2011/01/11 21:38:50 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils toolchain-funcs
 
@@ -14,26 +19,34 @@ KEYWORDS="~amd64 ~mips ~ppc sparc x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="app-text/xmlto
-	=app-text/docbook-xml-dtd-4.1.2*
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-	# we will do this ourselves
-	sed -e '/python setup.py install/d' \
-		-i "${S}"/Makefile || die "sed failed"
+DEPEND="=app-text/docbook-xml-dtd-4.1.2*
+	app-text/xmlto"
+
+PYTHON_MODNAME="comparator.py"
+
+src_prepare() {
+	sed \
+		-e '/install -m 755 -o 0 -g 0 filterator/d' \
+		-e '/python setup.py install/d' \
+		-i Makefile || die "sed failed"
 }
 
 src_compile() {
 	distutils_src_compile
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
 	emake comparator.html scf-standard.html || die "emake html failed"
 }
 
 src_install() {
 	distutils_src_install
 	emake ROOT="${D}" install || die "emake install failed"
-	dohtml *.html
+
+	install_filterator() {
+		newbin filterator filterator-${PYTHON_ABI} || return 1
+		python_convert_shebangs ${PYTHON_ABI} "${ED}usr/bin/filterator-${PYTHON_ABI}"
+	}
+	python_execute_function -q install_filterator
+	python_generate_wrapper_scripts "${ED}usr/bin/filterator"
+
+	dohtml *.html || die "dohtml failed"
 }