nimiux 15/01/06 13:27:35 Modified: stumpwm-0.9.9.ebuild ChangeLog Log: Fix bug 534592. Use require instead of asdf:load-op (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key F253DB15)
Revision Changes Path 1.3 x11-wm/stumpwm/stumpwm-0.9.9.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/stumpwm/stumpwm-0.9.9.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/stumpwm/stumpwm-0.9.9.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/stumpwm/stumpwm-0.9.9.ebuild?r1=1.2&r2=1.3 Index: stumpwm-0.9.9.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-wm/stumpwm/stumpwm-0.9.9.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stumpwm-0.9.9.ebuild 24 Dec 2014 12:04:04 -0000 1.2 +++ stumpwm-0.9.9.ebuild 6 Jan 2015 13:27:35 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/stumpwm/stumpwm-0.9.9.ebuild,v 1.2 2014/12/24 12:04:04 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/stumpwm/stumpwm-0.9.9.ebuild,v 1.3 2015/01/06 13:27:35 nimiux Exp $ EAPI=5 @@ -12,17 +12,17 @@ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~x86" IUSE="doc clisp ecl +sbcl emacs" RESTRICT="strip mirror" RDEPEND="dev-lisp/cl-ppcre + sbcl? ( >=dev-lisp/sbcl-1.0.32 ) sbcl? ( >=dev-lisp/clx-0.7.4 ) !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] ) ) - sbcl? ( >=dev-lisp/sbcl-1.0.32 ) emacs? ( virtual/emacs app-emacs/slime )" DEPEND="${RDEPEND} sys-apps/texinfo @@ -32,6 +32,7 @@ get_lisp() { local lisp + for lisp in "$@" ; do use ${lisp} && echo ${lisp} && return done @@ -41,16 +42,21 @@ 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 + cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die dodoc AUTHORS NEWS README.md README.Gentoo - doinfo ${PN}.info + doinfo "${PN}.info" docinto examples ; dodoc sample-stumpwmrc.lisp } src_prepare() { # Upstream didn't change the version before packaging sed -i "${S}/${PN}.asd" -e 's/:version "0.9.8"/:version "0.9.9"/' || die + # Bug 534592. Does not build with asdf:oos, using require to load the package + sed -i "${S}/load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die eautoreconf +} + +src_configure() { econf --with-lisp=$(get_lisp sbcl clisp ecl) } 1.12 x11-wm/stumpwm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/stumpwm/ChangeLog?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/stumpwm/ChangeLog?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/stumpwm/ChangeLog?r1=1.11&r2=1.12 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-wm/stumpwm/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ChangeLog 24 Dec 2014 12:04:04 -0000 1.11 +++ ChangeLog 6 Jan 2015 13:27:35 -0000 1.12 @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/stumpwm -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/stumpwm/ChangeLog,v 1.11 2014/12/24 12:04:04 ulm Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/stumpwm/ChangeLog,v 1.12 2015/01/06 13:27:35 nimiux Exp $ + + 06 Jan 2015; Chema Alonso <nim...@gentoo.org> stumpwm-0.9.9.ebuild: + Fix bug 534592. Use require instead of asdf:load-op 24 Dec 2014; Ulrich Müller <u...@gentoo.org> stumpwm-0.9.9.ebuild: Fix typo in variable name.
