public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/
Date: Fri, 11 Mar 2022 14:37:24 +0000 (UTC)	[thread overview]
Message-ID: <1647009440.a129a441c8d8daea825f8d9162735fa95e2c18d4.juippis@gentoo> (raw)

commit:     a129a441c8d8daea825f8d9162735fa95e2c18d4
Author:     Ekaterina Vaartis <vaartis <AT> kotobank <DOT> ch>
AuthorDate: Fri Mar 11 08:33:27 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 14:37:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a129a441

media-gfx/hydrus: Fix building without the doc flag

Closes: https://bugs.gentoo.org/834950
Signed-off-by: Ekaterina Vaartis <vaartis <AT> kotobank.ch>
Closes: https://github.com/gentoo/gentoo/pull/24482
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/hydrus/hydrus-476.ebuild  | 11 +++++++----
 media-gfx/hydrus/hydrus-9999.ebuild | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/media-gfx/hydrus/hydrus-476.ebuild b/media-gfx/hydrus/hydrus-476.ebuild
index 2e1663b11f1f..74762f9de40f 100644
--- a/media-gfx/hydrus/hydrus-476.ebuild
+++ b/media-gfx/hydrus/hydrus-476.ebuild
@@ -116,13 +116,16 @@ src_install() {
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# ${S}/_build = ${DOCS_OUTDIR}/.. and these have already been copied, remove it before installation
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation
 	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${S}/_build" "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html" /opt/hydrus/help
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.

diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 2e1663b11f1f..74762f9de40f 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -116,13 +116,16 @@ src_install() {
 	rm test.py hydrus/hydrus_test.py || die
 	rm -r hydrus/test/ static/testing/ || die
 
-	# ${S}/_build = ${DOCS_OUTDIR}/.. and these have already been copied, remove it before installation
 	# ${DOCS[@]} files are copied into doc
 	# ${S}/docs/ is the markdown source code for documentation
 	# .gitignore/.github files aren't needed for the program to work, same with mkdocs files
-	rm -r "${S}/_build" "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
-	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html" /opt/hydrus/help
+	rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die
+	if use doc; then
+		# ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation
+		rm -r "${S}/_build" || die
+		# The program expects to find documentation here, so add a symlink to doc
+		dosym "${doc}/html" /opt/hydrus/help
+	fi
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.


             reply	other threads:[~2022-03-11 14:37 UTC|newest]

Thread overview: 111+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-11 14:37 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-03  0:57 [gentoo-commits] repo/gentoo:master commit in: media-gfx/hydrus/ Sam James
2025-10-03  0:57 Sam James
2025-10-03  0:57 Sam James
2025-05-13  1:46 Sam James
2025-05-13  1:46 Sam James
2025-05-13  1:46 Sam James
2024-12-20 16:33 Nowa Ammerlaan
2024-06-02  0:41 Sam James
2024-03-12  9:54 Joonas Niilola
2024-03-12  9:54 Joonas Niilola
2024-03-12  9:54 Joonas Niilola
2024-03-12  9:54 Joonas Niilola
2023-09-18 16:39 Joonas Niilola
2023-09-18 16:39 Joonas Niilola
2023-09-18 16:39 Joonas Niilola
2023-07-26  3:02 Sam James
2023-07-26  3:02 Sam James
2023-06-18 12:08 Joonas Niilola
2023-06-18 12:08 Joonas Niilola
2023-06-18 12:08 Joonas Niilola
2023-05-20  6:28 Sam James
2023-05-20  6:28 Sam James
2023-05-20  6:28 Sam James
2023-04-10  8:37 Joonas Niilola
2023-04-10  8:37 Joonas Niilola
2023-03-11 17:15 Sam James
2023-03-11 17:15 Sam James
2023-02-26  4:01 Michał Górny
2023-02-26  4:01 Michał Górny
2023-02-13  4:48 Sam James
2023-02-13  4:48 Sam James
2023-02-05  9:13 Joonas Niilola
2023-02-05  9:13 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2023-01-07 16:49 Joonas Niilola
2022-12-03  8:53 Joonas Niilola
2022-12-03  8:53 Joonas Niilola
2022-12-03  8:53 Joonas Niilola
2022-11-07 19:30 Ionen Wolkens
2022-11-02 14:24 Joonas Niilola
2022-08-27 11:47 Sam James
2022-08-27 11:47 Sam James
2022-08-27 11:47 Sam James
2022-07-29  3:18 Sam James
2022-07-29  3:16 Sam James
2022-07-15  1:47 Sam James
2022-07-02 17:35 Joonas Niilola
2022-05-13 20:12 Sam James
2022-04-21 10:33 Joonas Niilola
2022-04-14 11:51 Joonas Niilola
2022-03-31 13:36 Joonas Niilola
2022-03-10 22:26 Sam James
2022-02-23  4:05 Sam James
2022-02-18  2:44 Sam James
2022-02-18  2:44 Sam James
2022-02-03  2:19 Sam James
2022-01-17  1:57 Sam James
2022-01-17  1:57 Sam James
2022-01-09  1:42 Sam James
2022-01-09  1:42 Sam James
2021-12-24  8:13 Sam James
2021-12-24  8:13 Sam James
2021-12-24  4:47 Sam James
2021-12-01 21:30 Sam James
2021-11-22 10:11 Sam James
2021-11-22 10:11 Sam James
2021-11-12  1:36 Sam James
2021-11-12  1:36 Sam James
2021-10-29 19:17 Sam James
2021-10-29 19:17 Sam James
2021-10-20  2:42 Sam James
2021-10-20  2:42 Sam James
2021-10-20  2:42 Sam James
2021-10-20  2:42 Sam James
2021-10-05  4:29 Sam James
2021-09-10  7:22 Joonas Niilola
2021-09-10  7:22 Joonas Niilola
2021-09-10  7:22 Joonas Niilola
2021-09-04 11:50 Joonas Niilola
2021-09-04 11:50 Joonas Niilola
2021-08-28 16:50 Sam James
2021-08-28 16:50 Sam James
2021-08-24  8:50 Joonas Niilola
2021-08-24  8:50 Joonas Niilola
2021-08-15 17:17 Joonas Niilola
2021-08-15 17:17 Joonas Niilola
2021-08-09 16:40 Joonas Niilola
2021-08-09 16:40 Joonas Niilola
2021-08-09 16:40 Joonas Niilola
2021-08-02  3:34 Sam James
2021-08-02  3:34 Sam James
2021-07-16  1:34 Sam James
2021-07-16  1:34 Sam James
2021-07-13  4:22 Sam James
2021-07-13  4:22 Sam James
2021-07-05 13:29 Michał Górny
2021-07-01  8:54 Sam James
2021-07-01  8:54 Sam James
2021-07-01  8:54 Sam James
2021-07-01  8:54 Sam James
2021-06-29  4:40 Sam James
2021-06-11 21:29 Sam James
2021-06-11 21:29 Sam James
2021-06-02 19:47 Michał Górny

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=1647009440.a129a441c8d8daea825f8d9162735fa95e2c18d4.juippis@gentoo \
    --to=juippis@gentoo.org \
    --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