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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7465158089 for ; Mon, 25 Sep 2023 10:00:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC7382BC017; Mon, 25 Sep 2023 10:00:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C55822BC017 for ; Mon, 25 Sep 2023 10:00:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F1B6335C9F for ; Mon, 25 Sep 2023 10:00:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F71F125D for ; Mon, 25 Sep 2023 10:00:15 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1695582445.33255e52774e58107ef48bd339daa4c650ed2c4d.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: gui-wm/dwl/ X-VCS-Repository: repo/proj/guru X-VCS-Files: gui-wm/dwl/dwl-0.4-r1.ebuild gui-wm/dwl/dwl-9999-r1.ebuild gui-wm/dwl/dwl-9999.ebuild X-VCS-Directories: gui-wm/dwl/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 33255e52774e58107ef48bd339daa4c650ed2c4d X-VCS-Branch: master Date: Mon, 25 Sep 2023 10:00:15 +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: b3a3b944-412d-40ac-961b-52e859a02515 X-Archives-Hash: 1881c9d1b951ed12e8400c54eefa69d2 commit: 33255e52774e58107ef48bd339daa4c650ed2c4d Author: Leonardo Hernández Hernández proton me> AuthorDate: Sun Sep 24 17:47:24 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun Sep 24 19:07:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=33255e52 gui-wm/dwl: simplify ebuilds also use the desktop file provided by upstream Signed-off-by: Leonardo Hernández Hernández proton.me> gui-wm/dwl/dwl-0.4-r1.ebuild | 3 +-- gui-wm/dwl/dwl-9999-r1.ebuild | 29 +++++++++-------------------- gui-wm/dwl/dwl-9999.ebuild | 29 +++++++++-------------------- 3 files changed, 19 insertions(+), 42 deletions(-) diff --git a/gui-wm/dwl/dwl-0.4-r1.ebuild b/gui-wm/dwl/dwl-0.4-r1.ebuild index e2dc6b7893..f7a7e6fab1 100644 --- a/gui-wm/dwl/dwl-0.4-r1.ebuild +++ b/gui-wm/dwl/dwl-0.4-r1.ebuild @@ -5,6 +5,7 @@ EAPI=8 inherit flag-o-matic savedconfig toolchain-funcs +WLROOTS_SLOT="0/16" if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/djpohly/dwl" inherit git-r3 @@ -14,7 +15,6 @@ if [[ ${PV} == *9999 ]]; then case ${PVR} in 9999) EGIT_BRANCH=main - WLROOTS_SLOT="0/16" ;; 9999-r1) EGIT_BRANCH=wlroots-next @@ -22,7 +22,6 @@ if [[ ${PV} == *9999 ]]; then ;; esac else - WLROOTS_SLOT="0/16" SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-9999-r1.ebuild index f201ca4b4d..f47bb7c415 100644 --- a/gui-wm/dwl/dwl-9999-r1.ebuild +++ b/gui-wm/dwl/dwl-9999-r1.ebuild @@ -3,18 +3,18 @@ EAPI=8 -inherit flag-o-matic savedconfig toolchain-funcs +inherit savedconfig toolchain-funcs -if [[ ${PV} == *9999 ]]; then +WLROOTS_SLOT="0/16" +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/djpohly/dwl" inherit git-r3 - # 9999-r0: main (latest wlroots release) + # 9999-r0: main (latest stable wlroots release) # 9999-r1: wlroots-next (wlroots-9999) case ${PVR} in 9999) EGIT_BRANCH=main - WLROOTS_SLOT="0/16" ;; 9999-r1) EGIT_BRANCH=wlroots-next @@ -22,7 +22,6 @@ if [[ ${PV} == *9999 ]]; then ;; esac else - WLROOTS_SLOT="0/16" SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -57,24 +56,14 @@ src_prepare() { default } -src_configure() { - sed -i "s:/local::g" config.mk || die - - sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" config.mk || die - - tc-export CC - - if use X; then - append-cppflags '-DXWAYLAND' - append-libs '-lxcb' '-lxcb-icccm' - fi +src_compile() { + emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \ + XWAYLAND="$(usex X -DXWAYLAND "")" XLIBS="$(usex X "xcb xcb-icccm" "")" dwl } src_install() { - default - - insinto /usr/share/wayland-sessions - doins "${FILESDIR}"/dwl.desktop + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc README.md save_config config.h } diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild index e2dc6b7893..2b5d46c788 100644 --- a/gui-wm/dwl/dwl-9999.ebuild +++ b/gui-wm/dwl/dwl-9999.ebuild @@ -3,18 +3,18 @@ EAPI=8 -inherit flag-o-matic savedconfig toolchain-funcs +inherit savedconfig toolchain-funcs -if [[ ${PV} == *9999 ]]; then +WLROOTS_SLOT="0/16" +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/djpohly/dwl" inherit git-r3 - # 9999-r0: main (latest wlroots release) + # 9999-r0: main (latest stable wlroots release) # 9999-r1: wlroots-next (wlroots-9999) case ${PVR} in 9999) EGIT_BRANCH=main - WLROOTS_SLOT="0/16" ;; 9999-r1) EGIT_BRANCH=wlroots-next @@ -22,7 +22,6 @@ if [[ ${PV} == *9999 ]]; then ;; esac else - WLROOTS_SLOT="0/16" SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -57,24 +56,14 @@ src_prepare() { default } -src_configure() { - sed -i "s:/local::g" config.mk || die - - sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" config.mk || die - - tc-export CC - - if use X; then - append-cppflags '-DXWAYLAND' - append-libs '-lxcb' '-lxcb-icccm' - fi +src_compile() { + emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \ + XWAYLAND="$(usex X -DXWAYLAND "")" XLIBS="$(usex X "xcb xcb-icccm" "")" dwl } src_install() { - default - - insinto /usr/share/wayland-sessions - doins "${FILESDIR}"/dwl.desktop + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc README.md save_config config.h }