Now installs contrib, closing #484832

Package-Manager: portage-2.2.7/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

4 files changed, 28 insertions, 105 deletions

diff --git a/dev-lisp/clozurecl/ChangeLog b/dev-lisp/clozurecl/ChangeLog
index 2ec0c133a9d2..80d21996b242 100644
--- a/dev-lisp/clozurecl/ChangeLog
+++ b/dev-lisp/clozurecl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/clozurecl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clozurecl/ChangeLog,v 1.11 2013/04/20 14:37:10 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clozurecl/ChangeLog,v 1.12 2013/10/14 10:48:32 grozin Exp $
+
+*clozurecl-1.9_p1-r1 (14 Oct 2013)
+
+  14 Oct 2013; Andrey Grozin <grozin@gentoo.org> -clozurecl-1.9.ebuild,
+  -clozurecl-1.9_p1.ebuild, +clozurecl-1.9_p1-r1.ebuild:
+  Now installs contrib, closing #484832
 
 *clozurecl-1.9_p1 (20 Apr 2013)
 
diff --git a/dev-lisp/clozurecl/Manifest b/dev-lisp/clozurecl/Manifest
index f4a5877e63ad..18613b082bc8 100644
--- a/dev-lisp/clozurecl/Manifest
+++ b/dev-lisp/clozurecl/Manifest
@@ -2,29 +2,27 @@
 Hash: SHA256
 
 DIST ccl-1.8-linuxx86.tar.gz 43187545 SHA256 01dcafa9efef7b8fd09d17a213447dc2f47ff882c660dd62374a33119132efb5 SHA512 3e2a114a45e9e29b5db1b8827e239ffd5e10de17cdea98b95c61b973727842e8d95bcf31090e86454794233bcc87d53f7880d8f56ab3988176e8cd0ec8e639a1 WHIRLPOOL d7691cd7850ddd853dbe941f8787143bc0bbd3f51cb6dfbad2b24253c76a857381b416c5a05933e91555b5893310b2d9accc23dc61aaabe9840f2ad699318b50
-DIST ccl-1.9-linuxx86.tar.gz 43708212 SHA256 e9d1bd2e7260bdd13e63be1ead95b3cae9c8b0d18b1a1633a135724ada3e60e9 SHA512 88da805b084954055e76797b9980fd03b88879f7b52992662223030845f3b50cd2ef323fa8c90d32c630cb07e175302589e0167c30b9cbf50d20db0acd18fff3 WHIRLPOOL d33faf0b92bec5f2d11610878d098c33067b6a0d706ce920c3c94c9ce7e06f9483f28c779e226a52c4f4b06cb4c17e01d868940b4a999754f8ae13b640e7e93d
 DIST ccl-1.9_p1-linuxx86.tar.bz2 36344874 SHA256 ba3ef9718646cb56785bda634093876442287bb445a9b5b95e6478104d63d988 SHA512 b09a1f4f2e0a59bd95df09e431e95f619bc80459f5a1a799fc47fae575ccd3e0c266df98a0d7fc2b4878381e02e50e68dd3406a51c569bb056dd0e1fb973a989 WHIRLPOOL 9730171d8e4acdd1f54b81f4cc5984414c485672200c66e5f98cf7fe202a7c6f5b2835c2c75c06254960fdc7b0477854fabdd57d8b011abe8629bcd390e0f134
 EBUILD clozurecl-1.8.ebuild 2406 SHA256 a60c6587f4590c855375346dd3c4e27d801bb8b5f067310ae3961edd33ce6e6c SHA512 d462749106d5b33831733ee6ee2f8f2048f9240815dcbe5f35515d52c35fbe23f91b9d101f0159339fe650295e7e29a2e2704028c5e2b0dbeedaefbff7cf0bd8 WHIRLPOOL b6829a19aa165e8fa57e71570227cc03ec065dc3164601c1fbd0a78d30005878383f4bb1d9dee54309b34e13e73c08aeb23d4ef8c81ad079139c6255fbb0f34c
-EBUILD clozurecl-1.9.ebuild 2405 SHA256 c843d4817d740f89352944f68d26b7908a248a7286c06fa9386b5c9e12adfd66 SHA512 ba422fba7c009503ddd31a9ffe6df6862fd5c1e59a07ae9035c830919fbc61549f134fa77a6232bd311dccd64c9d365f4262153cf2af3ad697075d6a1cd4a6a8 WHIRLPOOL a2aaa3c747b28580d04fddefadce7865e980df0605ac09193d5c1058c49f54e58f0b6b4460d5f3542c0453d9ea133819cb1b954750d71ee0d54ea48879e93f19
-EBUILD clozurecl-1.9_p1.ebuild 2784 SHA256 8090db0eb0d027ef7f41702b72b6585765ae23ae8d3869a6c3522cbd86f3195f SHA512 8eb63ede03d2f74f48fb6f682aeae58f76f3bb26771025f67eabfec654a95e31b25b5812c69446dfefa98dbe3b5176f4769dfa0c6d2f5eb5a2a3b28a77250a66 WHIRLPOOL 6682a766381b3891e9b9e98b937b42974ef03e22c88facc3f2d1fe91c8d02dec1f6780a8725bff688d96def549cee705ba66ee7c25de43b9f3cb94981cd508b7
-MISC ChangeLog 1787 SHA256 a56eaa08f234e06e94d20267add51ead7f81f87cee860220b44004356e80d421 SHA512 b19ffb5e91395621d07db5aa32bdea087fae85fdf257e9678c70931b0fdca25cb86eabc71d4b2144f043babccb51d9899b0b0ad8f038816c064cf02f2c764e3a WHIRLPOOL 5f74022f2b6c583c8b828cff6c2f9340c5dc4933075af70304f293c0c02ca0d98df3cda34181c74aef843427f8f4fdef9812639bdc45618de81ee9646b9f90d3
+EBUILD clozurecl-1.9_p1-r1.ebuild 2781 SHA256 01c322841cb075f4ca3a6b0973010a622a44b61bb8b767eba4d9fcc8e89a9f07 SHA512 83f7c6aeb05784840e087f0b46aa8464e8627333e9235d4f886b137fadb36f28643e55d86d8d9d6cee04f28290396405f9716fdf786947f477fafa17ad922bf6 WHIRLPOOL 1aa5f6b21833e447366e796a9170b4140ca53be2cd1aa0ce7b60a0fa0ef11c760b2c1e1f014f379dacbf1fc3b388b418f9d9ce49af728efe31b560ea7af09280
+MISC ChangeLog 1993 SHA256 2bf1db1edc6628603489f373f89bf837594942ab7ca70e2d45f0fb6022c4f9e9 SHA512 2208442a6f98ababed38cfe2ba21232b3baf30b755d13e6031b8557d71b853be870381aabc76e902b0b5ac18205376fec145aa211cc8fd35da9b6930186ed4b0 WHIRLPOOL 99e17929984b5a7697d3bf4e84c99ae2a2190964b2bbf8b13d58e27dd95eb5d850f65228992fa7c14f431ff0904620e7b04ef9e8f517f378113fbe0a112619ef
 MISC metadata.xml 273 SHA256 caf1d458d943a906650d49af8fb83557d23284967f26ba6cec96da260c68ec3d SHA512 b61c1ab1bd317b3521a6bdc0312e5c7bbdae2af621bff7ee0d5a06923470026d9b284799d5370c2c00d77e0458e867f6f67f49c1027ec14eb5c6360499c453da WHIRLPOOL 332b4dc8026928df59bf3bab8ee5adc7e8d618767c2ee8398951e3a477e4017c2c71eb7f852fd87d1270d616ebce78e9c25a7488ac9da9485e9598bf761a87eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRcqf7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSW8v9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MdBwP/16R9trc0e8W2I1GRtipGj94
-bclCsILweFTh2SC8MmIcP+/nDi3jia/lxbDN8/nZpqxVpKOBfgNAVe3TxrPcMi7S
-mwlJOGV5uMAxdtkuhV5X/NMyepV+jV7BdfOhBoGiHvr12S8UtmyBKPwl1Uw8Q59I
-cPBqN4anHQrsRdxPllKRDrejbo/9rv2U8V/wQxy075QTl657BNtLAgp9J3/Ud+Xz
-SFwgehrX/G98ZU0UYFbuKR/ou06KyeWcbM+hOD+VpG1IocUsn05BVnFa9QlFE+AV
-oGCmoi5CT1XqXDRsYhxW7qK7it5zaFATHrFcf3OfyOHsBRR6jbN9eqpwSlfSyAEj
-jnwS9t9NlamhvfD72C0Aa4XociwfVFZVEFCABlw11JB5WLI3PYjQFvkW43AcHTP0
-AJjbi3EtW/0HAGYH6URXKNN+wOQld6RFd66p7dBkvHCe+JtfWkCI/dw+X3mVopLj
-2ErZqob6ZvpTDPhIV3V3K5K1UBboizoq+Y05sFiZOSRuPgAZXlbGTFWpoLzWzuT8
-vHkAHxOZourf7w3Jrpo4soU/xOmE3at3+e4m8//hpFTsLoZWcn9kn/vle24e8Gle
-OZRLycPKGrYN7SEDHB2/CtmVwFcVNX/JEe+Qv1T6iRvx3QM7k69610vBe8bCKqae
-K+yvlOvECzvAWQ1LxT4Y
-=G3Xx
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MqoAP/39QYlORG599h7ZZJFv9d8nX
+VPH4mGNU/gx011vTwNI6YJ/VqtuT6NMkcmOgPhWiG2iegl9/EOzmP+xBeEVPa9T8
+1DqHPHSm24WYmfDZYO/pittcK+1uEBvEHdbkAwgy7vowVr2FqQcETlOE3EOuegho
+ORLXYMz4JkVpMcv7PHvpQyk8mwMw4+LUqkBcTyc4LKODNALE7xhNkBmJ1QnfIoOD
+TRb4rZXHTW02nT1NarAuhenP2UEVb1aTGBvosKuFlZf8fMzziOq6IPe6JXLPrK4+
+NVw/C+XzYtd0AKV2d6YBH4HUZK9yw5gghqS5WDIRBvdZYYwxUNbjKk1cExPlDlZS
+lKAK+eCih2OOegLoMh7ECEDx3EcBl456GlrvEqPCydjtnwoclJDEoBt0PlYa9jVP
+lSoVc/kcaGEK6LJH3hH0wPRqCwl97h2JX+p60EfW3Q8Kp+b90UsFhxIWX5zJ/5d6
+XD0hv6b1onfJmFsFpc6ZMwx7sqYTtMvIrR2PR9uJvFMjXWMHqFLU3FJKIkFkzd4/
+3iNy3V68NpiQ2ARKpNa0zA3omPAZ0VcHLGHDrLSzWXW4Lz+bNN2ogdd6UcZZha2/
+2YQDVSKKlghWz/PjbPW0iEpJzstL9cgQUMa401WG961Uza/1clBLYmMDSWXQNnV7
+NA8WsC2LP10rygn9ItyK
+=nJe/
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/clozurecl/clozurecl-1.9.ebuild b/dev-lisp/clozurecl/clozurecl-1.9.ebuild
deleted file mode 100644
index c697441478cc..000000000000
--- a/dev-lisp/clozurecl/clozurecl-1.9.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clozurecl/clozurecl-1.9.ebuild,v 1.2 2013/03/14 04:09:37 grozin Exp $
-
-EAPI=5
-inherit eutils multilib
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="ClozureCL is a Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="http://ccl.clozure.com/"
-SRC_URI="x86?   ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
-		 amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )"
-		 # ppc?   ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
-		 # ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="!dev-lisp/openmcl"
-
-S="${WORKDIR}"/${MY_PN}
-
-ENVD="${T}"/50ccl
-
-src_configure() {
-	if use x86; then
-		CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers
-	elif use amd64; then
-		CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64
-	elif use ppc; then
-		CCL_RUNTIME=ppccl; CCL_HEADERS=headers
-	elif use ppc64; then
-		CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64
-	fi
-}
-
-src_compile() {
-	unset CCL_DEFAULT_DIRECTORY
-	./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
-	# remove non-owner write permissions on the full-image
-	chmod go-w ${CCL_RUNTIME}{,.image}
-
-	# remove .svn directories
-	find "${S}" -type d -name .svn -exec rm -rf {} ';' &>/dev/null
-}
-
-src_install() {
-	local install_dir=/usr/$(get_libdir)/${PN}
-
-	exeinto ${install_dir}
-	# install executable
-	doexe ${CCL_RUNTIME}
-	# install core image
-	cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die
-	# install optional libraries
-	dodir ${install_dir}/tools
-	cp tools/*fsl "${D}"/${install_dir}/tools || die
-
-	# until we figure out which source files are necessary for runtime
-	# optional features and which aren't, we install all sources
-	find . -type f -name '*fsl' -delete
-	cp -a compiler level-0 level-1 lib library \
-		lisp-kernel scripts tools xdump \
-		"${D}"/${install_dir} || die
-	cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
-
-	make_wrapper ccl "${install_dir}/${CCL_RUNTIME}"
-
-	echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}"
-	doenvd "${ENVD}"
-
-	dodoc doc/release-notes.txt
-	dohtml doc/ccl-documentation.html
-	use doc && dohtml -r examples
-}
diff --git a/dev-lisp/clozurecl/clozurecl-1.9_p1.ebuild b/dev-lisp/clozurecl/clozurecl-1.9_p1-r1.ebuild
index 310ea6eb2c3e..d5b11f136e78 100644
--- a/dev-lisp/clozurecl/clozurecl-1.9_p1.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.9_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clozurecl/clozurecl-1.9_p1.ebuild,v 1.1 2013/04/20 14:37:10 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clozurecl/clozurecl-1.9_p1-r1.ebuild,v 1.1 2013/10/14 10:48:32 grozin Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
@@ -46,8 +46,8 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -C lisp-kernel/${CCL_KERNEL} clean || die
-	emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)" || die
+	emake -C lisp-kernel/${CCL_KERNEL} clean
+	emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
 
 	unset CCL_DEFAULT_DIRECTORY
 	./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
@@ -76,7 +76,7 @@ src_install() {
 	find . -type f -name '*fsl' -delete
 	rm -f lisp-kernel/${CCL_KERNEL}/*.o
 	cp -a compiler level-0 level-1 lib library \
-		lisp-kernel scripts tools xdump \
+		lisp-kernel scripts tools xdump contrib \
 		"${D}"/${install_dir} || die
 	cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die