diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2020-04-07 09:00:06 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2020-04-07 09:00:36 +0200 |
| commit | bba660c62dd9609c47c2a7d58fb01e2b4ff72b7f (patch) | |
| tree | 8d7af2a779ea473e610ec8124ba89d891b8cda3d | |
| parent | net-firewall/nftables-0.9.4-r1: revbump, call python_optimize, fix deps (diff) | |
| download | gentoo-bba660c62dd9609c47c2a7d58fb01e2b4ff72b7f.tar.gz gentoo-bba660c62dd9609c47c2a7d58fb01e2b4ff72b7f.tar.bz2 gentoo-bba660c62dd9609c47c2a7d58fb01e2b4ff72b7f.zip | |
x11-wm/herbstluftwm: Update live ebuild
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
| -rw-r--r-- | x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 44 |
1 files changed, 17 insertions, 27 deletions
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild index 191f2848d3bf..c6dbf314e58c 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs bash-completion-r1 +inherit toolchain-funcs cmake-utils -if [[ ${PV} == 9999* ]] ; then +if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm" BDEPEND="app-text/asciidoc" @@ -36,37 +36,27 @@ BDEPEND+=" virtual/pkgconfig " -src_compile() { - tc-export CC CXX LD PKG_CONFIG +src_configure() { + sed -i \ + -e '/^install.*LICENSEDIR/d' \ + -e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \ + CMakeLists.txt || die - emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \ - $(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= ) + mycmakeargs=( + -DWITH_XINERAMA=$(usex xinerama) + ) + + cmake-utils_src_configure } src_install() { - dobin herbstluftwm herbstclient - dodoc BUGS MIGRATION NEWS README.md - - doman doc/{herbstluftwm,herbstclient}.1 - - exeinto /etc/xdg/herbstluftwm - doexe share/{autostart,panel.sh,restartpanels.sh} - - insinto /usr/share/xsessions - doins share/herbstluftwm.desktop - - newbashcomp share/herbstclient-completion herbstclient + cmake-utils_src_install - if use zsh-completion ; then - insinto /usr/share/zsh/site-functions - doins share/_herbstclient + if ! use examples; then + rm -r "${ED}"/usr/share/doc/${PF}/examples || die fi - if use examples ; then - exeinto /usr/share/doc/${PF}/examples - doexe scripts/*.sh - docinto examples - dodoc scripts/README - docompress -x /usr/share/doc/${PF}/examples + if ! use zsh-completion; then + rm -r "${ED}"/usr/share/zsh || die fi } |