x11-wm/stumpwm: bump to version 0.9.5-r4

3 files changed, 20 insertions, 80 deletions

diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index ad31790b..f8e7b16e 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -3,5 +3,4 @@ AUX 0.9.5-fix-xlib-workarounds.patch 132959 RMD160 27cae162b532a81b066c210bb8d1f
 AUX 0.9.5-gentoo-fix-asd-deps.patch 923 RMD160 04c787a04c79449d91610634d65b9c4c6f243ffa SHA1 28d92142d5217368f9c3966d9771294096972afe SHA256 65606d272fc77b5e1b21f59a960833a57736888c71565d0c6b28494cf28b8323
 AUX README.Gentoo 1541 RMD160 526f5c2e2277bcd8c1d69d5a6fbdb91c4b9ef52a SHA1 84aab89382c98bb267d703e4a89fb0d2520f01af SHA256 b723b244063d9a1392a23b81fd175c29b9441760509c153810962cfbb962768b
 DIST stumpwm-0.9.5.tgz 470265 RMD160 e5dfec660d26e552857084afb364e8b3c1c9483d SHA1 7660305e70ad3d696f15c959dca4cc34036e14b3 SHA256 1a3ba3bab6b7e6eb9d96e9b90bf398f26ba4afeb873bae8bae8bcf061755d08e
-EBUILD stumpwm-0.9.5-r3.ebuild 2342 RMD160 b91c6e09a006f1788f213f4586eee1b458f79333 SHA1 c6c960f506e09390497bb40ec01240fd65694be8 SHA256 b584dc92e23a76535180a5f0c3f25cf6d7ea301253163d7cb2590be9c1cf4bea
-EBUILD stumpwm-0.9.5.ebuild 1516 RMD160 9c8b51cf126d9a45bbaf941bbe96f66d6598425a SHA1 dc5c9d0661f6361fd072003b443ceaba3f5dd91b SHA256 938af87d7913943042cfeb76b786f7545952f381dca1d2e0eaa7b421bc4fd398
+EBUILD stumpwm-0.9.5-r4.ebuild 2256 RMD160 d72bf8b9b13b6d522b4a118a99673f6d2e774c7d SHA1 ef49ba9141d7a20de64cb5715907dab4ce7757b8 SHA256 8506f6a4bb329d7cdac6569ac3f1179dc2b07ed7d599708953a2b1bb952a05df
diff --git a/x11-wm/stumpwm/stumpwm-0.9.5-r3.ebuild b/x11-wm/stumpwm/stumpwm-0.9.5-r4.ebuild
index 891f64a6..e8df3c4d 100644
--- a/x11-wm/stumpwm/stumpwm-0.9.5-r3.ebuild
+++ b/x11-wm/stumpwm/stumpwm-0.9.5-r4.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit common-lisp-2 eutils elisp
+inherit common-lisp-2 glo-utils eutils elisp
 
 DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp."
 HOMEPAGE="http://www.nongnu.org/stumpwm/"
@@ -13,7 +13,7 @@ SRC_URI="http://download.savannah.nongnu.org/releases/stumpwm/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="sbcl clisp emacs doc"
+IUSE="sbcl clisp source emacs"
 
 RESTRICT="strip"
 
@@ -24,7 +24,7 @@ DEPEND="dev-lisp/cl-ppcre
 		!sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X] ) )
 		sbcl?  ( >=dev-lisp/sbcl-1.0.22 )
 		emacs? ( app-emacs/slime )
-		doc? ( sys-apps/texinfo )"
+		sys-apps/texinfo"
 RDEPEND="${DEPEND}"
 
 WRAP_OPTS='
@@ -46,41 +46,36 @@ src_configure() {
 }
 
 src_compile() {
-	if use sbcl ; then
-		LISP=sbcl ; NORC="--no-sysinit --no-userinit" ; EVAL=--eval
-	elif use clisp ; then
-		LISP=clisp ; NORC=-norc ; EVAL=-x
-	else
-		LISP=sbcl ; NORC="--no-sysinit --no-userinit" ; EVAL=--eval
-	fi
-
 	addwrite /var/cache/cl-launch
 	LISP_FASL_CACHE=/var/cache/cl-launch \
-		cl-launch.sh --lisp ${LISP} --wrap "${WRAP_OPTS}" \
+		cl-launch.sh \
+		--lisp $(glo_best_flag sbcl clisp) \
+		--wrap "${WRAP_OPTS}" \
 		--path "${CLSYSTEMROOT}" --path-current \
 		--system stumpwm --dump stumpwm.bin \
 		|| die "Cannot create stumpwm binary"
-	cat >> stumpwm <<EOF
-#!/bin/sh
-
-exec stumpwm.bin ${NORC} ${EVAL} '(stumpwm:stumpwm ":0")'
-EOF
 	if use emacs ; then
 		elisp-compile contrib/*.el || die "Cannot compile contrib Elisp files"
 	fi
-	if use doc ; then
-		makeinfo stumpwm.texi || die "Cannot build info focs"
-	fi
+	makeinfo stumpwm.texi || die "Cannot build info focs"
 }
 
 src_install() {
-	dobin stumpwm{,.bin} contrib/stumpish
-	common-lisp-install *.{lisp,asd} contrib/*.lisp
-	common-lisp-symlink-asdf
+	dobin stumpwm.bin contrib/stumpish
+	common-lisp-export-impl-args $(glo_best_flag sbcl clisp)
+	make_wrapper stumpwm "/usr/bin/stumpwm.bin ${CL_NORC} ${CL_EVAL} '(stumpwm:stumpwm \":0\")'"
+	make_session_desktop StumpWM /usr/bin/stumpwm
+
+	if use source; then
+		common-lisp-install *.{lisp,asd} contrib/*.lisp
+		common-lisp-symlink-asdf
+	fi
+
 	if use emacs; then
 		elisp-install / contrib/*.el{,c} || die "Cannot install contrib Elisp files"
 	fi
+
 	cp "${FILESDIR}"/README.Gentoo . && sed -i "s:@VERSION@:${PV}:" README.Gentoo
 	dodoc README NEWS ChangeLog README.Gentoo
-	use doc && doinfo stumpwm.info
+	doinfo stumpwm.info
 }
diff --git a/x11-wm/stumpwm/stumpwm-0.9.5.ebuild b/x11-wm/stumpwm/stumpwm-0.9.5.ebuild
deleted file mode 100644
index 139d3d98..00000000
--- a/x11-wm/stumpwm/stumpwm-0.9.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit common-lisp-2 eutils elisp
-
-DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp."
-HOMEPAGE="http://www.nongnu.org/stumpwm/"
-SRC_URI="http://download.savannah.nongnu.org/releases/stumpwm/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="sbcl clisp emacs doc"
-
-DEPEND="dev-lisp/cl-ppcre
-		sbcl? ( dev-lisp/clx )
-		doc? ( sys-apps/texinfo )"
-RDEPEND="${DEPEND}
-	emacs? ( app-emacs/slime )
-	!sbcl? ( !clisp? ( dev-lisp/openmcl ) )
-	!sbcl? ( clisp? ( >=dev-lisp/clisp-2.38-r2[X,-new-clx] ) )
-	sbcl?  ( dev-lisp/sbcl )"
-
-src_configure() {
-	sed "s,@PACKAGE_VERSION@,${PV},g" version.lisp.in > version.lisp
-	mv stumpwm.texi.in stumpwm.texi
-}
-
-src_compile() {
-	if use doc ; then
-		makeinfo stumpwm.texi || die "Cannot build info focs"
-	fi
-	if use emacs ; then
-		elisp-compile contrib/*.el || die "Cannot compile contrib Elisp files"
-	fi
-}
-
-src_install() {
-	common-lisp-install *.{lisp,asd} contrib/*.lisp
-	common-lisp-symlink-asdf
-	if use emacs; then
-		elisp-install / contrib/*.el{,c} || die "Cannot install contrib Elisp files"
-	fi
-	cp "${FILESDIR}"/README.Gentoo . && sed -i "s:@VERSION@:${PV}:" README.Gentoo
-	dodoc README NEWS ChangeLog README.Gentoo contrib/stumpish
-	use doc && doinfo stumpwm.info
-}
-
-pkg_postinst() {
-	while read line; do elog ${line}; done < "${ROOT}"/usr/share/doc/${P}/README.Gentoo
-}