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:dev commit in: dev-games/surgescript/
Date: Sat, 11 Apr 2020 07:59:07 +0000 (UTC)	[thread overview]
Message-ID: <1586591931.80b491a914b2048d09b193425695f61bb5628146.andrewammerlaan@gentoo> (raw)
Message-ID: <20200411075907.3cfsAXHGwL1pxpzWbDBgP3dx2gSdXLpTVL6HhMbZgJg@z> (raw)

commit:     80b491a914b2048d09b193425695f61bb5628146
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Apr 11 07:58:51 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Apr 11 07:58:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=80b491a9

dev-games/surgescript: fix colliding files found by ecompress

when USE="doc" (fixed by using eclass which removes the
problematic files)

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

 dev-games/surgescript/surgescript-0.5.4.3.ebuild | 19 ++++++++-----------
 dev-games/surgescript/surgescript-9999.ebuild    | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/dev-games/surgescript/surgescript-0.5.4.3.ebuild b/dev-games/surgescript/surgescript-0.5.4.3.ebuild
index 16e25a5..8b2dadc 100644
--- a/dev-games/surgescript/surgescript-0.5.4.3.ebuild
+++ b/dev-games/surgescript/surgescript-0.5.4.3.ebuild
@@ -3,7 +3,13 @@
 
 EAPI=7
 
-inherit cmake
+DOCBUILDER="mkdocs"
+DOCDEPEND="
+	dev-python/mkdocs
+	dev-python/mkdocs-material
+"
+
+inherit cmake docs
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -19,19 +25,10 @@ DESCRIPTION="scripting language made for opensurge"
 HOMEPAGE="https://alemart.github.io/surgescript"
 LICENSE="Apache-2.0"
 
-IUSE="doc"
-
-BDEPEND="doc? (
-	dev-python/mkdocs
-	dev-python/mkdocs-material )"
-
 src_compile() {
 	cmake_src_compile
 
-	if use doc; then
-		mkdocs build || die "failed to make docs"
-		HTML_DOCS="site"
-	fi
+	docs_compile
 }
 
 src_install() {

diff --git a/dev-games/surgescript/surgescript-9999.ebuild b/dev-games/surgescript/surgescript-9999.ebuild
index 16e25a5..8b2dadc 100644
--- a/dev-games/surgescript/surgescript-9999.ebuild
+++ b/dev-games/surgescript/surgescript-9999.ebuild
@@ -3,7 +3,13 @@
 
 EAPI=7
 
-inherit cmake
+DOCBUILDER="mkdocs"
+DOCDEPEND="
+	dev-python/mkdocs
+	dev-python/mkdocs-material
+"
+
+inherit cmake docs
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -19,19 +25,10 @@ DESCRIPTION="scripting language made for opensurge"
 HOMEPAGE="https://alemart.github.io/surgescript"
 LICENSE="Apache-2.0"
 
-IUSE="doc"
-
-BDEPEND="doc? (
-	dev-python/mkdocs
-	dev-python/mkdocs-material )"
-
 src_compile() {
 	cmake_src_compile
 
-	if use doc; then
-		mkdocs build || die "failed to make docs"
-		HTML_DOCS="site"
-	fi
+	docs_compile
 }
 
 src_install() {


             reply	other threads:[~2020-04-11  7:59 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-11  8:05 Andrew Ammerlaan [this message]
2020-04-11  7:59 ` [gentoo-commits] repo/proj/guru:dev commit in: dev-games/surgescript/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2024-05-15 16:06 [gentoo-commits] repo/proj/guru:master " Julien Roy
2021-05-26 13:42 Andrew Ammerlaan
2020-12-21 11:06 Andrew Ammerlaan
2020-12-06 10:49 Andrew Ammerlaan
2020-04-11  8:05 Andrew Ammerlaan
2020-04-11  8:05 Andrew Ammerlaan
2020-04-11  8:05 Andrew Ammerlaan
2020-04-05 11:01 Andrew Ammerlaan
2020-03-09 17:55 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=1586591931.80b491a914b2048d09b193425695f61bb5628146.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