public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/veloc/
Date: Sun,  8 Mar 2020 16:21:22 +0000 (UTC)	[thread overview]
Message-ID: <1583410678.e4b49e7bd68f7f675df6b1e4d3b951e9a055b958.andrewammerlaan@gentoo> (raw)

commit:     e4b49e7bd68f7f675df6b1e4d3b951e9a055b958
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Mar  5 12:17:58 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar  5 12:17:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e4b49e7b

sys-cluster/veloc: Fix USE="doc"

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sys-cluster/veloc/veloc-1.2.ebuild | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys-cluster/veloc/veloc-1.2.ebuild b/sys-cluster/veloc/veloc-1.2.ebuild
index 8bfdb76..429f7e9 100644
--- a/sys-cluster/veloc/veloc-1.2.ebuild
+++ b/sys-cluster/veloc/veloc-1.2.ebuild
@@ -4,7 +4,8 @@
 EAPI="7"
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+
 inherit cmake-utils distutils-r1
 
 DESCRIPTION="Very-Low Overhead Checkpointing System"
@@ -14,8 +15,10 @@ SRC_URI="https://github.com/ECP-VeloC/${PN^^}/archive/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="alps doc lsf python +slurm test"
-RESTRICT="!test? ( test )"
+
+IUSE="alps lsf python +slurm"
+# Tests not working with python yet
+RESTRICT="python? ( test )"
 
 REQUIRED_USE="
 		?? ( alps lsf slurm )
@@ -33,10 +36,12 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-2.8
-	doc? ( dev-python/sphinx )
 "
+
 S="${WORKDIR}/${PN^^}-${P}"
 
+distutils_enable_sphinx "${S}/docs" --no-autodoc
+
 src_prepare() {
 	#strip CFLAGS
 	sed -i 's/-O2 -g//g' CMakeLists.txt || die
@@ -65,15 +70,13 @@ src_configure() {
 src_compile() {
 	default
 	if use python; then
-		cd "${S}/src/bindings/python"
+		cd "src/bindings/python"
 		distutils-r1_src_compile
-	fi
-	if use doc; then
-		cd "${S}/docs"
-		emake man
-		emake info
-		emake html
-		emake latexpdf
+		cd "${S}"
+	else
+		# If USE="-python doc" we still
+		# want to compile the doc files
+		sphinx_compile_all
 	fi
 }
 
@@ -83,9 +86,6 @@ src_install() {
 		cd "${S}/src/bindings/python"
 		distutils-r1_src_install
 	fi
-
-	#ToDO: install docs
-#	dodoc -r docs/.
 }
 
 src_test() {


WARNING: multiple messages have this Message-ID (diff)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/veloc/
Date: Thu,  5 Mar 2020 12:18:12 +0000 (UTC)	[thread overview]
Message-ID: <1583410678.e4b49e7bd68f7f675df6b1e4d3b951e9a055b958.andrewammerlaan@gentoo> (raw)
Message-ID: <20200305121812.bS9KW243lNRdiwYNfglRTNWTCtCAiUgMm4Jt56u6-30@z> (raw)

commit:     e4b49e7bd68f7f675df6b1e4d3b951e9a055b958
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Mar  5 12:17:58 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Mar  5 12:17:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e4b49e7b

sys-cluster/veloc: Fix USE="doc"

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sys-cluster/veloc/veloc-1.2.ebuild | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys-cluster/veloc/veloc-1.2.ebuild b/sys-cluster/veloc/veloc-1.2.ebuild
index 8bfdb76..429f7e9 100644
--- a/sys-cluster/veloc/veloc-1.2.ebuild
+++ b/sys-cluster/veloc/veloc-1.2.ebuild
@@ -4,7 +4,8 @@
 EAPI="7"
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+
 inherit cmake-utils distutils-r1
 
 DESCRIPTION="Very-Low Overhead Checkpointing System"
@@ -14,8 +15,10 @@ SRC_URI="https://github.com/ECP-VeloC/${PN^^}/archive/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="alps doc lsf python +slurm test"
-RESTRICT="!test? ( test )"
+
+IUSE="alps lsf python +slurm"
+# Tests not working with python yet
+RESTRICT="python? ( test )"
 
 REQUIRED_USE="
 		?? ( alps lsf slurm )
@@ -33,10 +36,12 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-2.8
-	doc? ( dev-python/sphinx )
 "
+
 S="${WORKDIR}/${PN^^}-${P}"
 
+distutils_enable_sphinx "${S}/docs" --no-autodoc
+
 src_prepare() {
 	#strip CFLAGS
 	sed -i 's/-O2 -g//g' CMakeLists.txt || die
@@ -65,15 +70,13 @@ src_configure() {
 src_compile() {
 	default
 	if use python; then
-		cd "${S}/src/bindings/python"
+		cd "src/bindings/python"
 		distutils-r1_src_compile
-	fi
-	if use doc; then
-		cd "${S}/docs"
-		emake man
-		emake info
-		emake html
-		emake latexpdf
+		cd "${S}"
+	else
+		# If USE="-python doc" we still
+		# want to compile the doc files
+		sphinx_compile_all
 	fi
 }
 
@@ -83,9 +86,6 @@ src_install() {
 		cd "${S}/src/bindings/python"
 		distutils-r1_src_install
 	fi
-
-	#ToDO: install docs
-#	dodoc -r docs/.
 }
 
 src_test() {


             reply	other threads:[~2020-03-08 16:21 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-08 16:21 Andrew Ammerlaan [this message]
2020-03-05 12:18 ` [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/veloc/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2021-10-08 19:06 Arthur Zamarin
2021-10-08 19:05 ` [gentoo-commits] repo/proj/guru:master " Arthur Zamarin
2020-04-12 16:16 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-04-12 16:39 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-03-08 16:21 Andrew Ammerlaan
2020-03-08 16:21 Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1583410678.e4b49e7bd68f7f675df6b1e4d3b951e9a055b958.andrewammerlaan@gentoo \
    --to=andrewammerlaan@riseup.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox