(Portage version: 2.0.51-r15)

8 files changed, 113 insertions, 76 deletions

diff --git a/dev-lisp/cl-jpeg/ChangeLog b/dev-lisp/cl-jpeg/ChangeLog
index c8d92f325ab6..10395ae51683 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-jpeg/ChangeLog,v 1.5 2004/06/24 23:45:24 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-jpeg/ChangeLog,v 1.6 2005/02/04 22:29:11 mkennedy Exp $
+
+  04 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org> metadata.xml,
+  +files/1.033-defconstant-gentoo.patch, -cl-jpeg-1.032.1.ebuild,
+  cl-jpeg-1.033-r1.ebuild, -cl-jpeg-1.033.ebuild:
+  Include compatibility/ANSI compliance fix for DEFCONSTANT; Tag stable
+  keywords for x86; Expand metadata.xml; Remove old ebuilds.
 
 *cl-jpeg-1.033-r1 (12 Feb 2004)
 
diff --git a/dev-lisp/cl-jpeg/cl-jpeg-1.032.1.ebuild b/dev-lisp/cl-jpeg/cl-jpeg-1.032.1.ebuild
deleted file mode 100644
index 6ec78524b722..000000000000
--- a/dev-lisp/cl-jpeg/cl-jpeg-1.032.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 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.032.1.ebuild,v 1.5 2004/07/14 15:53:36 agriffis Exp $
-
-inherit common-lisp
-
-DESCRIPTION="A JPEG library for Common Lisp"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-jpeg.html
-	http://sourceforge.net/projects/cljl"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-jpeg/${PN}_${PV}.orig.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-CLPACKAGE=cl-jpeg
-
-src_install() {
-	common-lisp-install *.lisp *.asd
-	common-lisp-system-symlink
-}
-
-
-pkg_preinst() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
-
-pkg_postrm() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
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 89ef9b799bc6..3b7deca98911 100644
--- a/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild
+++ b/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.3 2004/07/14 15:53:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-jpeg/cl-jpeg-1.033-r1.ebuild,v 1.4 2005/02/04 22:29:11 mkennedy Exp $
 
-inherit common-lisp
+inherit common-lisp eutils
 
 DESCRIPTION="A JPEG library for Common Lisp"
 HOMEPAGE="http://sourceforge.net/projects/cljl"
 SRC_URI="mirror://sourceforge/cljl/cljl-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp"
+DEPEND="dev-lisp/cl-plus"
 
 CLPACKAGE=cl-jpeg
 
 S=${WORKDIR}/cljl
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-defconstant-gentoo.patch || die
+}
+
 src_install() {
 	common-lisp-install *.lisp *.asd
 	common-lisp-system-symlink
diff --git a/dev-lisp/cl-jpeg/cl-jpeg-1.033.ebuild b/dev-lisp/cl-jpeg/cl-jpeg-1.033.ebuild
deleted file mode 100644
index 07347fdc9db8..000000000000
--- a/dev-lisp/cl-jpeg/cl-jpeg-1.033.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.2 2004/06/24 23:45:24 agriffis Exp $
-
-inherit common-lisp
-
-DESCRIPTION="A JPEG library for Common Lisp"
-HOMEPAGE="http://sourceforge.net/projects/cljl"
-SRC_URI="mirror://sourceforge/cljl/cljl-${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-CLPACKAGE=cl-jpeg
-
-S=${WORKDIR}/cljl
-
-src_install() {
-	common-lisp-install *.lisp *.asd
-	common-lisp-system-symlink
-	dodoc LICENSE
-}
-
-
-pkg_preinst() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
-
-pkg_postrm() {
-	rm -rf /usr/lib/common-lisp/*/${CLPACKAGE} || true
-}
diff --git a/dev-lisp/cl-jpeg/files/1.033-defconstant-gentoo.patch b/dev-lisp/cl-jpeg/files/1.033-defconstant-gentoo.patch
new file mode 100644
index 000000000000..a2edcc7665b5
--- /dev/null
+++ b/dev-lisp/cl-jpeg/files/1.033-defconstant-gentoo.patch
@@ -0,0 +1,91 @@
+diff -ur cljl.orig/cl-jpeg.asd cljl/cl-jpeg.asd
+--- cljl.orig/cl-jpeg.asd	2003-05-06 11:33:44.000000000 -0500
++++ cljl/cl-jpeg.asd	2005-02-04 16:10:49.016927893 -0600
+@@ -4,5 +4,6 @@
+ (in-package #:cl-jpeg-system)
+ 
+ (defsystem :cl-jpeg
+-  :components ((:file "jpeg")))
++  :components ((:file "jpeg"))
++  :depends-on (cl-plus))
+ 
+diff -ur cljl.orig/jpeg.lisp cljl/jpeg.lisp
+--- cljl.orig/jpeg.lisp	2003-10-06 12:49:30.000000000 -0500
++++ cljl/jpeg.lisp	2005-02-04 16:14:48.063791775 -0600
+@@ -99,25 +99,25 @@
+ (eval-when (:compile-toplevel :load-toplevel)
+ 
+ ;;; Source huffman tables for the encoder
+-(defconstant *luminance-dc-bits*
++(cl+:defconst *luminance-dc-bits*
+   #(#x00 #x01 #x05 #x01 #x01 #x01 #x01 #x01
+      #x01 #x00 #x00 #x00 #x00 #x00 #x00 #x00))
+ 
+-(defconstant *luminance-dc-values*
++(cl+:defconst *luminance-dc-values*
+   #(#x00 #x01 #x02 #x03 #x04 #x05 #x06 #x07 #x08 #x09 #x0a #x0b))
+ 
+-(defconstant *chrominance-dc-bits*
++(cl+:defconst *chrominance-dc-bits*
+   #(#x00 #x03 #x01 #x01 #x01 #x01 #x01 #x01
+      #x01 #x01 #x01 #x00 #x00 #x00 #x00 #x00))
+ 
+-(defconstant *chrominance-dc-values*
++(cl+:defconst *chrominance-dc-values*
+   #(#x00 #x01 #x02 #x03 #x04 #x05 #x06 #x07 #x08 #x09 #x0a #x0b))
+ 
+-(defconstant *luminance-ac-bits*
++(cl+:defconst *luminance-ac-bits*
+   #(#x00 #x02 #x01 #x03 #x03 #x02 #x04 #x03
+      #x05 #x05 #x04 #x04 #x00 #x00 #x01 #x7d))
+ 
+-(defconstant *luminance-ac-values*
++(cl+:defconst *luminance-ac-values*
+   #(#x01 #x02 #x03 #x00 #x04 #x11 #x05 #x12
+      #x21 #x31 #x41 #x06 #x13 #x51 #x61 #x07
+      #x22 #x71 #x14 #x32 #x81 #x91 #xa1 #x08
+@@ -140,11 +140,11 @@
+      #xf1 #xf2 #xf3 #xf4 #xf5 #xf6 #xf7 #xf8
+      #xf9 #xfa))
+ 
+-(defconstant *chrominance-ac-bits*
++(cl+:defconst *chrominance-ac-bits*
+   #(#x00 #x02 #x01 #x02 #x04 #x04 #x03 #x04
+      #x07 #x05 #x04 #x04 #x00 #x01 #x02 #x77))
+ 
+-(defconstant *chrominance-ac-values*
++(cl+:defconst *chrominance-ac-values*
+   #(#x00 #x01 #x02 #x03 #x11 #x04 #x05 #x21
+      #x31 #x06 #x12 #x41 #x51 #x07 #x61 #x71
+      #x13 #x22 #x32 #x81 #x08 #x14 #x42 #x91
+@@ -168,7 +168,7 @@
+      #xf9 #xfa))
+ 
+ ;;;Zigzag encoding matrix
+-(defconstant *zigzag-index*
++(cl+:defconst *zigzag-index*
+   #(#(0  1  5  6 14 15 27 28)
+     #(2  4  7 13 16 26 29 42)
+     #(3  8 12 17 25 30 41 43)
+@@ -181,7 +181,7 @@
+ ;;; Temporary buffer for zigzag encoding and decoding
+ (defvar *zz-result* (make-array 64 :element-type 'unsigned-byte))
+ 
+-(defconstant *zzbuf*
++(cl+:defconst *zzbuf*
+   #(#(0  0  0  0  0  0  0  0)
+     #(0  0  0  0  0  0  0  0)
+     #(0  0  0  0  0  0  0  0)
+@@ -290,10 +290,10 @@
+ (finish-output)
+ )
+ 
+-(defconstant *q-tables* (vector *q-luminance* *q-chrominance*))
++(cl+:defconst *q-tables* (vector *q-luminance* *q-chrominance*))
+ 
+ ;;; This table is used to map coefficients into SSSS value
+-(defconstant *csize* (make-array 2047 
++(cl+:defconst *csize* (make-array 2047 
+ 				 :initial-contents
+ 				 (loop for i fixnum from 0 to 2046
+ 				       collecting (integer-length (abs (minus i 1023))))))
diff --git a/dev-lisp/cl-jpeg/files/digest-cl-jpeg-1.032.1 b/dev-lisp/cl-jpeg/files/digest-cl-jpeg-1.032.1
deleted file mode 100644
index d35b7c0fcfb1..000000000000
--- a/dev-lisp/cl-jpeg/files/digest-cl-jpeg-1.032.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6673f3bb487ac6527a8e5c8b3fb5a70a cl-jpeg_1.032.1.orig.tar.gz 17663
diff --git a/dev-lisp/cl-jpeg/files/digest-cl-jpeg-1.033 b/dev-lisp/cl-jpeg/files/digest-cl-jpeg-1.033
deleted file mode 100644
index e821a95d5654..000000000000
--- a/dev-lisp/cl-jpeg/files/digest-cl-jpeg-1.033
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da73e0b734e04e09cff9ecc8794e7a8d cljl-1.033.tar.gz 21269
diff --git a/dev-lisp/cl-jpeg/metadata.xml b/dev-lisp/cl-jpeg/metadata.xml
index f418045b09c8..4008e20ed924 100644
--- a/dev-lisp/cl-jpeg/metadata.xml
+++ b/dev-lisp/cl-jpeg/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>common-lisp</herd>
+<longdescription>
+Common Lisp JPEG Library implements baseline JPEG image
+compression/decompression routines in ANSI Common Lisp
+</longdescription> 
 </pkgmetadata>