gentoo resync : 14.12.2020

3 files changed, 3 insertions, 86 deletions

diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index be7ceb355046..abacedb07b0f 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,6 +1,4 @@
-DIST pekwm-0.1.17.tar.bz2 405742 BLAKE2B 6cb47f92f8d32358ece8502fd706880478403ec01bb1aea0a042b2f9a110672c923c7289583f4b63b0e190b3979631c60760fae70174ecb205dfccf15baac398 SHA512 fa4c95ddc7e17f737b4e90f32258a79bf2a0abe96a2ab1a4166b1aa6832ff7a978116d224c98c31a4b33444b3c59e9ecd6095ca062d8a65f0f6174803f5b0811
 DIST pekwm-0.1.17.tar.gz 429100 BLAKE2B 2b467539ef47f4404411f25146f9f945f9a63b7e4c85c997ed2cd0bf76ea713758e3a09dc9648064c02ab29818399623d12d78394f250c79f8f667a6e057281c SHA512 1950888402f11c5cd72c9d82de976c472d4a0443da206629a039d19a1729660fd7cd09535d35984d554dcdb366918d9e29536b1272521f36f7e54499df0c14af
 DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d
-EBUILD pekwm-0.1.17-r1.ebuild 1695 BLAKE2B 4f9f97e2ed2bfe595283c2bd5e7dae38f620d640b6bf4e9422a5bc4434628c77a51fba7aafc82ef988551d45d948b2949d0470903fce65520c12c3d846af909c SHA512 1c0471b6b671428e1227bfbad8ebbe48a0783bcfcf4561d5c3db74dd907264bbd30eb3c3654bbd5a1bde0a520417186e3e6a1c8d5bc862c0fc691969389a7e0c
-EBUILD pekwm-0.1.17-r2.ebuild 1838 BLAKE2B 40795ce2f870024b519d76ea7989a62d805cf92b98b47a99ec3d3546fcbe756dad66f6c435e4c5adf3429a705e380c03fd34e1e037827b4ba48d1cabda106149 SHA512 2716cace727eec86daeef1b53754339cf50962421ff48b09a8c928dab4b7735cc369518a00165653f582df6410b0a55f05a0d716eda0580d0d9ad07990c9b7f3
+EBUILD pekwm-0.1.17-r2.ebuild 1835 BLAKE2B a2a208181d689d2ba907baa04f4cad5aceef27e18a7e3db14ababaf910043b52dcbab61f3326b3df2d5190ee1176afb5589f1b53483ccd7e1177038773cabe24 SHA512 737636067aff402698836f7fcbeed26f587565febfaaf25f09fd3c5a51919499cdc506da3332c250f6d9ba0a497da66317a8c1eb1c64f40fde0bb6a901225dda
 MISC metadata.xml 968 BLAKE2B 61ebb7661defcb80be3a193ea230be7d657503fe5a4885496fe58152bb63b323f6b94de08b8df52608b640ceba2155c5041a2e452558093571d0bce55b15fd8f SHA512 02042a7c09730767185d59cbd0152a0286d8c1e8c7d9bdcbbed6ed9856c576372dbd3f4375b389d32f207939bdf7a4e60db5804bad07e81d689b79668e77bcba
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
deleted file mode 100644
index ec556a922a71..000000000000
--- a/x11-wm/pekwm/pekwm-0.1.17-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A lightweight window manager initially based on aewm++"
-HOMEPAGE="http://pekwm.org/"
-SRC_URI="
-	http://pekwm.org/projects/pekwm/files/${P}.tar.bz2
-	themes? ( mirror://gentoo/${PN}-themes.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" amd64 ~mips ppc x86"
-IUSE="contrib debug themes truetype xinerama"
-
-RDEPEND="
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if use themes; then
-		rm "${WORKDIR}"/themes/Ace/.theme.swp || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--enable-image-jpeg \
-		--enable-image-png \
-		--enable-image-xpm \
-		--enable-shape \
-		--enable-xrandr
-}
-
-src_install() {
-	default
-
-	# Install contributor scripts into doc folder
-	if use contrib ; then
-		docinto /usr/share/doc/${PF}/contrib
-		dodoc contrib/lobo/{check.png,pekwm_autoprop.pl,pekwm_menu_config.pl} \
-			contrib/lobo/{pekwm_menu_config.pl.vars,README,uncheck.png}
-	fi
-
-	if use themes; then
-		insinto /usr/share/${PN}/themes
-		doins -r "${WORKDIR}"/themes/*
-	fi
-
-	# Insert an Xsession
-	echo -e "#!/bin/sh\n\n/usr/bin/${PN}" > "${T}"/${PN} || die
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/${PN}
-
-	# Insert a GDM/KDM xsession file
-	make_session_desktop ${PN} ${PN}
-}
-
-pkg_postinst() {
-	if use contrib ; then
-		elog " User contributed scripts have been installed into:"
-		elog " /usr/share/doc/${PF}/contrib"
-	fi
-}
diff --git a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
index c5b8371db7c8..c733ff0ee361 100644
--- a/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 IUSE="contrib debug themes truetype xinerama"
 
 RDEPEND="