Fix bug 534592. Use require instead of asdf:load-op

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF253DB15

3 files changed, 39 insertions, 10 deletions

diff --git a/x11-wm/stumpwm/ChangeLog b/x11-wm/stumpwm/ChangeLog
index 9732f1ca352a..2cc2a3fca59c 100644
--- a/x11-wm/stumpwm/ChangeLog
+++ b/x11-wm/stumpwm/ChangeLog
@@ -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 <nimiux@gentoo.org> stumpwm-0.9.9.ebuild:
+  Fix bug 534592. Use require instead of asdf:load-op
 
   24 Dec 2014; Ulrich Müller <ulm@gentoo.org> stumpwm-0.9.9.ebuild:
   Fix typo in variable name.
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index cccec76819a2..8f4189e7f64d 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 70stumpwm-gentoo.el 84 SHA256 45683a3c00460e54243ac2489cc78ff394f2d5818ec7b2fe72ca5ffc33b2e1a2 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1 WHIRLPOOL 8b494c5df00f07f753580bbcb009920de4eabb7d561719b8b3fd4c9cf2d41f9e31c863a241113b361c24e332fe774c38c3bdb65d0d0b8b6f25bd9fe7046e2698
 AUX README.Gentoo 1894 SHA256 a708ee3f7fba6862ae2685daa4707c5a58f500c07862da0dafb92c17bf78b82c SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09 WHIRLPOOL a4adb14ed13157619a1efcd7a2974c19dac6270f373994311eba2bf2e5b83f38ede7dafa9289d09b2953948670687cdfdd97a7fbd25be67ee88edff14301b49d
 DIST stumpwm-0.9.7.tgz 497663 SHA256 a0793d22ef90731d34f84e51deafb4bc2095a357c70b9505dc57516f481cdf78 SHA512 5c2ba6794bcb43f5988f1cd1a79daba28ea3b2ccbe5a13da64c904e99be439013653532540ccd06c0f0334239794cd53312f3873cc6a08f9e621f789be6bb260 WHIRLPOOL b52b7970c6efdc73c91f3dab6ab263f7fd4053e450e55c1e590274ae9a0a85d31a7dd0e3eb03e981d754c52a3e4064623d7fdb61f772e482925eb0e7dbf9ba30
 DIST stumpwm-0.9.9.tar.gz 189516 SHA256 7dfcb31f3c248a454b892ae98a186f43681f6e8e62b7c77d7858b34f645c0abb SHA512 b114f0dc9091e6704acd4f6d16183b15d956b0f27abec800bca8cfdf966636e7e96c036678fe9c2ca9266d794eabb48c4d66dd62c52c1d26e42ab54abb7ff05b WHIRLPOOL 599bed139c5b058c61b89f01750179f9d9dd5db5fa65737e06f65990c96547042331845aa7d8ce137b0a9357c6e063b6663f7c8c66dab3e74553abedd56b6736
 EBUILD stumpwm-0.9.7.ebuild 1346 SHA256 37d366e714c219695c9df038051128912e0e54d8ec74150b7733491050e1c888 SHA512 df509e48a9ed2826afa576aa71f7b8e953b8842378c7d651090fb49b99171fd08946529dc6258b63cf06214e37718739329cdd547bbe747c6a5d8887c799cd4c WHIRLPOOL fdd8ad7ba467b577c0d8a7101b6cfc972b73c3514354345257fdb71abd004c6e8a60ddf4654390977b0ae1191b51b9e5d2265ce11a17dae7d92f8b20e5f31134
-EBUILD stumpwm-0.9.9.ebuild 2000 SHA256 dee1c6c8df65853c677e50b2b02261564f51b13d2409627bf1aed1ef8c5aa4f7 SHA512 6b26faf766746cb1af4ae78e05589708cb34baa42fdb0ffd68335e0e02e155688bbc400c484a99a0fbc7f8ea94c315c989811ca6a13114b1b6d01698f152f0e2 WHIRLPOOL 52c5c1543627a82282b13f2feaa50fa4b50bf0749c2a0b4b84709b067fdb1da34e519f6f213a581986abcf56e0aff5e3804fdabf17b00858059a9574b96685c1
+EBUILD stumpwm-0.9.9.ebuild 2174 SHA256 beb1449c4e8d20ad573584cf29a723322cd794cb5944800ed83c456fb5b89d00 SHA512 7899127d514383efae4c6edb19f998e27c008247a45cef2e624d1d7b8f72d682a05b2578770089f6df9db97e044ff0b2fe6a59ab91ac058633c3ef3626122c5c WHIRLPOOL fef783c15e5ed5eb44fe231edc0c9d56206b80d382a6e6caef7d04871942d7fc529454a21bc45f59b4f1949f688717a8ea0f061f5365e93f97d98eaea797d097
 EBUILD stumpwm-9999.ebuild 1148 SHA256 200d29712c24f8e3dfd20ebba59a2438c540d75ee101982e0a3727af1a1cb704 SHA512 4066f7c1f26ebddb6ff6548355a6b6717d2672113af1f5010bd7d2bac456b2c11e3ec33d8fe0266250418f742e8f9b17d2275572e12ca0fccb41f6c29e88f3fc WHIRLPOOL 43607325cf2158cf4450f27638b0d8f94f12de6097c6ff42196c05f2e9d4a1f98d687c832ece4c19d5411bb2ae66770e144e668c37e859fae66781b9ab7ad5cb
-MISC ChangeLog 1660 SHA256 c6adbf0b7f2a744357c0a04c81a31877ef3d2871306aeb9c2c65c9b672887958 SHA512 5e8bceeb429bd3ee064900f7de1ea9d64b46f921077504a9dafb041000b26dfe42d16411fb310ed6cf0d87332501159da05f0f738146e72e27cfedaa15ad0ce1 WHIRLPOOL 96cedf91572bf86c9219a94a95517272f2e2e986274f4a78be03693082ffb0c36c3c822b641b792ed61b231e33145f89b48a60a656be3778d6693b8c2e312d41
+MISC ChangeLog 1788 SHA256 4a4c0bac6ad28c6cf9605164d342c03248e64a335626a3ecc6b5c832bf6baca3 SHA512 8461d9d461d85542ac0513c24f43b80f2dbdeffa0cb455c5dd9879fee347b51677bd86a2c31f5954a2984b4bee79290e52421bc63ecb31cdcbd8c6defabd9ba5 WHIRLPOOL bfa0d0ca066dd813feaf6b3cee92d703eb5defcea9fc65aff082ead60071ee54ddb820795ea6caf1e240f35cac19d0b126cfe78b4e3fccce534561686e322402
 MISC metadata.xml 1172 SHA256 8da4955f02daa056c1839da729075b5ab2e29a7ff42f775a39b39cad622ac457 SHA512 e22c32f6558182b19be7962e197e08a89a521a1afa45c6415ea043ee1b0538ee8b426e99ebbfdea2efc6224be37b23a5e5af3c14c1b88e7dd8594eef0f3365d1 WHIRLPOOL 7c290685d577c47d0e788a98075b1d12998ba2d221cae19e7296f6e2c555ecac986302ca2af5b19ed00e239abe2a0312c47a257e99d5a2ddfc85909b1e23a559
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUq+NLAAoJEH/rgyzyU9sVeAMP/0dXNXlkXLp12DVpes6r6G4I
+63CQvsfd7Bf6Em+/bKg1BhQoZ6hEF+VyWtaFy7q59Ef98ZHqJzhXp+ZPXThhhJWX
+1xfnhSwVbhyp6Mh53U5OT89TNMZF6lMFdQEIra8KVebJ/azSlbDuzm/AnuBdk8I5
+5JiIBVD+DO3rcuTRaRhRDhreyaM8fdaq2YiN0tsem3YKBr1MNAcqGbolmSWUpUEZ
+V/0E9FfvoT2h46I5em/y8Gdc6Nvyv3lGnXT0ELKdIowLBz4jE+HT2eSzE1xzzoOL
+Guu2EL2sLGkp8tx/4qfmgeVGLTGXe6D8JgdOOKCekuS8nhIwmS6z6c/D81shrFLT
+cNkksLccwZCI+4QoMKjPIH7uozt6gnuvqcusp/mtnURJg5JbZH9B8fPOUHn1Y7My
+KyZOiFsXbBK7pOSnF1bmldeW/bbpo/cYCNRvBitdD5bLunMYyR6iWcHvEQhLYPQ7
+689ZBq/EGIFKKCyql6ovSxgK178RLawpL+EoqW2Qxgg8QDLzBST4k0zFs27F8jeH
+avKM5YSegioVThm1pBA/QTjl6acm8v1PHa/W0K8SHIaWPsPzdOoi77qYWAZ7evxy
+eEd42BKtGzyGqq+or1M2JhgCDgsqQuQl7ygecOsi47MIZ4FKPgmkx4x9LqxAeHKl
+R2aOoh3cttZpd5OiTwXL
+=gkR6
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
index a69f36357f91..9aa562667256 100644
--- a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
+++ b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
@@ -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 @@ SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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 @@ SITEFILE=70${PN}-gentoo.el
 
 get_lisp() {
 	local lisp
+
 	for lisp in "$@" ; do
 		use ${lisp} && echo ${lisp} && return
 	done
@@ -41,16 +42,21 @@ do_doc() {
 	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)
 }