[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/
Date: Sat,  5 Jun 2021 21:28:46 +0000 (UTC)	[thread overview]
Message-ID: <1622928416.7bcb4761570bdf9fa59d97fa3c05dab45b06f5fb.sam@gentoo> (raw)

commit:     7bcb4761570bdf9fa59d97fa3c05dab45b06f5fb
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Sat May  8 08:18:13 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun  5 21:26:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bcb4761

x11-wm/herbstluftwm: add 0.9.3, drop 0.9.2

This also drops the 'examples' USE flag, as the examples are to small
to justify their own USE flag. Furthermore, app-text/asciidoc is only
needed when building from git, as the release tarballs of herbstluftwm
contain precompiled HTML files.

Closes: https://bugs.gentoo.org/787848
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-wm/herbstluftwm/Manifest                       |  2 +-
 ...ftwm-0.9.2.ebuild => herbstluftwm-0.9.3.ebuild} | 28 ++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 164b1cba2ab..5001a621c3b 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,2 +1,2 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-DIST herbstluftwm-0.9.2.tar.gz 448757 BLAKE2B f969e4a02aad11c5bd75ac261c7dd8c9448234a050f82f0cdd9bc29c998c4f6bb496f6e32d20016b06849218952c6a2f993f46aa94c29d011f4ff6865a2197bc SHA512 5426b4d1810f01cf043cf43644d4c65692a5aa207893be484c86eb0eeb96ca6259c86b843146a9eebdf4de988f2d2ed742674907be47262c6029d8aa7ab2265c
+DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c

diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
similarity index 68%
rename from x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
rename to x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index 31f1710a7b3..f374bfa2fc7 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_OPTIONAL=1
 
 inherit cmake distutils-r1 toolchain-funcs
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="doc examples python"
+IUSE="+doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
@@ -40,10 +40,16 @@ RDEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-text/asciidoc )
 "
 
+if [[ -n "${EGIT_REPO_URI}" ]]; then
+	# Herbstluftwm tarballs ship with pre-compiled documentation, only
+	# if we build from git asciidoc is needed.
+	BDEPEND+=" doc? ( app-text/asciidoc )"
+fi
+
 src_prepare() {
+	# Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
 	sed -i \
 		-e '/^install.*LICENSEDIR/d' \
 		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
@@ -80,7 +86,7 @@ src_compile() {
 src_install() {
 	cmake_src_install
 
-	if ! use examples; then
+	if ! use doc; then
 		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
 	fi
 
@@ -90,4 +96,18 @@ src_install() {
 		popd > /dev/null || die
 	fi
 
+	# The man pages exists in src_install either in non-live ebuilds,
+	# since they are then shipped pre-compiled in herbstluftwm's
+	# release tarbal. Or they exist in live ebuilds if the 'doc' USE
+	# flag is enabled.
+	if [[ "${PV}" != 9999 ]] || use doc; then
+		local man_pages=(
+			herbstluftwm.1
+			herbstclient.1
+			herbstluftwm-tutorial.7
+		)
+		for man_page in "${man_pages[@]}"; do
+			doman "doc/${man_page}"
+		done
+	fi
 }

next             reply	other threads:[~2021-06-05 21:28 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-05 21:28 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-31 11:27 [gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/ Florian Schmaus
2024-04-03 19:17 Florian Schmaus
2024-04-03 19:17 Florian Schmaus
2024-04-03 19:17 Florian Schmaus
2023-10-14 15:20 Florian Schmaus
2023-09-18  9:34 Florian Schmaus
2023-07-16 16:40 Florian Schmaus
2023-01-31 11:18 Florian Schmaus
2022-10-27 20:15 Florian Schmaus
2022-10-27 20:15 Florian Schmaus
2022-09-26 16:44 Florian Schmaus
2022-06-13  9:06 Florian Schmaus
2022-06-13  9:06 Florian Schmaus
2022-05-30  7:20 Florian Schmaus
2022-05-30  7:20 Florian Schmaus
2022-04-13 14:46 Sam James
2021-07-28  8:37 Florian Schmaus
2021-07-12  7:25 Florian Schmaus
2021-07-07 11:59 Florian Schmaus
2021-07-07 11:59 Florian Schmaus
2021-06-24  6:59 Florian Schmaus
2021-06-23 12:48 Florian Schmaus
2021-06-22  6:34 Florian Schmaus
2021-06-05 21:28 Sam James
2021-06-05 21:28 Sam James
2021-04-11  7:43 Joonas Niilola
2021-01-28  7:36 Joonas Niilola
2021-01-28  7:36 Joonas Niilola
2020-12-01 14:01 Andrey Utkin
2020-12-01 13:49 Andrey Utkin
2020-12-01 13:49 Andrey Utkin
2020-12-01 13:49 Andrey Utkin
2020-12-01 13:49 Andrey Utkin
2020-12-01 13:49 Andrey Utkin
2020-12-01 13:49 Andrey Utkin
2020-12-01 13:49 Andrey Utkin
2020-06-08  8:28 Jeroen Roovers
2020-06-07 11:15 Jeroen Roovers
2020-06-07  0:09 Jeroen Roovers
2020-06-05  5:44 Jeroen Roovers
2020-06-05  5:44 Jeroen Roovers
2020-05-04 20:58 Jeroen Roovers
2020-04-21  8:28 Jeroen Roovers
2020-04-21  5:39 Jeroen Roovers
2020-04-09 20:07 Jeroen Roovers
2020-04-07  7:00 Jeroen Roovers
2020-02-06 11:14 Jeroen Roovers
2020-02-06 11:13 Jeroen Roovers
2019-12-29 12:43 Jeroen Roovers
2019-12-29 12:43 Jeroen Roovers
2019-12-06 11:10 Jeroen Roovers
2019-11-19  6:37 Jeroen Roovers
2019-11-18 22:35 Tim Harder
2019-11-18 22:35 Tim Harder
2019-11-17 22:10 Tim Harder
2019-11-17 22:10 Tim Harder
2019-06-07  8:11 Tim Harder
2018-12-11  8:20 Tim Harder
2018-12-08 22:17 Patrice Clement
2017-05-04  8:54 Tim Harder
2017-05-04  8:54 Tim Harder
2017-05-04  8:54 Tim Harder
2016-04-09  2:18 Tim Harder
2015-09-15 12:54 Michael Weber

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:164b1cba2a dfblob:5001a621c3 dfblob:31f1710a7b
dfblob:f374bfa2fc )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/" )
	(help)

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=1622928416.7bcb4761570bdf9fa59d97fa3c05dab45b06f5fb.sam@gentoo \
    --to=sam@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