Don't try the compile-time *quantization-optimization* test when CLISP is being used; Resolves Bug #104857.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 55 insertions, 9 deletions

diff --git a/dev-lisp/cl-jpeg/ChangeLog b/dev-lisp/cl-jpeg/ChangeLog
index 1a387108c9e1..13a3fe927c50 100644
--- a/dev-lisp/cl-jpeg/ChangeLog
+++ b/dev-lisp/cl-jpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-jpeg
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-jpeg/ChangeLog,v 1.10 2005/05/24 18:48:33 mkennedy Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-jpeg/ChangeLog,v 1.11 2006/04/24 21:40:59 mkennedy Exp $
+
+  24 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.033-quantize-optimization-clisp-gentoo.patch,
+  cl-jpeg-1.033-r1.ebuild:
+  Don't try the compile-time *quantization-optimization* test when CLISP is
+  being used; Resolves Bug #104857.
 
   24 May 2005; <mkennedy@gentoo.org> cl-jpeg-1.033-r1.ebuild:
   Keywording ~sparc
diff --git a/dev-lisp/cl-jpeg/Manifest b/dev-lisp/cl-jpeg/Manifest
index c2b931030bcc..842f22f2b080 100644
--- a/dev-lisp/cl-jpeg/Manifest
+++ b/dev-lisp/cl-jpeg/Manifest
@@ -1,6 +1,31 @@
-MD5 c5124712019583845ee786b24ef0afcf ChangeLog 1518
-MD5 30ea96b6326d49a7d5cc52aa4844dbc7 cl-jpeg-1.033-r1.ebuild 873
-MD5 e900640cfb73238c426e47e7dcbab707 metadata.xml 313
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 195e5c0f7fc4e16a271f2bd56417e8dd ChangeLog 1768
+RMD160 d840244f4bba1e61083e44938086b2b4854dd7dc ChangeLog 1768
+SHA256 f390c74f4331042e49ba9fbe27c9e275c567662bf431af8694d434bf88f7d730 ChangeLog 1768
+MD5 1ac174ba10ba72ef569da557a34738c6 cl-jpeg-1.033-r1.ebuild 987
+RMD160 403f90f1898af5e7df21f9725c0670c1d67acb77 cl-jpeg-1.033-r1.ebuild 987
+SHA256 889e845f23e1c597a79781dda4a83ddb85c5237ca9aa4b7cda1656bcdd359438 cl-jpeg-1.033-r1.ebuild 987
 MD5 196f99ce048bd8172af4ba6a35d7eb53 files/1.033-defconstant-gentoo.patch 3012
+RMD160 cb123508112dcda30896e164808d2bce6064a954 files/1.033-defconstant-gentoo.patch 3012
+SHA256 2cf4e2fc251e43b552c7070b63bf687de3369a950e9c9ee1c82a1c33e527985b files/1.033-defconstant-gentoo.patch 3012
 MD5 b68bef7cf15179acf0c208f3a6194145 files/1.033-exports-gentoo.patch 916
+RMD160 068d0fe9b06e1388dbb36451751ba30b9432af59 files/1.033-exports-gentoo.patch 916
+SHA256 047a4d9a951eea2ccfd05200d59f50cf376436f5c03f3a2512c2dca76ce483ce files/1.033-exports-gentoo.patch 916
+MD5 8e230a8d83295f6704dd05016cb44a1a files/1.033-quantize-optimization-clisp-gentoo.patch 499
+RMD160 cd2c6269e2eea2b9c92f294bf5373375ba63f067 files/1.033-quantize-optimization-clisp-gentoo.patch 499
+SHA256 e47b5a6bd59bdbb167fde43f53afda059cced53857fa430fab1c54a098ef989f files/1.033-quantize-optimization-clisp-gentoo.patch 499
 MD5 60288ebdfb919c971ebd8c9de6584985 files/digest-cl-jpeg-1.033-r1 61
+RMD160 f42abb7afb03e837f97bc0ebe1abdc8b24a39ca7 files/digest-cl-jpeg-1.033-r1 61
+SHA256 9685c8c69fbb0aa0a0962e6021eb39255be689f9fc4d617322de5d902f4b0919 files/digest-cl-jpeg-1.033-r1 61
+MD5 e900640cfb73238c426e47e7dcbab707 metadata.xml 313
+RMD160 7aef34885fe0ed0414ae7a56fbecf1547938a9bf metadata.xml 313
+SHA256 557a1acdf695fe1c9d3ed0d0541ab4a9879fb80e8f9d95c3ce4adb2d879f3e7f metadata.xml 313
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFETUX3yiNZaEAZA+ARAtojAJsHKvt+SmyDgaSEwRuwZgCXjIMrxACffVHW
+LsHVeHm0yxxetvadst11/hM=
+=U2Ac
+-----END PGP SIGNATURE-----
diff --git a/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild b/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild
index 7f5d468e26ff..fa1306d92bc5 100644
--- a/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild
+++ b/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild,v 1.8 2005/05/24 18:48:33 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild,v 1.9 2006/04/24 21:40:59 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -21,8 +21,10 @@ src_unpack() {
 	unpack ${A}
 	# patch: defconstant - compilation fix for SBCL
 	# patch: exports - export symbols at load time as well
-	epatch ${FILESDIR}/${PV}-defconstant-gentoo.patch || die
-	epatch ${FILESDIR}/${PV}-exports-gentoo.patch || die
+	# patch: quantize-optimization-clisp - dont bother on CLISP
+	epatch ${FILESDIR}/${PV}-defconstant-gentoo.patch
+	epatch ${FILESDIR}/${PV}-exports-gentoo.patch
+	epatch ${FILESDIR}/${PV}-quantize-optimization-clisp-gentoo.patch
 }
 
 src_install() {
diff --git a/dev-lisp/cl-jpeg/files/1.033-quantize-optimization-clisp-gentoo.patch b/dev-lisp/cl-jpeg/files/1.033-quantize-optimization-clisp-gentoo.patch
new file mode 100644
index 000000000000..0f0edb41da5b
--- /dev/null
+++ b/dev-lisp/cl-jpeg/files/1.033-quantize-optimization-clisp-gentoo.patch
@@ -0,0 +1,13 @@
+diff -ur cljl.orig/jpeg.lisp cljl/jpeg.lisp
+--- cljl.orig/jpeg.lisp	2003-10-06 12:49:30.000000000 -0500
++++ cljl/jpeg.lisp	2006-04-24 16:37:38.000000000 -0500
+@@ -256,7 +256,8 @@
+ (finish-output)
+ 
+ (defvar *quantize-optimization*
+-  (<= (let ((time1 (get-internal-run-time)))
++  #+clisp t
++  #-clisp (<= (let ((time1 (get-internal-run-time)))
+         (loop for i fixnum from 1 to 3000 do
+               (loop for row across *q-luminance* do
+                     (loop for q-coef fixnum across row