diff options
| author |   Chema Alonso Josa <nimiux@gentoo.org> | 2017-02-02 11:12:34 +0100 |
|---|---|---|
| committer | Chema Alonso Josa <nimiux@gentoo.org> | 2018-03-09 22:34:00 +0100 |
| commit | a881cc1d6c35694dd300846d4309cf0f2c89ad02 (patch) | |
| tree | 8c9c46b6776f85a1ab4bc291f2fb5b6314be0e69 /x11-wm | |
| parent | dev-lisp/stumpwm: Reset XDG environment. Fixes bug #606484 (diff) | |
| download | lisp-a881cc1d6c35694dd300846d4309cf0f2c89ad02.tar.gz lisp-a881cc1d6c35694dd300846d4309cf0f2c89ad02.tar.bz2 lisp-a881cc1d6c35694dd300846d4309cf0f2c89ad02.zip | |
x11-wm/stumpwm: Updates live ebuild
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/stumpwm/Manifest | 2 | ||||
| -rw-r--r-- | x11-wm/stumpwm/stumpwm-9999.ebuild | 46 |
2 files changed, 33 insertions, 15 deletions
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest index eca47ef8..61b23752 100644 --- a/x11-wm/stumpwm/Manifest +++ b/x11-wm/stumpwm/Manifest @@ -4,5 +4,5 @@ DIST stumpwm-0.9.9.tar.gz 189516 SHA256 7dfcb31f3c248a454b892ae98a186f43681f6e8e 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-9999.ebuild 1027 SHA256 543928de116a2f1ec2a7f1ce93e0564ad1125af9a82b7fe1c2fdd0ffd37b75f8 SHA512 3b96d2a275fb8ec7cc8f154f8b3ca66d1f16f1314f98fc05e800ec9f992bc6870703b7ab93c62ee0db82e90a3a98bb4577b285e5db3a84b3485886c6c1654d6f WHIRLPOOL 5e73132ffbdb4cd6503182aa560eb663bb7a6065a6efb204515e6da832d33319abffdc4741f905389e2504e82d0a16d116b5c13e46ae94e518549541e6d97661 +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-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild index 15c02e8a..c87ed2da 100644 --- a/x11-wm/stumpwm/stumpwm-9999.ebuild +++ b/x11-wm/stumpwm/stumpwm-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit autotools common-lisp-3 git-2 +inherit autotools common-lisp-3 git-r3 DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp." HOMEPAGE="https://stumpwm.github.io/" @@ -13,27 +13,44 @@ EGIT_REPO_URI="git://github.com/stumpwm/stumpwm" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc clisp emacs +sbcl" +IUSE="contrib doc emacs clisp ecl +sbcl" -DEPEND="dev-lisp/common-lisp-controller - virtual/commonlisp - dev-lisp/cl-ppcre - doc? ( virtual/texi2dvi )" - -RDEPEND="${DEPEND} - emacs? ( app-emacs/slime ) +RDEPEND="dev-lisp/cl-ppcre !clisp? ( !sbcl? ( !amd64? ( dev-lisp/cmucl ) ) ) clisp? ( >=dev-lisp/clisp-2.38-r2[X,-new-clx] ) - sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx )" + sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx ) + emacs? ( virtual/emacs app-emacs/slime )" + +DEPEND="${RDEPEND} + sys-apps/texinfo + doc? ( virtual/texi2dvi )" + +CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" +CONTRIBDIR="${CLPKGDIR}/contrib" do_doc() { local pdffile="${PN}.pdf" - dodoc AUTHORS NEWS README.md - texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die + texi2pdf -o "${pdffile}" "${PN}.texi" && dodoc "${pdffile}" || die + cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die + dodoc AUTHORS NEWS README.md README.Gentoo + doinfo "${PN}.info" + docinto examples ; dodoc sample-stumpwmrc.lisp +} + +do_contrib() { + emake install-modules + rm -r "${D}${CONTRIBDIR}"/.git* || die } src_prepare() { + default + 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 } @@ -46,4 +63,5 @@ src_install() { common-lisp-install-asdf dobin "${PN}" use doc && do_doc + use contrib && do_contrib } |