public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "José María Alonso" <nimiux@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/lisp:master commit in: x11-wm/stumpwm/
Date: Thu,  2 Feb 2017 22:23:54 +0000 (UTC)	[thread overview]
Message-ID: <1486074228.1dbb79f225cc68b8837d82e37f05778043c374ef.nimiux@gentoo> (raw)

commit:     1dbb79f225cc68b8837d82e37f05778043c374ef
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 22:23:48 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 22:23:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=1dbb79f2

dev-lisp/stumpwm: Adds dependency on stumpwm-contrib

 x11-wm/stumpwm/stumpwm-1.0.0.ebuild | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
index b3c7548..c01e80b 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/"
@@ -23,14 +23,14 @@ RDEPEND="dev-lisp/cl-ppcre
 		!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 )"
+		emacs? ( virtual/emacs app-emacs/slime )
+		contrib? ( x11-wm/stumpwm-contrib )"
 DEPEND="${RDEPEND}
 		sys-apps/texinfo
 		doc? ( virtual/texi2dvi )"
 
 SITEFILE=70${PN}-gentoo.el
 CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
-CONTRIBDIR="${CLPKGDIR}/contrib"
 
 get_lisp() {
 	local lisp
@@ -50,32 +50,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 +79,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() {


             reply	other threads:[~2017-02-02 22:23 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-02 22:23 José María Alonso [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-03-25 19:24 [gentoo-commits] proj/lisp:master commit in: x11-wm/stumpwm/ Ulrich Müller
2018-05-31 16:44 José María Alonso
2018-03-09 21:36 José María Alonso
2018-03-09 21:36 José María Alonso
2018-03-09 17:41 José María Alonso
2018-03-09 17:41 José María Alonso
2018-03-05 19:19 José María Alonso
2018-02-03 22:06 José María Alonso
2017-10-28 20:27 José María Alonso
2017-10-28 14:49 José María Alonso
2017-08-24 20:54 José María Alonso
2017-07-31 15:12 José María Alonso
2017-07-17  8:36 José María Alonso
2017-07-13 16:03 José María Alonso
2017-07-13 15:26 José María Alonso
2017-04-27  9:08 José María Alonso
2017-02-03  8:21 José María Alonso
2017-02-02 22:25 José María Alonso
2017-02-02 10:12 José María Alonso
2017-01-22 16:17 José María Alonso
2017-01-15 16:45 José María Alonso
2016-03-17 11:04 José María Alonso
2016-03-02 14:04 José María Alonso
2016-03-02 13:55 José María Alonso
2016-03-02 13:53 José María Alonso
2014-11-25 20:46 José María Alonso
2014-11-11 23:16 José María Alonso
2014-07-23 19:38 José María Alonso
2014-11-11 23:16 ` José María Alonso
2014-07-21 12:18 José María Alonso
2014-07-21 10:29 José María Alonso
2014-07-21 10:27 José María Alonso
2014-04-28 13:59 José María Alonso
2014-04-28 12:36 José María Alonso
2014-04-28 11:14 José María Alonso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1486074228.1dbb79f225cc68b8837d82e37f05778043c374ef.nimiux@gentoo \
    --to=nimiux@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox