From 6b40a7fe93eda9b002c2247e9c7645bd366d23de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 6 Jan 2012 17:35:25 +0100 Subject: [PATCH] app-accessibility/sphinxbase: Fix partial autotools-utils use wrt bug #392079. (Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key 42B9401D) --- ChangeLog | 5 ++++- Manifest | 16 +++++++++------- sphinxbase-0.7.ebuild | 23 ++++++++++++++--------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f42218..c404e59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for app-accessibility/sphinxbase -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/ChangeLog,v 1.1 2011/11/17 17:35:05 neurogeek Exp $ + 06 Jan 2012; Michał Górny sphinxbase-0.7.ebuild: + Fix partial autotools-utils use wrt bug #392079. + *sphinxbase-0.7 (17 Nov 2011) 17 Nov 2011; Jesus Rivero +sphinxbase-0.7.ebuild, diff --git a/Manifest b/Manifest index d46a11a..2908bf9 100644 --- a/Manifest +++ b/Manifest @@ -1,14 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 DIST sphinxbase-0.7.tar.gz 3291922 RMD160 6f75698e95fc4e772f44d6eda76af24f5edcdf7d SHA1 32dc04f7e7f37ffe53bd0b6e27b1f5df1800a705 SHA256 389cb99a545f7d615a2b3bc3f7362a490ca45fc4dc440140ae1d2a41f87773ec -EBUILD sphinxbase-0.7.ebuild 1306 RMD160 dbebf382ad25e25e262c83e124d1b397bfbd3247 SHA1 cefbaa6adfea3e6d0a10b0300ee82e39dbfc790f SHA256 f3e50c07655cd8f5ffe4ee0240283044bb123308902056d8ed2723c1d00429dd -MISC ChangeLog 373 RMD160 6b1c4cf3746f0a1456d7d0b6a4711519fb299433 SHA1 ac273e90fc9c2415683e72919040a4f6dac7d054 SHA256 fad97741f48159c23ff45285c594ff1fd365b2e205802c1afb721fd5d9923d49 +EBUILD sphinxbase-0.7.ebuild 1441 RMD160 50158ee4f23255934c8f73514f5c2f5226f74cf7 SHA1 e4e61bce10a5a7c70541557998343b9f6e968ad4 SHA256 c47152dbc205b2e586040a7a292ee89fc98b91a1339d0e83f16104175e48d1e5 +MISC ChangeLog 498 RMD160 31d98cecdba1071cc96bdba5901bc908a34619d5 SHA1 66723c93ab065c53e8280cfb7c2813b5ab6771ab SHA256 b45bf83bee2f8b9b950c3d355212030c5f23a0d59788f354cde78af3a96ca989 MISC metadata.xml 167 RMD160 c58fa05ec6bc40d43930821f9995e688522a86bc SHA1 19b257a497d382a48da5ba28f551a3d08dc7f68d SHA256 acc2d68b15e57417767543ba061a4fa58d7382904217f0e7408ce94887509bce -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7FRf8ACgkQdIssYB9vBoM4cACeKX+5vJnDXu6g4Qgxs7wwnQuC -aK0An3JCsp2VcOyidzwVpOYZSolA9SHu -=/Tfl +iJwEAQEIAAYFAk8HIswACgkQfXuS5UK5QB1lcwQAjA5Wom7WGs6mm4PWeEi3lpeE +7cUZ9GQxVtZ8gYH78RY4fqw2Y0kynFXGFP0rSd94QTcVAeg2TTdj48RzwfSvgzwj +n/R/ZQAMWQiuGuYck9IgZTmSTv2TzwlHS4MQAZS63Bbzay0jiuq8AjgsK2rfdLAT +vPrGHFBleMyG+qa21cA= +=Vekl -----END PGP SIGNATURE----- diff --git a/sphinxbase-0.7.ebuild b/sphinxbase-0.7.ebuild index 5262b6d..2f95320 100644 --- a/sphinxbase-0.7.ebuild +++ b/sphinxbase-0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild,v 1.1 2011/11/17 17:35:05 neurogeek Exp $ @@ -23,15 +23,22 @@ DEPEND="${RDEPEND} RESTRICT_PYTHON_ABIS="3*" +# Due to generated Python setup.py. +AUTOTOOLS_IN_SOURCE_BUILD=1 + src_configure() { - econf \ - $( use_with lapack ) \ - $( use_with python ) \ - $( use_enable static-libs static ) + local myeconfargs=( + $( use_with lapack ) + # python modules are built through distutils + # so disable the ugly wrapper + --without-python + ) + + autotools-utils_src_configure } src_compile() { - default + autotools-utils_src_compile if use python; then python_copy_sources python @@ -45,7 +52,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die + autotools-utils_src_install if use python; then python_execute_function -s --source-dir python -d @@ -54,6 +61,4 @@ src_install() { if use doc; then dohtml doc/html/* fi - - remove_libtool_files } -- 1.7.8.2