gentoo resync : 29.12.2022

4 files changed, 58 insertions, 7 deletions

diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 980bb3b888ed..c6b874ceed8c 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,4 +1,6 @@
 DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a68505b07f003c8d711a68a158f31147f463d5467bb4242c6321ebe0acaee63727689a136ca83c47e7592ea SHA512 5ad0fa56d9c96c36cc32e68128e58d4e3a7483f349bb26be1083c5b5c6d853ff05eec1a783b07ed928bd99a35a2e0b2d7053fc89b828aa9bdfe3589a318c4171
+DIST cwm-7.1.tar.gz 53667 BLAKE2B 6d0b64e95b78201113eb75c537d3ffdc8bd1b2a1d50f88bf9f7126dbdef372e80f36c5c1fd84b5bee29c7e9da7debc479264af34cf8c48abf1358d3d0c046919 SHA512 aa14bc7a43a522f4b83d3f9a3b8a8344c339b52aac4733f410e388df56a2dc4e86ee1ae9f05b53ff3139808f87f38a4b2da57bf0525482613d46651e8f08c718
 EBUILD cwm-6.7.ebuild 942 BLAKE2B e0208c09375fac2d729eebccd7df8ec4af507a34e6810dd45f75349c865977afe906cb166d982eae04172820b319cf8142938faefea6c813ec8be9a517757e83 SHA512 dbf3308532dbc46c1b8200e4c21a7605c2f735ba2918c2c029ad4e4df0170f222b9e86fb67b036d3c6aebef8d35bbdfdd0ec68cd6a68a086c43924dceeef4f76
-EBUILD cwm-9999.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
-MISC metadata.xml 249 BLAKE2B ac2e007c4228bbe8d3d5e17842e31f96af4e3ce4c9af4a127e1c0e5be50212c2b931d1022edd8c81f116b21a897e77a51250293830cc8146b7b808cc5e8916c7 SHA512 d471fb1fc96717d11a0b627e970be2a7a9714235412679d7299dc4dbd457f158d0862add04be2f65eeb15b100ceeb9a2f0e1fd5db59751169bbf715b7a158fac
+EBUILD cwm-7.1.ebuild 940 BLAKE2B 18151dc53a4dfbf1701323cacddfb59f446030635eca528243f6760848d4baf62a143675145f27bde7ed09874fd69bcd33266c08dcddf3337d00a8e7fe196d1d SHA512 25390c5c38125483bb442f4e8fa68be60230eb192dcfc5a02d0808601e2a31fcb9086543d5e5895c7c2844636903f7bd6e09ea4f9428e703e1f010ca82cfe13b
+EBUILD cwm-9999.ebuild 940 BLAKE2B 18151dc53a4dfbf1701323cacddfb59f446030635eca528243f6760848d4baf62a143675145f27bde7ed09874fd69bcd33266c08dcddf3337d00a8e7fe196d1d SHA512 25390c5c38125483bb442f4e8fa68be60230eb192dcfc5a02d0808601e2a31fcb9086543d5e5895c7c2844636903f7bd6e09ea4f9428e703e1f010ca82cfe13b
+MISC metadata.xml 486 BLAKE2B d84fc69bd87de18b42a364fef9c88257e4990715a4110942285d29d223c7b5219dba158fee2258c5814ee5ebfcaa5a93a80d6a8975998397bda5933c007f0d7e SHA512 342f65a74a69c04fc92fce18c2722fbb03f23bc85068d3e693a2a2dbc936e2b4cf832606cc76a2cc4d33f364c62d1978ba4aa1c9770d18a69380f56a31c47344
diff --git a/x11-wm/cwm/cwm-7.1.ebuild b/x11-wm/cwm/cwm-7.1.ebuild
new file mode 100644
index 000000000000..9aa6d59cba3a
--- /dev/null
+++ b/x11-wm/cwm/cwm-7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="https://github.com/leahneukirchen/cwm
+	https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
+else
+	SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXrandr
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index c35cf81e9f80..9aa6d59cba3a 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop toolchain-funcs
 
@@ -21,8 +21,8 @@ fi
 LICENSE="ISC"
 SLOT="0"
 
-DEPEND="x11-libs/libXft
-	x11-libs/libXinerama
+DEPEND="x11-libs/libX11
+	x11-libs/libXft
 	x11-libs/libXrandr
 "
 RDEPEND="${DEPEND}"
diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
index c24849391d64..ebdff070098b 100644
--- a/x11-wm/cwm/metadata.xml
+++ b/x11-wm/cwm/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">chneukirchen/cwm</remote-id>
 	</upstream>