From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 x11-wm/jwm/Manifest         |  4 +--
 x11-wm/jwm/jwm-2.3.2.ebuild | 60 ---------------------------------------------
 x11-wm/jwm/jwm-2.3.7.ebuild |  9 ++++---
 3 files changed, 6 insertions(+), 67 deletions(-)
 delete mode 100644 x11-wm/jwm/jwm-2.3.2.ebuild

(limited to 'x11-wm/jwm')

diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index ea387e11a4da..87b5f46b5568 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,6 +1,4 @@
 AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b
-DIST jwm-2.3.2.tar.xz 325648 BLAKE2B 93654116b0dedff4ad03c7981a9978530a1989edf4766591f083c3b10fefb128acc85e93b888a7700cb59e0bd85e1e7f7e118a22327f79ddcc1d380887764028 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27
 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
-EBUILD jwm-2.3.2.ebuild 1414 BLAKE2B 138b7134ca5e1a280df2f53be75f6e2929d5a105a6ee0c8f3d6936257d06759c0649cb78c2514abbdd0135b187819d4e2f3b4ebed683a82a552af6556f9f67cf SHA512 10bc3b2dd084436fc0e03b388269f905f995e358d5fe3811257154b10feb04987782f3720e3eaae15f95c80bf599a625361e50563ce2774d814d88f7b91f457a
-EBUILD jwm-2.3.7.ebuild 1822 BLAKE2B 9622c3e7cd73aa5d0a4c664fd9c38d96ac20319dc22e437bffc20be8613efc71f0ac4b758f24e8ebb522013610566b889d9df5fa32173a12bbd9ba4aa5cd0e16 SHA512 1830ce3972fe1454cf999633f01550a3aa412c63a1eb5039467c4d7a0dcef317da47eaa7b166ffc7fe0c9ba192d7ebab51213513df68d4f1bd2d2d89083dfe17
+EBUILD jwm-2.3.7.ebuild 1817 BLAKE2B afebe64049c60725c05a91f9a8c0113aaf1472914bd95553ce8ca0e330b9fc6f4dae9ea35617fae47c293b7911500a0f65337ad80fd02140b344b6af5397d39e SHA512 68a7c5e782bcd2e57235485ed57955fd5fddf97bb60dd74a1b15b4241d9e3ec2e7c07ac2d85381b80c90b562ad97d6ff6f133ab58fb77c8a2f6ad01f18d33a7c
 MISC metadata.xml 973 BLAKE2B 396dc5d70f98f46e0a2698b893b127cad189762b28a1be2272b560ea4bd174a637cb4a9a01783a69c14797605d74442d221a55d3b5ca4128f343d7e602333096 SHA512 11ce10dace193af664e4939f506adc8311db83c7caa00959ebc7b57ed3084cd1e6ca8dcd8ff141e9ddbb823c485d45696ca3653d2ba9e252401704077dd932f0
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
deleted file mode 100644
index 7f6d666ef0c8..000000000000
--- a/x11-wm/jwm/jwm-2.3.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="bidi debug jpeg png truetype xinerama xpm"
-
-RDEPEND="xpm? ( x11-libs/libXpm )
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	truetype? ( x11-libs/libXft )
-	png? ( media-libs/libpng:0= )
-	jpeg? ( virtual/jpeg:0= )
-	bidi? ( dev-libs/fribidi )
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		$(use_enable xpm) \
-		$(use_enable bidi fribidi) \
-		--enable-shape \
-		--enable-xrender
-}
-
-src_install() {
-	dodir /etc
-	dodir /usr/bin
-	dodir /usr/share/man
-
-	default
-
-	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
-
-	dodoc README.md example.jwmrc ChangeLog
-}
-
-pkg_postinst() {
-	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
-	einfo "or per-user by creating a configuration file in ~/.jwmrc"
-	einfo
-	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/x11-wm/jwm/jwm-2.3.7.ebuild b/x11-wm/jwm/jwm-2.3.7.ebuild
index ca8612d564d2..de3b5aa2c7f5 100644
--- a/x11-wm/jwm/jwm-2.3.7.ebuild
+++ b/x11-wm/jwm/jwm-2.3.7.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
+
+inherit wrapper
 
 DESCRIPTION="Very fast and lightweight still powerful window manager for X"
 HOMEPAGE="http://joewing.net/projects/jwm/"
 SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
 
 RDEPEND="dev-libs/expat
-- 
cgit v1.2.3