From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 27 Mar 2021 06:06:27 +0000
Subject: gentoo resync : 27.03.2021

---
 x11-wm/ctwm/Manifest          |  4 ++--
 x11-wm/ctwm/ctwm-4.0.3.ebuild | 33 ++++++++++++++++++++++++++-------
 x11-wm/ctwm/metadata.xml      | 19 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 10 deletions(-)

(limited to 'x11-wm/ctwm')

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 9e94425446ac..bad4c1449ed0 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,5 +1,5 @@
 DIST ctwm-4.0.2.tar.xz 672608 BLAKE2B b4dc26b9d6ba5aba0a5f1f71363c25065aec0d4d4be7b9772f51117460062f5d7ea17d338e1ad9a89cf1213ca2125a1d203417bdc3f6c95a9b9969477b443a40 SHA512 445151f12084acd44bcf8a7d895e29363411a1a663b93e098fa9db5b96ae5cb43921eaf0695026aff2196117b810b96712a60570f57d6dabbee7fba34d5bd57f
 DIST ctwm-4.0.3.tar.xz 683684 BLAKE2B d16a47a5cd91ab5305da3c02f874d5ad1c71e2c8a3664cd33d5fa0781f4fdc2613407f5b43b4da16bcf89e323eb34b0888c5dbd02598746195991e7870aba0ef SHA512 f9bb2f8f28a050cce0fc2f1f4e00e79acd7c54055016d8483e045d8f5fa9829f8f5d92bb53f0c1d9500f97d6f52cd827ddd15515c84451ea03551025a8ab831d
 EBUILD ctwm-4.0.2.ebuild 873 BLAKE2B 785289d97ae9b6391de850941e238b4d2bdb0f42533274b9b69efb81deb94b2042315fca1b18b9ed0f446611a3f7441bf9e4760fb241dcc06541ab5210545e53 SHA512 1be2be0f710a150245d913dc535b3dedf94d4d1fb4d13a1da94cd6a78ba33717c561ba7a71d66ecbfb2e74519dedfcc86fb30562d073440686b1fc4c53a7e17f
-EBUILD ctwm-4.0.3.ebuild 755 BLAKE2B 1f61f8b1511ce743d5833dff50b7e17fb213fc66e43626a0dadea92521802ef68dd1bb9a66d6611641443d90acec7609872f8d3c08b30205a97b26d6009b846a SHA512 29804e21eeef2b75fa75577e777915fc5b0fc644a614784c957a424cb5cbda9aaeb494286fff51a635b1ffd9ccbd699686dd956415c55e7e442166af09de8255
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD ctwm-4.0.3.ebuild 1272 BLAKE2B 66d9661d555c10fc92d1eb8b6f5fe42604f91b31d1476853a0d3f5ba802bec3587da528eebf351719dee5c08985ed453fe4e11a97e2105337e599c26cae41c2c SHA512 cc6980e656939ae0bb49d24d1dde39ce54fa2f63eaf3d96aebbf111238746a879af3f9fcb4d4718b74b2e72d88bd5cbf3997f3eb51172ddf8f4d127d6af164fb
+MISC metadata.xml 856 BLAKE2B 426cfc4d6e71b0e227ae36597f0a80bc69c20a423952287cb8013b7444aaa699efd5782a6a7ec05703cad50a2c1f19520b6211cd60c896af06382e84a01ca258 SHA512 53fcd34f01714d98356b63928c76c5f115cb2ee5002c80e38ce103377ea15029b2b92ab157bb58de98047b650206a3468bcd891038c7067c40d48646140750ec
diff --git a/x11-wm/ctwm/ctwm-4.0.3.ebuild b/x11-wm/ctwm/ctwm-4.0.3.ebuild
index 4cf2574b36c4..7c24c6682a8f 100644
--- a/x11-wm/ctwm/ctwm-4.0.3.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake
+
+inherit cmake flag-o-matic virtualx
 
 DESCRIPTION="A clean, light window manager"
 HOMEPAGE="https://ctwm.org/"
@@ -11,6 +12,8 @@ SRC_URI="https://ctwm.org/dist/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="jpeg rplay test xpm"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	x11-libs/libICE
@@ -18,18 +21,21 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXpm
 	x11-libs/libXt
+	jpeg? ( virtual/jpeg )
+	rplay? ( media-sound/rplay )
+	xpm? ( x11-libs/libXpm )
 "
 DEPEND="
 	${RDEPEND}
 	app-arch/xz-utils
-	app-text/rman
-	virtual/jpeg
 	x11-base/xorg-proto
 "
 
 src_prepare() {
+	# Bug 715904, sigjmp_buf is guarded by GNU_SOURCE
+	use elibc_musl && append-cflags -D_GNU_SOURCE
+
 	cmake_src_prepare
 
 	# implicit 'isspace'
@@ -37,10 +43,23 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DNOMANCOMPRESS=yes
-		-DDOCDIR=/usr/share/doc/${PF}
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DUSE_JPEG=$(usex jpeg ON OFF)
+		-DUSE_RPLAY=$(usex rplay ON OFF)
+		-DUSE_XPM=$(usex xpm ON OFF)
 	)
 
 	cmake_src_configure
 }
+
+src_compile() {
+	# Bug 701656, test_bins target needs to be compiled
+	# to satisfy the 't_efp' test
+	cmake_src_compile all $(usex test test_bins '')
+}
+
+src_test() {
+	virtx cmake_src_test
+}
diff --git a/x11-wm/ctwm/metadata.xml b/x11-wm/ctwm/metadata.xml
index 6f49eba8f496..ef70fcb22252 100644
--- a/x11-wm/ctwm/metadata.xml
+++ b/x11-wm/ctwm/metadata.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>lillyjsm@gmail.com</email>
+		<name>Jake Lilly</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://www.ctwm.org/CHANGES.html</changelog>
+		<doc>http://www.ctwm.org/docs.html</doc>
+	</upstream>
+	<use>
+		<flag name="jpeg">Enable jpeg image support with <pkg>virtual/jpeg</pkg></flag>
+		<flag name="rplay">Enable sound support from <pkg>media-sound/rplay</pkg></flag>
+		<flag name="test">Enable upstream test suite, build required binary</flag>
+		<flag name="xpm">Enable xpm icon support with <pkg>x11-libs/libXpm</pkg></flag>
+	</use>
 </pkgmetadata>
-- 
cgit v1.2.3