From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE3B6139085 for ; Fri, 3 Feb 2017 08:55:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B14D8E0E44; Fri, 3 Feb 2017 08:55:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C524E0E44 for ; Fri, 3 Feb 2017 08:55:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 976E7340C97 for ; Fri, 3 Feb 2017 08:55:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 562973CB7 for ; Fri, 3 Feb 2017 08:55:39 +0000 (UTC) From: "José María Alonso" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "José María Alonso" Message-ID: <1486112134.373533fa45de74077e47fd8ab9b0be32b389cfae.nimiux@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/stumpwm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/stumpwm/stumpwm-1.0.0.ebuild X-VCS-Directories: x11-wm/stumpwm/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: 373533fa45de74077e47fd8ab9b0be32b389cfae X-VCS-Branch: master Date: Fri, 3 Feb 2017 08:55:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8267aa88-77aa-413c-babf-3b67181460ec X-Archives-Hash: d1bacdbc628a7b949ce6f980264ea7fa commit: 373533fa45de74077e47fd8ab9b0be32b389cfae Author: Chema Alonso Josa gentoo org> AuthorDate: Fri Feb 3 08:55:11 2017 +0000 Commit: José María Alonso gentoo org> CommitDate: Fri Feb 3 08:55:34 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=373533fa x11-wm/stumpwm: Adds dependency on x11-wm/stumpwm-contrib Package-Manager: portage-2.3.3 x11-wm/stumpwm/stumpwm-1.0.0.ebuild | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild index b3c7548..5ffbe14 100644 --- a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild +++ b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit common-lisp-3 eutils elisp-common autotools xdg-utils +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/" @@ -28,9 +28,10 @@ DEPEND="${RDEPEND} sys-apps/texinfo doc? ( virtual/texi2dvi )" +PDEPEND="contrib? ( x11-wm/stumpwm-contrib )" + SITEFILE=70${PN}-gentoo.el CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" -CONTRIBDIR="${CLPKGDIR}/contrib" get_lisp() { local lisp @@ -50,32 +51,18 @@ do_doc() { docinto examples ; dodoc sample-stumpwmrc.lisp } -do_contrib() { - emake install-modules - rm -r "${D}${CONTRIBDIR}"/.git* || die -} - src_prepare() { default # Upstream didn't change the version before packaging sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die # Bug 534592. Does not build with asdf:oos, using require to load the package sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die - if use contrib ; then - # Fix contrib directory - sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die - sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die - sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die - fi eautoreconf } src_configure() { - local moduleconfig - xdg_environment_reset - use contrib && moduleconfig="--with-module-dir=${CONTRIBDIR}/contrib" - econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}" + econf --with-lisp=$(get_lisp sbcl clisp ecl) } src_compile() { @@ -93,7 +80,6 @@ src_install() { sed -i -e "/(:directory/c\ (:directory \"${CLPKGDIR}\")" \ "${D}${CLPKGDIR}/load-stumpwm.lisp" || die use doc && do_doc - use contrib && do_contrib } pkg_postinst() {