Fix dependencies. Set SUPPORT_PYTHON_ABIS (bug #324383).

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

3 files changed, 35 insertions, 18 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/Manifest b/dev-util/comparator/Manifest
index e933d565329b..df6772fc09f6 100644
--- a/dev-util/comparator/Manifest
+++ b/dev-util/comparator/Manifest
@@ -1,4 +1,4 @@
 DIST comparator-2.5.tar.gz 1469060 RMD160 e6d698483453c3187215ab777282c29422c5668d SHA1 ed11536a999c59d4e424a9592666072a1837f05e SHA256 d6151d72a3517470292b405fc4e7b0f518ed335377464228677e2416cae52c25
-EBUILD comparator-2.5.ebuild 1066 RMD160 32109b0b3b02c10a0ec40efa53eef2526ffd9d4e SHA1 ae9f8dc30f608c3dacf97ee76b6292c699260f29 SHA256 c68fa824d517402339b0938cd7a8a293090f553bf29848a58f7417d5abb23900
-MISC ChangeLog 2075 RMD160 06f3c03f126eb208afa06ca1691c21431e043236 SHA1 6594713d741ea1bc74e9b99d431773d8045639ec SHA256 2287f2cab91bb043541b7c1ecf8b97d45d1baa53e8e5b40b215182a0c8c83824
+EBUILD comparator-2.5.ebuild 1457 RMD160 10519ef01006c85af3af7dc3c061e3281e429e7a SHA1 e80f551c52e9f6e740b4e9e4f825b0d38435e9c3 SHA256 9417f81ad84e4a806da198f5403a0aa60bac086c96c46e85b89eaf4e240dcc59
+MISC ChangeLog 2232 RMD160 1f80bb76d3b250c098fb1d7fe4ef4159874cc4fa SHA1 2e37ac3455cc20d9cd9a563f5a60826f490739a0 SHA256 f3ec990de8b33e9be33ff5004aa9a291a3fbc6f7a1ec3fcd6b31e1090b8ca42b
 MISC metadata.xml 375 RMD160 5b61ece7fea41133f616d6b5965b91935a343f29 SHA1 a1ed851e7effa8b37f223c6abc3f6cedb98c9827 SHA256 4e5a0385f0314b7142ef397163aa86338dcf6b144d883933158f96c31c2dea1d
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"
 }