dev-lisp/cl-pdf: remove snapshot, add SVN ebuild

3 files changed, 149 insertions, 137 deletions

diff --git a/dev-lisp/cl-pdf/Manifest b/dev-lisp/cl-pdf/Manifest
index 1e1d2403..d4cd2b32 100644
--- a/dev-lisp/cl-pdf/Manifest
+++ b/dev-lisp/cl-pdf/Manifest
@@ -1,3 +1,2 @@
-AUX 2.1.172-gentoo.patch 8937 RMD160 d2e7c131e45a171f438eb68fb09994e787dae02b SHA1 dadc8adaef5be1cfa830363fab05805ef1d5a59a SHA256 0a59d55db6a08a65f1850b4857d7a313597012e9f4dadbe2ad594f731003bc50
-DIST cl-pdf-2.1.172.tar.bz2 435602 RMD160 629bc923e83aeb326edd4b1627b978d5879a901c SHA1 cc998ecdc30f979b09ce8c50ed23ce17a3f23849 SHA256 d1df08db3f55909c06abb4e84b49204359c8aa2d47067f426e89061d48ca2b92
-EBUILD cl-pdf-2.1.172.ebuild 754 RMD160 7420824031231029ee3b20bd950cc2e26686ebd0 SHA1 401dbbbc63184d6e408c6ae05fcfafbce57d31b6 SHA256 a6997298cb763beffc68e935d35bb19169b0df7df6ad24d6d3eb4f677e644cbe
+AUX gentoo-no-bundled-libs.patch 8466 RMD160 15a1a77f650e70ccacaf4829b0f91e524bfefc68 SHA1 85768ea0edb2e49641b0381901e44f15a3d2fef5 SHA256 100cd7ba578e11eec75163d10ccb185345aa98b5fae6fb3955fe8531c7e20de0
+EBUILD cl-pdf-9999.ebuild 791 RMD160 73b5960d56c9d4dc63e490ae734f82ea0379ec1a SHA1 c35ad101f8b1ce77e0ee602e9ec00d7a67e847e0 SHA256 12cf4c1729de08ecf2e8936f9f6788ecf254c552f124fe7b36872dfddb833999
diff --git a/dev-lisp/cl-pdf/cl-pdf-2.1.172.ebuild b/dev-lisp/cl-pdf/cl-pdf-9999.ebuild
index 09a93548..ce9f9be7 100644
--- a/dev-lisp/cl-pdf/cl-pdf-2.1.172.ebuild
+++ b/dev-lisp/cl-pdf/cl-pdf-9999.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit common-lisp-2 eutils
+EAPI="2"
+inherit common-lisp-2 eutils subversion
 
 DESCRIPTION="CL-PDF is a cross-platform Common Lisp library for generating PDF files"
 HOMEPAGE="http://www.fractalconcept.com/asp/cl-pdf"
-SRC_URI="http://common-lisp.net/~sionescu/files/${P}.tar.bz2"
+ESVN_REPO_URI="http://www.fractalconcept.com:8000/public/open-source/cl-pdf/"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~ppc ~x86"
 IUSE=""
 
-RDEPEND="dev-lisp/salza
+RDEPEND="dev-lisp/salza2
 		dev-lisp/iterate"
 
 CLSYSTEMS="${PN} ${PN}-parser"
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
+src_prepare() {
+	epatch "${FILESDIR}"/gentoo-no-bundled-libs.patch
 }
 
 src_install() {
diff --git a/dev-lisp/cl-pdf/files/2.1.172-gentoo.patch b/dev-lisp/cl-pdf/files/gentoo-no-bundled-libs.patch
index ce45fe75..469373de 100644
--- a/dev-lisp/cl-pdf/files/2.1.172-gentoo.patch
+++ b/dev-lisp/cl-pdf/files/gentoo-no-bundled-libs.patch
@@ -1,129 +1,26 @@
-diff -Naur cl-pdf-2.1.172.old/cl-pdf.asd cl-pdf-2.1.172/cl-pdf.asd
---- cl-pdf-2.1.172.old/cl-pdf.asd	2007-11-27 00:02:13.000000000 +0100
-+++ cl-pdf-2.1.172/cl-pdf.asd	2007-11-27 00:34:34.000000000 +0100
-@@ -11,56 +11,29 @@
- 
- (in-package #:cl-pdf-system)
- 
--;;;Choose the zlib implementation you want to use (only one!)
--(eval-when (:load-toplevel :compile-toplevel :execute)
--  (pushnew :use-salza-zlib *features*)
--  ;;(pushnew :use-uffi-zlib *features*)
--  ;;(pushnew :use-abcl-zlib *features*)
--  ;;(pushnew :use-no-zlib *features*)
--  )
--
--#-(or use-uffi-zlib use-salza-zlib use-abcl-zlib use-no-zlib)
--(error "You must choose which zlib implementation you want to use!")
--
--#+(and (not uffi) use-uffi-zlib)
--(ignore-errors
--  (print "Trying to load UFFI:")
--  (operate 'load-op :uffi)
--  (pushnew :uffi *features*)
--  (print "UFFI loaded."))
--
--#+use-salza-zlib
--(load (merge-pathnames "salza/salza.asd" *load-truename*))
--
--#+clisp (setf *warn-on-floating-point-contagion* nil)
--
- (defsystem :cl-pdf
-   :name "cl-pdf"
-   :author "Marc Battyani <marc.battyani@fractalconcept.com>"
--  :version "2.0"
-+  :version "2.1.172"
-   :maintainer "Marc Battyani <marc.battyani@fractalconcept.com>"
-   :licence "BSD like licence"
-   :description "Common Lisp PDF Generation Library"
-   :long-description "The cl-pdf package provides a stand-alone Common Lisp library to generate PDF files."
--  :perform (load-op :after (op cl-pdf)
--		    (pushnew :cl-pdf *features*))
-   :components ((:file "defpackage")
--	       (:file "config" :depends-on ("defpackage"))
--	       #+use-uffi-zlib (:file "init" :depends-on ("config"))
--	       (:file "zlib" 
--		      :depends-on ("config" "defpackage"
--					    #+use-uffi-zlib "init"))
--	       (:file "font-metrics"  :depends-on ("config"))
--	       (:file "encodings"  :depends-on ("defpackage"))
--	       (:file "t1-font" :depends-on ("font-metrics" "encodings"))
--	       (:file "ttu-font" :depends-on ("font-metrics"))
--	       (:file "font" :depends-on ("t1-font"))
--	       (:file "pdf" :depends-on ("font"))
--	       (:file "x11-colors" :depends-on ("defpackage"))
--	       (:file "pdf-base" :depends-on ("pdf" "x11-colors"))
--	       (:file "png" :depends-on ("pdf-base"))
--	       (:file "pdf-geom" :depends-on ("pdf-base"))
--	       (:file "text" :depends-on ("pdf-base"))
--	       (:file "bar-codes" :depends-on ("pdf-geom"))
--	       (:file "chart" :depends-on ("text" "pdf-geom")))
--  :depends-on (:iterate #+use-salza-zlib :salza))
-+               (:file "config" :depends-on ("defpackage"))
-+               (:file "zlib" 
-+                      :depends-on ("config" "defpackage"))
-+               (:file "font-metrics"  :depends-on ("config"))
-+               (:file "encodings"  :depends-on ("defpackage"))
-+               (:file "t1-font" :depends-on ("font-metrics" "encodings"))
-+               (:file "ttu-font" :depends-on ("font-metrics"))
-+               (:file "font" :depends-on ("t1-font"))
-+               (:file "pdf" :depends-on ("font"))
-+               (:file "x11-colors" :depends-on ("defpackage"))
-+               (:file "pdf-base" :depends-on ("pdf" "x11-colors"))
-+               (:file "png" :depends-on ("pdf-base"))
-+               (:file "pdf-geom" :depends-on ("pdf-base"))
-+               (:file "text" :depends-on ("pdf-base"))
-+               (:file "bar-codes" :depends-on ("pdf-geom"))
-+               (:file "chart" :depends-on ("text" "pdf-geom")))
-+  :depends-on (:iterate :salza))
-diff -Naur cl-pdf-2.1.172.old/cl-pdf-parser.asd cl-pdf-2.1.172/cl-pdf-parser.asd
---- cl-pdf-2.1.172.old/cl-pdf-parser.asd	2007-11-27 00:02:13.000000000 +0100
-+++ cl-pdf-2.1.172/cl-pdf-parser.asd	2007-11-27 00:35:49.000000000 +0100
-@@ -1,6 +1,9 @@
+Index: cl-pdf-parser.asd
+===================================================================
+--- cl-pdf-parser.asd	(revision 178)
++++ cl-pdf-parser.asd	(working copy)
+@@ -1,7 +1,12 @@
  ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
  
 -(in-package asdf)
++(in-package :common-lisp-user)
+ 
 +(defpackage #:cl-pdf-parser-system
-+  (:use #:common-lisp #:asdf))
++  (:use #:cl #:asdf))
 +
 +(in-package #:cl-pdf-parser-system)
- 
++
  (defsystem :cl-pdf-parser
    :name "cl-pdf-parser"
-diff -Naur cl-pdf-2.1.172.old/config.lisp cl-pdf-2.1.172/config.lisp
---- cl-pdf-2.1.172.old/config.lisp	2007-11-27 00:02:13.000000000 +0100
-+++ cl-pdf-2.1.172/config.lisp	2007-11-27 00:38:09.000000000 +0100
-@@ -40,7 +40,7 @@
- ;;  Neither of the versions of search-for-file can search the original value of
- ;;  *afm-files-directories* (#P"cl-pdf/afm/*.afm") as it contains wildcards!
- (defparameter *afm-files-directories*
--  (list (merge-pathnames #P"afm/" *cl-pdf-base-directory*))
-+  (list #p"/usr/share/fonts/afm/")
-   "The list of directories containing the Adobe Font Metrics and other font files.
-  Can be expanded by additionally loaded modules.")
- 
-@@ -51,17 +51,6 @@
- #+(or lispworks allegro sbcl)
- (pushnew :pdf-binary *features*)
- 
--;(eval-when (:compile-toplevel :load-toplevel :execute)
--#+use-uffi-zlib
--(defvar *zlib-search-paths* `(,(directory-namestring *load-truename*)
--                              #+lispworks
--                              ,(directory-namestring (lw:lisp-image-name))
--                              "/usr/local/lib/"
--                              "/usr/lib/"
--                              "/windows/system32/"
--                              "/winnt/system32/")
--  "The paths where to search the zlib shared library")
--
- ;a catchall for various kind of errors that can happen in the generation of a document.
- ; just catch 'max-number-of-pages-reached if you want to do something with this.
- (defvar *max-number-of-pages* 1000
-diff -Naur cl-pdf-2.1.172.old/zlib.lisp cl-pdf-2.1.172/zlib.lisp
---- cl-pdf-2.1.172.old/zlib.lisp	2007-11-27 00:02:13.000000000 +0100
-+++ cl-pdf-2.1.172/zlib.lisp	2007-11-27 00:37:27.000000000 +0100
-@@ -4,88 +4,12 @@
+   :author "Marc Battyani <marc.battyani@fractalconcept.com>"
+Index: zlib.lisp
+===================================================================
+--- zlib.lisp	(revision 178)
++++ zlib.lisp	(working copy)
+@@ -4,113 +4,13 @@
  
  (in-package #:pdf)
  
@@ -201,21 +98,55 @@ diff -Naur cl-pdf-2.1.172.old/zlib.lisp cl-pdf-2.1.172/zlib.lisp
 -      (java:jcall (java:jmethod "java.util.zip.DeflaterOutputStream" "close") defl-out-stream)
 -      (java:jcall (java:jmethod "java.io.ByteArrayOutputStream" "toString") out-array)))
 -
- ;;; salza zlib
- 
+-;;; salza zlib
+-
+-#+use-salza-zlib
+-(defun load-zlib (&optional force)
+-  (declare (ignore force))
+-  (setf *compress-streams* t))
+-
 -#+use-salza-zlib
+-(defun compress-string (string)
+-  (let* ((input (if (stringp string)
+-		    (deflate::string-to-octets string 0 (length string))
+-		    string))
+-	 (buffer-size (min 8192 (* 2 (length string))))
+-         (zlib-buffer (make-array buffer-size :element-type 'salza::octet))
+-         (chunks ()))
+-    (flet ((zlib-callback (zlib-stream)
+-	     (push (subseq (salza::zlib-stream-buffer zlib-stream) 
+-			   0 (salza::zlib-stream-position zlib-stream)) chunks)
+-	     (setf (salza::zlib-stream-position zlib-stream) 0)))
+-      (let ((zlib-stream (salza::make-zlib-stream zlib-buffer :callback #'zlib-callback)))
+-        (salza::zlib-write-sequence input zlib-stream)
+-        (salza::finish-zlib-stream zlib-stream)
+-	(nreverse chunks)))))
+-
+ ;;; salza2 zlib
+ 
+-#+use-salza2-zlib
  (defun load-zlib (&optional force)
    (declare (ignore force))
    (setf *compress-streams* t))
  
--#+use-salza-zlib
+ ;; string-to-octets copied from the original salza
+-#+use-salza2-zlib
+ (defun string-to-octets (string start end)
+   "Convert STRING to a sequence of octets, if possible."
+   (declare (type string string)
+@@ -132,7 +32,6 @@
+   #+(and (not octet-characters) (not (or sbcl allegro clisp lispworks)))
+   (error "Do not know how to convert a string to octets."))
+ 
+-#+use-salza2-zlib
  (defun compress-string (string)
-   (let* ((input (if (stringp string)
- 		    (deflate::string-to-octets string 0 (length string))
-@@ -102,16 +26,6 @@
-         (salza::finish-zlib-stream zlib-stream)
- 	(nreverse chunks)))))
+   (let ((input (if (stringp string)
+ 		   (string-to-octets string 0 (length string))
+@@ -148,17 +47,6 @@
+ 	(salza2:finish-compression compressor)))
+     (reverse chunks)))
  
+-
 -;;; no-zlib
 -#+use-no-zlib
 -(defun load-zlib (&optional force)
@@ -229,3 +160,85 @@ diff -Naur cl-pdf-2.1.172.old/zlib.lisp cl-pdf-2.1.172/zlib.lisp
  ;;; load it!
  
  (load-zlib)
+Index: config.lisp
+===================================================================
+--- config.lisp	(revision 178)
++++ config.lisp	(working copy)
+@@ -58,7 +58,7 @@
+ ;;  Neither of the versions of search-for-file can search the original value of
+ ;;  *afm-files-directories* (#P"cl-pdf/afm/*.afm") as it contains wildcards!
+ (defparameter *afm-files-directories*
+-  (list (merge-pathnames #P"afm/" *cl-pdf-base-directory*))
++  (list #p"/usr/share/fonts/afm/")
+   "The list of directories containing the Adobe Font Metrics and other font files.
+  Can be expanded by additionally loaded modules.")
+ 
+@@ -69,17 +69,6 @@
+ #+(or lispworks allegro sbcl)
+ (pushnew :pdf-binary *features*)
+ 
+-;(eval-when (:compile-toplevel :load-toplevel :execute)
+-#+use-uffi-zlib
+-(defvar *zlib-search-paths* `(,(directory-namestring *load-truename*)
+-                              #+lispworks
+-                              ,(directory-namestring (lw:lisp-image-name))
+-                              "/usr/local/lib/"
+-                              "/usr/lib/"
+-                              "/windows/system32/"
+-                              "/winnt/system32/")
+-  "The paths where to search the zlib shared library")
+-
+ ;a catchall for various kind of errors that can happen in the generation of a document.
+ ; just catch 'max-number-of-pages-reached if you want to do something with this.
+ (defvar *max-number-of-pages* 1000
+Index: cl-pdf.asd
+===================================================================
+--- cl-pdf.asd	(revision 178)
++++ cl-pdf.asd	(working copy)
+@@ -11,28 +11,6 @@
+ 
+ (in-package #:cl-pdf-system)
+ 
+-;;;Choose the zlib implementation you want to use (only one!)
+-(eval-when (:load-toplevel :compile-toplevel :execute)
+-  ;;(pushnew :use-salza2-zlib *features*)
+-  ;;(pushnew :use-salza-zlib *features*)
+-  ;;(pushnew :use-uffi-zlib *features*)
+-  ;;(pushnew :use-abcl-zlib *features*)
+-  (pushnew :use-no-zlib *features*)
+-  )
+-
+-#-(or use-uffi-zlib use-salza-zlib use-salza2-zlib use-abcl-zlib use-no-zlib)
+-(error "You must choose which zlib implementation you want to use!")
+-
+-#+(and (not uffi) use-uffi-zlib)
+-(ignore-errors
+-  (print "Trying to load UFFI:")
+-  (operate 'load-op :uffi)
+-  (pushnew :uffi *features*)
+-  (print "UFFI loaded."))
+-
+-#+use-salza-zlib
+-(load (merge-pathnames "salza/salza.asd" *load-truename*))
+-
+ #+clisp (setf *warn-on-floating-point-contagion* nil)
+ 
+ (defsystem :cl-pdf
+@@ -47,10 +25,8 @@
+ 		    (pushnew :cl-pdf *features*))
+   :components ((:file "defpackage")
+ 	       (:file "config" :depends-on ("defpackage"))
+-	       #+use-uffi-zlib (:file "init" :depends-on ("config"))
+ 	       (:file "zlib" 
+-		      :depends-on ("config" "defpackage"
+-					    #+use-uffi-zlib "init"))
++		      :depends-on ("config" "defpackage"))
+ 	       (:file "font-metrics"  :depends-on ("config"))
+ 	       (:file "encodings"  :depends-on ("defpackage"))
+ 	       (:file "t1-font" :depends-on ("font-metrics" "encodings"))
+@@ -64,4 +40,4 @@
+ 	       (:file "text" :depends-on ("pdf-base"))
+ 	       (:file "bar-codes" :depends-on ("pdf-geom"))
+ 	       (:file "chart" :depends-on ("text" "pdf-geom")))
+-  :depends-on (:iterate #+use-salza-zlib :salza #+use-salza2-zlib :salza2))
++  :depends-on (:iterate :salza2))