gentoo resync : 11.05.2018

4 files changed, 2 insertions, 144 deletions

diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 8f056d5c8abb..6ecbc81d2bc6 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,7 +1,3 @@
-DIST ctwm-3.7.tar.gz 1139461 BLAKE2B 7c96f6434dea660dcbcc017b89bb9df533b6b26688392ba7baf14b4b701d093f8ff4e0c0c3af61bd5ea32d0b88b336d6958e1d4f524de1cb4d4577e20cfe3380 SHA512 e3c1e4bed68ffbf3efbc6057743889d706ed16e74bd334ebb689c8283f1288778dc368f0a6064aa7e24a6416592f22d1eeffc09c76cb0cd4ea64467718c62cfd
-DIST ctwm-3.8.2.tar.xz 549984 BLAKE2B 90b1d7c872e2ca8960853829d9ad5b19476ca8cdbcda9d3fcb180787aa85ff13b3d63e6c6d19e38193d71c2175c939d65d9581ce2629314c78dc0a56bf8cb139 SHA512 4633b7bf7b8528ecfd2a753f443fd5286fd394df37ebe885138d30a498f0d721076835d135974a2bd11ca9c32ffd288f84788cb0407ae346a29c5f6371dca497
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
-EBUILD ctwm-3.7.ebuild 1212 BLAKE2B 8c4d63738ac7b5c179e4870d44ba1afb9bfc6d63e993a3c00c17cb3fea1b11851b8733dc20f66ea0d88e6f251c92b1085e98464bc813cafd9ad4c66a767a72a5 SHA512 03c706d0d6a8678e6a781ea260bb4faa49399b6e74df46d3b7bb56d810099fbf3a09ac05c1356dbe762c119d7b06873a06e91f3411d2cd7d9094158eb2b8e9e6
-EBUILD ctwm-3.8.2.ebuild 1546 BLAKE2B 037631059eb8ef42eb50d70359574a57e23c17f1a4fe40a2fb1327a50b0c5e6a4c596cdb0da73136958dac726b6c5bc2d20d2c524f0791c76e24b0f33089051d SHA512 4bdc01a3290cc7293d9c38acbb0c2d6dad77b18d6b57c0b72844fe304c42bb5025af98d7e7ce49187079c4f6ec45d3175f12b7b0921ef73bfebe61057fca00d1
-EBUILD ctwm-4.0.1.ebuild 900 BLAKE2B 3f3c744060c15fd226d657d87ee8ca0d85a68d044526a59894aa72ad7cb56b8d455e61500e3ecfbfbe1abfb24beedd886f23992843c515380d8d787704f622fc SHA512 6d49ea92d4490956bc9b6d5ecb1afe6e6097b44b04cecfb844160fb802ce855b381ba9a93430eb9ac2d099a42ac6fb2b9d5e95e907168a63c5c4d31967738c91
+EBUILD ctwm-4.0.1.ebuild 899 BLAKE2B 1fbb14215e8b31096c81fec17b3be053f375f65e43dba22ad9568f2d42f4dfb80f9043ced5cd81b2569f15a2b82e8384e0d0c84f946e96ba9aea403974fdcb1c SHA512 6e93d0b57ea19d2a7cfa329f8dbf75d5d6747f2c63c3bcfeb1f06692d935fefcc6ef0d1cfe3c6e4efc0438dd52a458eb56c85e5703721362bc2ffee5cbe659b5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-3.7.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
deleted file mode 100644
index a558de71004b..000000000000
--- a/x11-wm/ctwm/ctwm-3.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.free.lp.se/"
-SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	app-text/rman
-	virtual/jpeg
-	x11-misc/imake
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-src_compile() {
-	sed -i -e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" Imakefile \
-		|| die "sed failed"
-
-	cp Imakefile.local-template Imakefile.local
-
-	xmkmf || die "xmkmf failed"
-	make TWMDIR=/usr/share/${PN} || die "make failed"
-}
-
-src_install() {
-	make BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		TWMDIR=/usr/share/${PN} \
-		DESTDIR="${D}" install || die "make install failed"
-
-	make MANPATH=/usr/share/man \
-		DOCHTMLDIR=/usr/share/doc/${PF}/html \
-		DESTDIR="${D}" install.man || die "make install.man failed"
-
-	echo "#!/bin/sh" > ${T}/ctwm
-	echo "/usr/bin/ctwm" >> ${T}/ctwm
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/ctwm
-
-	dodoc CHANGES README* TODO* PROBLEMS
-	dodoc *.ctwmrc*
-}
diff --git a/x11-wm/ctwm/ctwm-3.8.2.ebuild b/x11-wm/ctwm/ctwm-3.8.2.ebuild
deleted file mode 100644
index 050ce634b582..000000000000
--- a/x11-wm/ctwm/ctwm-3.8.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.org/"
-SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	app-text/rman
-	virtual/jpeg
-	x11-misc/imake
-	x11-proto/xextproto
-	x11-proto/xproto
-"
-
-src_prepare() {
-	# overflow bug 338180
-	sed -i menus.c -e "/char modStr/ s/5/6/" || die
-
-	# implicit 'isspace'
-	sed -i parse.c -e "/<stdio.h>/ a#include <ctype.h>" || die
-
-	sed -i Imakefile -e "/^CONFDIR/s@=.*@= /etc/X11/twm@g" || die
-
-	cp Imakefile.local-template Imakefile.local
-
-	# TODO: Add GNOME support
-	sed -i Imakefile.local -e '/^#define GNOME/d' || die
-}
-
-src_configure() {
-	append-cppflags -DXPM -DJPEG
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		TWMDIR=/usr/share/${PN}
-}
-
-src_install() {
-	emake BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		TWMDIR=/usr/share/${PN} \
-		DESTDIR="${D}" install
-
-	emake MANPATH=/usr/share/man \
-		DOCHTMLDIR=/usr/share/doc/${PF}/html \
-		DESTDIR="${D}" install.man
-
-	echo "#!/bin/sh" > ${T}/ctwm
-	echo "/usr/bin/ctwm" >> ${T}/ctwm
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/ctwm
-
-	dodoc CHANGES README* TODO* PROBLEMS
-	dodoc *.ctwmrc*
-}
diff --git a/x11-wm/ctwm/ctwm-4.0.1.ebuild b/x11-wm/ctwm/ctwm-4.0.1.ebuild
index f95c140b4236..ecd97a4a914c 100644
--- a/x11-wm/ctwm/ctwm-4.0.1.ebuild
+++ b/x11-wm/ctwm/ctwm-4.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}dist/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
 	x11-libs/libICE