* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/dwl/, gui-wm/dwl/files/
@ 2021-02-19 10:14 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-02-19 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 4d49bc35a8ba636556dacee3d2a62036d378aa70
Author: Simon van der Maas <svdm-gentoo <AT> protonmail <DOT> com>
AuthorDate: Thu Feb 18 10:13:49 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 10:13:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4d49bc35
gui-wm/dwl: fixed ebuild
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Simon van der Maas <svdm-gentoo <AT> protonmail.com>
gui-wm/dwl/dwl-0.2.ebuild | 4 +++-
gui-wm/dwl/files/dwl-0.2-prefix.patch | 11 -----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/gui-wm/dwl/dwl-0.2.ebuild b/gui-wm/dwl/dwl-0.2.ebuild
index 415e0dd7..fbd1f983 100644
--- a/gui-wm/dwl/dwl-0.2.ebuild
+++ b/gui-wm/dwl/dwl-0.2.ebuild
@@ -15,4 +15,6 @@ DEPEND="gui-libs/wlroots
dev-libs/wayland-protocols"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-prefix.patch" )
+src_install() {
+ emake PREFIX="${D}"/usr install
+}
diff --git a/gui-wm/dwl/files/dwl-0.2-prefix.patch b/gui-wm/dwl/files/dwl-0.2-prefix.patch
deleted file mode 100644
index 3020247b..00000000
--- a/gui-wm/dwl/files/dwl-0.2-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/config.mk b/config.mk
-index cd4e821..bdb2687 100644
---- a/config.mk
-+++ b/config.mk
-@@ -1,5 +1,5 @@
- # paths
--PREFIX = /usr/local
-+PREFIX = /var/tmp/portage/gui-wm/dwl-0.2/image
-
- # Default compile flags (overridable by environment)
- CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wdeclaration-after-statement
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/dwl/, gui-wm/dwl/files/
@ 2021-06-26 10:53 Haelwenn Monnier
0 siblings, 0 replies; 3+ messages in thread
From: Haelwenn Monnier @ 2021-06-26 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 8f2d32a64feee96b8dd76ca787533364df381dd8
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Jun 26 00:46:22 2021 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sat Jun 26 00:49:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8f2d32a6
gui-wm/dwl: savedconfig and use flag for Xwayland
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
gui-wm/dwl/dwl-0.2.1.ebuild | 45 +++++++++++++++++++++++++++++++++++++-------
gui-wm/dwl/files/dwl.desktop | 7 +++++++
2 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/gui-wm/dwl/dwl-0.2.1.ebuild b/gui-wm/dwl/dwl-0.2.1.ebuild
index fbd1f9833..285f36ac7 100644
--- a/gui-wm/dwl/dwl-0.2.1.ebuild
+++ b/gui-wm/dwl/dwl-0.2.1.ebuild
@@ -3,18 +3,49 @@
EAPI=7
+inherit flag-o-matic savedconfig toolchain-funcs
+
DESCRIPTION="dwm for Wayland"
HOMEPAGE="https://github.com/djpohly/dwl"
-SRC_URI="https://github.com/djpohly/dwl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="CC0-1.0 GPL-3 MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+ dev-libs/libinput
+ dev-libs/wayland
+ gui-libs/wlroots[X(-)?]
+ x11-libs/libxcb
+ x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/wayland-protocols
+ dev-util/wayland-scanner
+ virtual/pkgconfig
+"
-DEPEND="gui-libs/wlroots
-dev-libs/wayland-protocols"
-RDEPEND="${DEPEND}"
+src_prepare() {
+ default
+
+ restore_config config.h
+}
+
+src_configure() {
+ use X && append-cppflags -DXWAYLAND
+ tc-export CC
+}
src_install() {
- emake PREFIX="${D}"/usr install
+ emake PREFIX="${ED}/usr" install
+
+ insinto /usr/share/wayland-sessions
+ doins "${FILESDIR}"/dwl.desktop
+
+ einstalldocs
+
+ save_config config.h
}
diff --git a/gui-wm/dwl/files/dwl.desktop b/gui-wm/dwl/files/dwl.desktop
new file mode 100644
index 000000000..343f5d4cd
--- /dev/null
+++ b/gui-wm/dwl/files/dwl.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=dwl
+Comment=dwm for Wayland
+Exec=/usr/bin/dwl
+TryExec=dwl
+Icon=
+Type=Application
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: gui-wm/dwl/, gui-wm/dwl/files/
@ 2023-09-25 10:00 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-09-25 10:00 UTC (permalink / raw
To: gentoo-commits
commit: d8685c86220f11451d49336c7eae2fb3f38b45fa
Author: Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Sun Sep 24 20:46:28 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 20:46:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d8685c86
gui-wm/dwl: treeclean, moved to ::gentoo
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
gui-wm/dwl/Manifest | 2 --
gui-wm/dwl/dwl-0.3.1.ebuild | 50 --------------------------
gui-wm/dwl/dwl-0.4-r2.ebuild | 83 -------------------------------------------
gui-wm/dwl/dwl-9999-r1.ebuild | 74 --------------------------------------
gui-wm/dwl/dwl-9999.ebuild | 74 --------------------------------------
gui-wm/dwl/files/dwl.desktop | 7 ----
gui-wm/dwl/metadata.xml | 20 -----------
7 files changed, 310 deletions(-)
diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
deleted file mode 100644
index f1202584c5..0000000000
--- a/gui-wm/dwl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dwl-0.3.1.tar.gz 51347 BLAKE2B 754dcf17de405f4a3f69478444fe46199f4e67fd7a7801e02131676e23e7324b49d6f31da629a6ab977262a210b95adcb8407c37b81031aac3ee6d2427f27a10 SHA512 c6bcaf26d6f67f7712f907331c947afc84a5c5b990f5ec6d568d65f624a2cafd1617055ed514cd7e8a331abcd4c37ed574672dcbeeb890607d8eb38e7a304215
-DIST dwl-0.4.tar.gz 55527 BLAKE2B a4c6d763574f2bf88db959a4730447874de61d4d868d12285feebc121204c4dbda82ab3cfef791999e138898daa5564d295d4943aff015d91d62d9c9ade6d005 SHA512 6e15e05001e6469d13bef2d532980585d57de55c8feb461a7c25a76d7cdaee022785485faca02cd9d1214457fbeb1bec0eb652700ba0ddccca4aa780df0046b2
diff --git a/gui-wm/dwl/dwl-0.3.1.ebuild b/gui-wm/dwl/dwl-0.3.1.ebuild
deleted file mode 100644
index b5ee696160..0000000000
--- a/gui-wm/dwl/dwl-0.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic savedconfig toolchain-funcs desktop
-
-DESCRIPTION="dwm for Wayland"
-HOMEPAGE="https://github.com/djpohly/dwl"
-SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
- dev-libs/libinput
- dev-libs/wayland
- gui-libs/wlroots:0/15[X(-)?]
- x11-libs/libxkbcommon
- X? ( x11-libs/libxcb )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-libs/wayland-protocols
- dev-util/wayland-scanner
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
-
- restore_config config.h
-}
-
-src_configure() {
- use X && append-cppflags -DXWAYLAND
- tc-export CC
-}
-
-src_install() {
- emake PREFIX="${ED}/usr" install
-
- domenu "${FILESDIR}"/dwl.desktop
-
- einstalldocs
-
- save_config config.h
-}
diff --git a/gui-wm/dwl/dwl-0.4-r2.ebuild b/gui-wm/dwl/dwl-0.4-r2.ebuild
deleted file mode 100644
index c9095c4d87..0000000000
--- a/gui-wm/dwl/dwl-0.4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
- # 9999-r0: main (latest wlroots release)
- # 9999-r1: wlroots-next (wlroots-9999)
- case ${PVR} in
- 9999)
- EGIT_BRANCH=main
- ;;
- 9999-r1)
- EGIT_BRANCH=wlroots-next
- WLROOTS_SLOT="0/9999"
- ;;
- esac
-else
- SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="dwm for Wayland"
-HOMEPAGE="https://github.com/djpohly/dwl"
-
-LICENSE="CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="
- dev-libs/libinput:=
- dev-libs/wayland
- gui-libs/wlroots:${WLROOTS_SLOT}[X(-)?]
- x11-libs/libxkbcommon
- X? (
- x11-libs/libxcb:=
- x11-libs/xcb-util-wm
- )
-"
-# uses <linux/input-event-codes.h>
-DEPEND="
- ${RDEPEND}
- sys-kernel/linux-headers
-"
-BDEPEND="
- dev-libs/wayland-protocols
- dev-util/wayland-scanner
- virtual/pkgconfig
-"
-
-src_prepare() {
- restore_config config.h
-
- 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_install() {
- default
-
- insinto /usr/share/wayland-sessions
- doins "${FILESDIR}"/dwl.desktop
-
- save_config config.h
-}
diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-9999-r1.ebuild
deleted file mode 100644
index 69c568ba6f..0000000000
--- a/gui-wm/dwl/dwl-9999-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit savedconfig toolchain-funcs
-
-WLROOTS_SLOT="0/16"
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/djpohly/dwl"
- inherit git-r3
-
- # 9999-r0: main (latest stable wlroots release)
- # 9999-r1: wlroots-next (wlroots-9999)
- case ${PVR} in
- 9999)
- EGIT_BRANCH=main
- ;;
- 9999-r1)
- EGIT_BRANCH=wlroots-next
- WLROOTS_SLOT="0/9999"
- ;;
- esac
-else
- SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="dwm for Wayland"
-HOMEPAGE="https://github.com/djpohly/dwl"
-
-LICENSE="CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="
- dev-libs/libinput:=
- dev-libs/wayland
- gui-libs/wlroots:${WLROOTS_SLOT}[X(-)?]
- x11-libs/libxkbcommon
- X? (
- x11-libs/libxcb:=
- x11-libs/xcb-util-wm
- )
-"
-
-# uses <linux/input-event-codes.h>
-DEPEND="
- ${RDEPEND}
- sys-kernel/linux-headers
-"
-BDEPEND="
- >=dev-libs/wayland-protocols-1.32
- dev-util/wayland-scanner
- virtual/pkgconfig
-"
-
-src_prepare() {
- restore_config config.h
-
- default
-}
-
-src_compile() {
- emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \
- XWAYLAND="$(usex X -DXWAYLAND "")" XLIBS="$(usex X "xcb xcb-icccm" "")" dwl
-}
-
-src_install() {
- 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
deleted file mode 100644
index 1f9febd575..0000000000
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit savedconfig toolchain-funcs
-
-WLROOTS_SLOT="0/16"
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/djpohly/dwl"
- inherit git-r3
-
- # 9999-r0: main (latest stable wlroots release)
- # 9999-r1: wlroots-next (wlroots-9999)
- case ${PVR} in
- 9999)
- EGIT_BRANCH=main
- ;;
- 9999-r1)
- EGIT_BRANCH=wlroots-next
- WLROOTS_SLOT="0/9999"
- ;;
- esac
-else
- SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="dwm for Wayland"
-HOMEPAGE="https://github.com/djpohly/dwl"
-
-LICENSE="CC0-1.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="
- dev-libs/libinput:=
- dev-libs/wayland
- gui-libs/wlroots:${WLROOTS_SLOT}[X(-)?]
- x11-libs/libxkbcommon
- X? (
- x11-libs/libxcb:=
- x11-libs/xcb-util-wm
- )
-"
-
-# uses <linux/input-event-codes.h>
-DEPEND="
- ${RDEPEND}
- sys-kernel/linux-headers
-"
-BDEPEND="
- dev-libs/wayland-protocols
- dev-util/wayland-scanner
- virtual/pkgconfig
-"
-
-src_prepare() {
- restore_config config.h
-
- default
-}
-
-src_compile() {
- emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \
- XWAYLAND="$(usex X -DXWAYLAND "")" XLIBS="$(usex X "xcb xcb-icccm" "")" dwl
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
- dodoc README.md
-
- save_config config.h
-}
diff --git a/gui-wm/dwl/files/dwl.desktop b/gui-wm/dwl/files/dwl.desktop
deleted file mode 100644
index 343f5d4cd4..0000000000
--- a/gui-wm/dwl/files/dwl.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=dwl
-Comment=dwm for Wayland
-Exec=/usr/bin/dwl
-TryExec=dwl
-Icon=
-Type=Application
diff --git a/gui-wm/dwl/metadata.xml b/gui-wm/dwl/metadata.xml
deleted file mode 100644
index b8f3da9cf9..0000000000
--- a/gui-wm/dwl/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>leohdz172@proton.me</email>
- <name>Leonardo Hernández Hernández</name>
- <description>Upstream Maintainer (please CC on bugs)</description>
- </maintainer>
- <maintainer type="person">
- <email>svdm-gentoo@protonmail.com</email>
- <name>Simon van der Maas</name>
- </maintainer>
- <maintainer type="person">
- <email>efe.izbudak@metu.edu.tr</email>
- <name>Efe İzbudak</name>
- </maintainer>
- <upstream>
- <remote-id type="github">djpohly/dwl</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-25 10:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-26 10:53 [gentoo-commits] repo/proj/guru:master commit in: gui-wm/dwl/, gui-wm/dwl/files/ Haelwenn Monnier
-- strict thread matches above, loose matches on Subject: below --
2023-09-25 10:00 Florian Schmaus
2021-02-19 10:14 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox