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 621CC138334 for ; Sun, 30 Sep 2018 11:20:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F658E0870; Sun, 30 Sep 2018 11:20:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14D5BE0870 for ; Sun, 30 Sep 2018 11:20:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0595A335CA3 for ; Sun, 30 Sep 2018 11:20:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B9AF2C6 for ; Sun, 30 Sep 2018 11:20:46 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1538306389.2c484ac90e39d890a71ef54d64c13a1352737ed9.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/tensorboard/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/tensorboard/tensorboard-1.11.0-r1.ebuild sci-visualization/tensorboard/tensorboard-1.11.0.ebuild X-VCS-Directories: sci-visualization/tensorboard/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 2c484ac90e39d890a71ef54d64c13a1352737ed9 X-VCS-Branch: master Date: Sun, 30 Sep 2018 11:20:46 +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: f3e18fb0-d051-4fb4-8864-12cb9a64c27d X-Archives-Hash: c9a6d14ebbbcb44264b3dd3675bc47f6 commit: 2c484ac90e39d890a71ef54d64c13a1352737ed9 Author: Jason Zaman gentoo org> AuthorDate: Sun Sep 30 11:18:58 2018 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Sep 30 11:19:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c484ac9 sci-visualization/tensorboard: dont unvendor tensorflow_serving Signed-off-by: Jason Zaman gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.10 ...sorboard-1.11.0.ebuild => tensorboard-1.11.0-r1.ebuild} | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sci-visualization/tensorboard/tensorboard-1.11.0.ebuild b/sci-visualization/tensorboard/tensorboard-1.11.0-r1.ebuild similarity index 69% rename from sci-visualization/tensorboard/tensorboard-1.11.0.ebuild rename to sci-visualization/tensorboard/tensorboard-1.11.0-r1.ebuild index 5e3272e5be0..c7bf274d1a9 100644 --- a/sci-visualization/tensorboard/tensorboard-1.11.0.ebuild +++ b/sci-visualization/tensorboard/tensorboard-1.11.0-r1.ebuild @@ -23,6 +23,7 @@ RDEPEND=" dev-python/protobuf-python[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/werkzeug[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}]" BDEPEND="app-arch/unzip" PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" @@ -30,10 +31,15 @@ PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]" S="${WORKDIR}/${PN}" src_prepare() { - rm -rf "${S}/_vendor" || die - find "${S}" -name '*.py' -exec sed -i -e \ - 's/^from tensorboard\._vendor import /import /; - s/^from tensorboard\._vendor\./from /' {} + || die "failed to unvendor" + rm -rf "${S}/_vendor/bleach" || die + rm -rf "${S}/_vendor/html5lib" || die + + find "${S}" -name '*.py' -exec sed -i \ + -e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \ + -e 's/^from tensorboard\._vendor import bleach/import bleach/' \ + -e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \ + -e 's/^from tensorboard\._vendor\.bleach/from bleach/' \ + {} + || die "failed to unvendor" eapply_user }