summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorChema Alonso Josa <nimiux@gentoo.org>2017-02-02 23:23:48 +0100
committerChema Alonso Josa <nimiux@gentoo.org>2018-03-09 22:34:01 +0100
commit108ebec24710637358a10dd2bdfadb9aeba063e0 (patch)
tree27a8c7153a9960400379c536a6555dd5dfac40c0 /x11-wm
parentdev-lisp/stumpwm-contrib: Adds new package (diff)
downloadlisp-108ebec24710637358a10dd2bdfadb9aeba063e0.tar.gz
lisp-108ebec24710637358a10dd2bdfadb9aeba063e0.tar.bz2
lisp-108ebec24710637358a10dd2bdfadb9aeba063e0.zip
dev-lisp/stumpwm: Adds dependency on stumpwm-contrib
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/stumpwm/Manifest2
-rw-r--r--x11-wm/stumpwm/stumpwm-1.0.0.ebuild23
2 files changed, 5 insertions, 20 deletions
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index 61b23752..dbb1a9d2 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -3,6 +3,6 @@ AUX README.Gentoo 1541 SHA256 b723b244063d9a1392a23b81fd175c29b9441760509c153810
DIST stumpwm-0.9.9.tar.gz 189516 SHA256 7dfcb31f3c248a454b892ae98a186f43681f6e8e62b7c77d7858b34f645c0abb SHA512 b114f0dc9091e6704acd4f6d16183b15d956b0f27abec800bca8cfdf966636e7e96c036678fe9c2ca9266d794eabb48c4d66dd62c52c1d26e42ab54abb7ff05b WHIRLPOOL 599bed139c5b058c61b89f01750179f9d9dd5db5fa65737e06f65990c96547042331845aa7d8ce137b0a9357c6e063b6663f7c8c66dab3e74553abedd56b6736
DIST stumpwm-1.0.0.tar.gz 200794 SHA256 31fcb6fb34af20bf4857bb4621ab4b2c9bd6bec92bfd9ddaf88a18f850ba5dd5 SHA512 eb5bf48a5d185d982e8a9ec7639958f14fd912e0f4c89da205f0bcb0c10a61c3953bce5029c2a301fdcd29fe05c505601d4db30fc50b34b7082ce69bd25b43ac WHIRLPOOL 7049299b1c5db42f7379f3f741de8d87e3322deac6787494fb09c553130e0c2c79de93fdcb33beabb80f44f5b29a03f25bc61bfdcb3755043b4937627a3658fc
EBUILD stumpwm-0.9.9.ebuild 2741 SHA256 e9aa6f842c30bdfbffa99fe8c24e3fd0673225b4725ccbb3a74adc005e107352 SHA512 b8037a7023f4dcdab70acb8f443a318d3b43707cb8f1b82bcfa2b6bf9751660e5f5ce54136712fa48376fe4dba7cc50292364b53e4be09bd8fc9c52cc5b6cd81 WHIRLPOOL 2a14d8f2bb40c5c4f5f8440bfb1ab4df548cec50f87611ecd4c261afe4154647e20082be622fcfa1e06882a5c3b73ecc9bc069fe2992a069206c2b310a85e08f
-EBUILD stumpwm-1.0.0.ebuild 2783 SHA256 ac00ac159d179ed192a74fd9db2b2838ae0b130244423ea1098f854252813dce SHA512 954a60f39da203d59f1e0b15a2d4b9689deb08a5c92646eee4884fd155ecbdc22197edab5e7e1eb570db964c93490f2479518c26340e4ac93c32f00d6d332fdc WHIRLPOOL 5a213b59ca562dc7509c2c0e349beb2e6c337bc6174eb0cb926efb4e71c213b15f3245bcfc95c4f1061b3ff56230a5fefe20d17748d88f69234d946b92808df0
+EBUILD stumpwm-1.0.0.ebuild 2271 SHA256 1029bad21df4c7423f746bb2184517806ec1af5638c29ab2c705a6b53931cfca SHA512 5879d1cfbe49a92941156c97cd01e99fe296110bfd6d67a2b97036890c038c1a84b29499065445a709460fc2074533c276385a35b2569d702e9554f29613e3d6 WHIRLPOOL 61c7698f248fad8b191147810c5a0454ae37e6cd9d209ffc245cb27ee26a363cd4cd5286378a70dfec8271da6734a61645823fb77588abe1fefc2bed9b248cc7
EBUILD stumpwm-9999.ebuild 1669 SHA256 4f3e0be27ce34f0a81c9ec50ece9bb85baae99fbe35494f60706555cb24952a5 SHA512 ca3ebe56572aa4a04351afe8f3177eb3b3eebba5340ce6ad8e72de8b9da5deb0df99f61b9635b7adb85e6b93314315b248a320000707088cc6fbb3e7d4ef6b04 WHIRLPOOL 8482914c8509798818403b982b76385b6d559997f8d3a9a5d6ac377add1831dd876aa63fd7063175e6c79c4fef0aac222f8c07954083149ac420df5304401a44
MISC metadata.xml 2485 SHA256 74a45f8a3889736fde972c0533d0cf332fe9fe9d73ce06ebb3c35cf8a77ebf60 SHA512 b0f010aba150db6be52c4f6d8dce27549d620bc6650af1953a061c1dd498f343eb28a43bdfccc773ecf1b97423efc8674fa8e7e4b47817ce0f55864de88c37ed WHIRLPOOL a00b85762bddd62795438b5d65394d2434d935451c85faf4c92ce95188eaeb22613f1f7e7696e2bd157e2e9836d496bbbd00218d80c0f7264803e1101d8c77e1
diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
index b3c7548e..c01e80b9 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() {