gentoo resync : 09.03.2018

3 files changed, 1 insertions, 92 deletions

diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index d4f915b40986..34c6bb43c48c 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,7 +1,5 @@
 AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1
 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09
-DIST stumpwm-1.0.0.tar.gz 200794 BLAKE2B 656d5f72fe578f12725c3a1a66c56e42175a33d9b1f9d9e83f3b323da17d9e1bc00e0dbea546a8298da7ecbb4c9893da74efe8b7f14475863e670254248d6ca2 SHA512 eb5bf48a5d185d982e8a9ec7639958f14fd912e0f4c89da205f0bcb0c10a61c3953bce5029c2a301fdcd29fe05c505601d4db30fc50b34b7082ce69bd25b43ac
 DIST stumpwm-1.0.1_rc.tar.gz 197530 BLAKE2B 2883ee8a0f75d3c673f6b6f65675c98e9fad8ef181b3ed9cf8bbd5eed7c0d63f3f48d021d056265d4e6c14dd0594bfe3a36492cd9bcdf2b3379d2aa62eba1f67 SHA512 3ba68987e61bdb46fde9c6bbed82b630be1db3272bdfb844a9d7abf3f810e94e560a28d4951308cab5af1f93b35710b10bb1a1a35450a8445a1b959888266df2
-EBUILD stumpwm-1.0.0.ebuild 2000 BLAKE2B d17ed1017fbcb27fc4c1fe952c5f3c05ee70f74aea1928f44b821db141e5391002360fc192d1d8b46e4fb4f887a255cd878617e30cfaea5d00c8f04b80e245f2 SHA512 5ef81d50b544bb0df49e14dec44d3b88573b8938efddb870d8522329e2929a1d766453d8e0d537fae17b42ee430295afe106672982a44226d90b6ef8d2986f89
 EBUILD stumpwm-1.0.1_rc.ebuild 1720 BLAKE2B a6289438611ad9fbc80574180ecc3c1e8a7f69e043e092c9bf65011bd8f302dcbb22eb3eefce1cec3a3ae4a62370456bde525df4f3463ef56db5bd77bd3c0fb9 SHA512 3a384f1a61caa62bd8ed598ef546d43a842beaf19cce966c319d6b8ae371f23ac1d0da5ff57a34078b112d051695a69ce512ae401ec64eadc4ac100513676b1d
-MISC metadata.xml 2521 BLAKE2B f2a96ef826d48affe3abd410f9a82df2cf2bf40d2495c9ccd4f3014d72dee7e249033ace3ef7b2f7897da04a693fc27c569a3cee2ae0f90557d7cbe942da5515 SHA512 98a39ff560bb2317766cdd3b3360a55542c9d1ca4c7f8d814863f133744636c300cea4622886dd8318390d17b75ba2a42151ad5e9273bfb7054e4581f9d33e89
+MISC metadata.xml 2359 BLAKE2B 386ce110aa8b0cd933edaa6fa1dcd7f26d5ff8245317a77af546af6cbe89c9671bdf1c4810654fa0157c8220a04f0cd88e3dad482aab5402032a55d842ff93f2 SHA512 77068f2b6f1aa4b812c6b5251b9b4a0d0dabd08c1c868310c5c9a100ff7d159bb890516395bd7cbda9f6cd014f682d3c0cb2a03afa28e12ce4b2c5575c9c1eda
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index 280080d2f50a..735e47be73d7 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/metadata.xml
@@ -51,9 +51,6 @@
     <flag name="contrib">Install contrib modules</flag>
     <flag name="doc">Include documentation</flag>
     <flag name="emacs">Add support for GNU Emacs</flag>
-    <flag name="clisp">Use CLISP for the runtime</flag>
-    <flag name="ecl">Use SCL for the runtime</flag>
-    <flag name="sbcl">Use SBCL for the runtime</flag>
   </use>
   <upstream>
     <remote-id type="github">stumpwm/stumpwm</remote-id>
diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
deleted file mode 100644
index ebb4b56c5712..000000000000
--- a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 autotools elisp-common xdg-utils
-
-DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
-HOMEPAGE="https://stumpwm.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc emacs clisp ecl +sbcl"
-
-RESTRICT="strip mirror"
-
-RDEPEND="dev-lisp/cl-ppcre
-		sbcl?  ( >=dev-lisp/sbcl-1.0.32 )
-		sbcl? ( >=dev-lisp/clx-0.7.3 )
-		!sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) )
-		!sbcl? ( !clisp? (  ecl? ( >=dev-lisp/ecls-10.4.1 ) ) )
-		!sbcl? (  clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) )
-		emacs? ( virtual/emacs app-emacs/slime )"
-DEPEND="${RDEPEND}
-		sys-apps/texinfo
-		doc? ( virtual/texi2dvi )"
-
-PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
-
-SITEFILE=70${PN}-gentoo.el
-CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
-
-get_lisp() {
-	local lisp
-
-	for lisp in "$@" ; do
-		use ${lisp} && echo ${lisp} && return
-	done
-}
-
-install_docs() {
-	local pdffile="${PN}.pdf"
-
-	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
-	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
-	dodoc AUTHORS NEWS README.md README.Gentoo
-	doinfo "${PN}.info"
-	docinto examples ; dodoc sample-stumpwmrc.lisp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf --with-lisp=$(get_lisp sbcl clisp ecl)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	common-lisp-export-impl-args $(get_lisp sbcl clisp ecl)
-	dobin stumpwm
-	make_session_desktop StumpWM /usr/bin/stumpwm
-
-	common-lisp-install-sources *.lisp
-	common-lisp-install-asdf
-	# Fix ASDF dir
-	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
-		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
-	use doc && install_docs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}