From 7bcb4761570bdf9fa59d97fa3c05dab45b06f5fb Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 8 May 2021 10:18:13 +0200 Subject: 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 Signed-off-by: Sam James --- x11-wm/herbstluftwm/Manifest | 2 +- x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild | 93 --------------------- x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild | 113 ++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 94 deletions(-) delete mode 100644 x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild create mode 100644 x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild (limited to 'x11-wm/herbstluftwm') diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest index 164b1cba2ab5..5001a621c3b2 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.2.ebuild deleted file mode 100644 index 31f1710a7b3e..000000000000 --- a/x11-wm/herbstluftwm/herbstluftwm-0.9.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_OPTIONAL=1 - -inherit cmake distutils-r1 toolchain-funcs - -DESCRIPTION="A manual tiling window manager for X" -HOMEPAGE="https://herbstluftwm.org/" - -if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then - EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm" - inherit git-r3 -else - SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="doc examples python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - media-libs/freetype - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr -" -RDEPEND=" - ${DEPEND} - app-shells/bash - python? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( app-text/asciidoc ) -" - -src_prepare() { - sed -i \ - -e '/^install.*LICENSEDIR/d' \ - -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \ - CMakeLists.txt || die - cmake_src_prepare - - if use python; then - pushd "${S}"/python > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - fi -} - -src_configure() { - # Ensure that 'python3' is in PATH. #765118 - python_setup - - mycmakeargs=( - -DWITH_DOCUMENTATION=$(usex doc) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use python; then - pushd python > /dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - cmake_src_install - - if ! use examples; then - rm -r "${ED}"/usr/share/doc/${PF}/examples || die - fi - - if use python; then - pushd python > /dev/null || die - distutils-r1_src_install - popd > /dev/null || die - fi - -} diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild new file mode 100644 index 000000000000..f374bfa2fc7a --- /dev/null +++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) +DISTUTILS_OPTIONAL=1 + +inherit cmake distutils-r1 toolchain-funcs + +DESCRIPTION="A manual tiling window manager for X" +HOMEPAGE="https://herbstluftwm.org/" + +if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then + EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm" + inherit git-r3 +else + SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="+doc python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + media-libs/freetype + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXrandr +" +RDEPEND=" + ${DEPEND} + app-shells/bash + python? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +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})#' \ + CMakeLists.txt || die + cmake_src_prepare + + if use python; then + pushd "${S}"/python > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +src_configure() { + # Ensure that 'python3' is in PATH. #765118 + python_setup + + mycmakeargs=( + -DWITH_DOCUMENTATION=$(usex doc) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + cmake_src_install + + if ! use doc; then + rm -r "${ED}"/usr/share/doc/${PF}/examples || die + fi + + if use python; then + pushd python > /dev/null || die + distutils-r1_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 +} -- cgit v1.2.3-65-gdbad