From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3CB9A138350 for ; Tue, 7 Apr 2020 07:00:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73375E0A04; Tue, 7 Apr 2020 07:00:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A914E0A04 for ; Tue, 7 Apr 2020 07:00:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F02934EF61 for ; Tue, 7 Apr 2020 07:00:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9216B104 for ; Tue, 7 Apr 2020 07:00:37 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1586242836.bba660c62dd9609c47c2a7d58fb01e2b4ff72b7f.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/herbstluftwm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/herbstluftwm/herbstluftwm-9999.ebuild X-VCS-Directories: x11-wm/herbstluftwm/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: bba660c62dd9609c47c2a7d58fb01e2b4ff72b7f X-VCS-Branch: master Date: Tue, 7 Apr 2020 07:00:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 511640b8-4b16-4235-963c-c1476c9951da X-Archives-Hash: e587ea78ae8637f96c1ab49952a279cb commit: bba660c62dd9609c47c2a7d58fb01e2b4ff72b7f Author: Jeroen Roovers gentoo org> AuthorDate: Tue Apr 7 07:00:06 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Apr 7 07:00:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba660c6 x11-wm/herbstluftwm: Update live ebuild Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Jeroen Roovers gentoo.org> x11-wm/herbstluftwm/herbstluftwm-9999.ebuild | 44 +++++++++++----------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild index 191f2848d3b..c6dbf314e58 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 }