From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE5BC139694 for ; Tue, 14 Feb 2017 11:33:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01D9521C028; Tue, 14 Feb 2017 11:33:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D467121C028 for ; Tue, 14 Feb 2017 11:33:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1A5C34106E for ; Tue, 14 Feb 2017 11:33:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1672F477A for ; Tue, 14 Feb 2017 11:33:06 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1487071979.7bcb0eb7500285331e1539812462d8155a2939b0.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/scikits_learn/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild X-VCS-Directories: sci-libs/scikits_learn/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 7bcb0eb7500285331e1539812462d8155a2939b0 X-VCS-Branch: master Date: Tue, 14 Feb 2017 11:33:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3336b183-85f7-4cd2-b26e-f95312ec9c2b X-Archives-Hash: 7ecbf1ce4cc511ad75ef20358b1eaedd commit: 7bcb0eb7500285331e1539812462d8155a2939b0 Author: Benda Xu gentoo org> AuthorDate: Tue Feb 14 11:32:43 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Tue Feb 14 11:32:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bcb0eb7 sci-libs/scikits_learn: sed to counter more bundled imports e.g. from sklearn.externals import joblib Package-Manager: portage-2.3.3 sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild index 8f668c735b..865735d2a0 100644 --- a/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild +++ b/sci-libs/scikits_learn/scikits_learn-0.18.1.ebuild @@ -59,7 +59,8 @@ python_prepare_all() { rm -r sklearn/externals/joblib || die sed -i -e '/joblib/d' sklearn/externals/setup.py || die for f in sklearn/{*/,}*.py; do - sed -r -e 's/from (sklearn|\.|)\.externals\.joblib/from joblib/' -i $f || die + sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \ + -e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die done rm sklearn/externals/funcsigs.py || die