.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 34 insertions, 116 deletions

diff --git a/dev-lisp/cl-sdl/ChangeLog b/dev-lisp/cl-sdl/ChangeLog
index 9218352d32be..f776abb5fa86 100644
--- a/dev-lisp/cl-sdl/ChangeLog
+++ b/dev-lisp/cl-sdl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lisp/cl-sdl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sdl/ChangeLog,v 1.9 2005/05/24 18:48:35 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sdl/ChangeLog,v 1.10 2005/07/20 21:36:09 mkennedy Exp $
+
+*cl-sdl-0.2.2-r2 (20 Jul 2005)
+
+  20 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/0.2.2-CD-STATUS-gentoo.patch, -files/cl-sdl-0.2.1-gentoo.patch,
+  -cl-sdl-0.2.2-r1.ebuild, +cl-sdl-0.2.2-r2.ebuild:
+  Included patch to remove STATUS accessor from CD structure which would
+  create a function CD-STATUS which later conflicts with CD-STATUS (the
+  foreign function for SDL_CDStatus).
 
   24 May 2005; <mkennedy@gentoo.org> cl-sdl-0.2.2-r1.ebuild:
   Keywording ~sparc
diff --git a/dev-lisp/cl-sdl/Manifest b/dev-lisp/cl-sdl/Manifest
index 77d904275d8e..0c8ae55c7ba1 100644
--- a/dev-lisp/cl-sdl/Manifest
+++ b/dev-lisp/cl-sdl/Manifest
@@ -1,5 +1,5 @@
-MD5 c687850be398587dcc4a5b2276a830ee ChangeLog 1242
-MD5 7e21f93b404149886771f5f312467176 cl-sdl-0.2.2-r1.ebuild 2071
+MD5 47e4a00786a24a6c6064ff311b73d18b ChangeLog 1637
 MD5 9b65b0341efc8f4b29498aad23315229 metadata.xml 164
-MD5 eb99992a3fab31005b911962e7e6f116 files/cl-sdl-0.2.1-gentoo.patch 4044
-MD5 a530a1847e5e59ff886cfa0c1ab14f32 files/digest-cl-sdl-0.2.2-r1 64
+MD5 7a386617aaee5f57be4e6744be14700b cl-sdl-0.2.2-r2.ebuild 2165
+MD5 a530a1847e5e59ff886cfa0c1ab14f32 files/digest-cl-sdl-0.2.2-r2 64
+MD5 c05bb1e792f08331214a87a817b39afb files/0.2.2-CD-STATUS-gentoo.patch 478
diff --git a/dev-lisp/cl-sdl/cl-sdl-0.2.2-r1.ebuild b/dev-lisp/cl-sdl/cl-sdl-0.2.2-r2.ebuild
index 5e91890324f4..9216b8aecd4f 100644
--- a/dev-lisp/cl-sdl/cl-sdl-0.2.2-r1.ebuild
+++ b/dev-lisp/cl-sdl/cl-sdl-0.2.2-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sdl/cl-sdl-0.2.2-r1.ebuild,v 1.5 2005/05/24 18:48:35 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sdl/cl-sdl-0.2.2-r2.ebuild,v 1.1 2005/07/20 21:36:09 mkennedy Exp $
 
-inherit common-lisp
+inherit common-lisp eutils
 
 DESCRIPTION="Common Lisp bindings to the SDL graphics library, and OpenGL libraries"
 HOMEPAGE="http://cl-sdl.sourceforge.net/"
@@ -23,6 +23,11 @@ S=${WORKDIR}/${PN}
 SUB_PACKAGES="sdl sdl-ttf sdl-img sdl-mix opengl"
 CLPACKAGE="sdl-ffi sdl-demos ${SUB_PACKAGES}"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-CD-STATUS-gentoo.patch || die
+}
+
 src_compile() {
 	make clean
 	make || die
diff --git a/dev-lisp/cl-sdl/files/0.2.2-CD-STATUS-gentoo.patch b/dev-lisp/cl-sdl/files/0.2.2-CD-STATUS-gentoo.patch
new file mode 100644
index 000000000000..28ca94e002da
--- /dev/null
+++ b/dev-lisp/cl-sdl/files/0.2.2-CD-STATUS-gentoo.patch
@@ -0,0 +1,13 @@
+diff -ur cl-sdl.orig/sdl/sdl.lisp cl-sdl/sdl/sdl.lisp
+--- cl-sdl.orig/sdl/sdl.lisp	2003-11-03 11:35:42.000000000 -0600
++++ cl-sdl/sdl/sdl.lisp	2005-07-20 16:26:40.000000000 -0500
+@@ -420,7 +420,7 @@
+   (track (:array cd-track #.(1+ +max-tracks+))))
+ 
+ (def-foreign-struct-accessors (cd)
+-    id status numtracks cur-track cur-frame)
++    id numtracks cur-track cur-frame)
+ 
+ (defun cd-track (cd track-num)
+   (deref-array (slot cd cd track)
+Only in cl-sdl/sdl: sdl.lisp.~1.17.~
diff --git a/dev-lisp/cl-sdl/files/cl-sdl-0.2.1-gentoo.patch b/dev-lisp/cl-sdl/files/cl-sdl-0.2.1-gentoo.patch
deleted file mode 100644
index 74255fedc4eb..000000000000
--- a/dev-lisp/cl-sdl/files/cl-sdl-0.2.1-gentoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Common subdirectories: cl-sdl.orig/CVS and cl-sdl/CVS
-Common subdirectories: cl-sdl.orig/build and cl-sdl/build
-Common subdirectories: cl-sdl.orig/c and cl-sdl/c
-Common subdirectories: cl-sdl.orig/debian and cl-sdl/debian
-Common subdirectories: cl-sdl.orig/doc and cl-sdl/doc
-Common subdirectories: cl-sdl.orig/examples and cl-sdl/examples
-Common subdirectories: cl-sdl.orig/ffi and cl-sdl/ffi
-Common subdirectories: cl-sdl.orig/nehe and cl-sdl/nehe
-Common subdirectories: cl-sdl.orig/opengl and cl-sdl/opengl
-diff -u cl-sdl.orig/opengl.asd cl-sdl/opengl.asd
---- cl-sdl.orig/opengl.asd	2002-12-08 09:55:16.000000000 -0600
-+++ cl-sdl/opengl.asd	2003-10-17 13:06:13.490855184 -0500
-@@ -4,7 +4,7 @@
- 
- (in-package #:asdf)
- 
--(defsystem opengl
-+#-clisp (defsystem opengl
-     :components ((:module :opengl
-                           :components
-                           ((:file "gl")
-Common subdirectories: cl-sdl.orig/sdl and cl-sdl/sdl
-diff -u cl-sdl.orig/sdl-demos.asd cl-sdl/sdl-demos.asd
---- cl-sdl.orig/sdl-demos.asd	2002-12-08 13:40:44.000000000 -0600
-+++ cl-sdl/sdl-demos.asd	2003-10-17 13:06:23.859278944 -0500
-@@ -2,7 +2,7 @@
- 
- (in-package #:asdf)
- 
--(defsystem sdl-demos
-+#-clisp (defsystem sdl-demos
-     :components ((:module :examples
-                           :components
-                           ((:file "sdl-test")
-diff -u cl-sdl.orig/sdl-examples.asd cl-sdl/sdl-examples.asd
---- cl-sdl.orig/sdl-examples.asd	2002-12-08 10:56:51.000000000 -0600
-+++ cl-sdl/sdl-examples.asd	2003-10-17 13:06:31.087180136 -0500
-@@ -3,7 +3,7 @@
- ;;;; ASDF System Definition
- (in-package #:asdf)
- 
--(defsystem sdl-examples
-+#-clisp (defsystem sdl-examples
-     :components ((:module :examples
-                           :components
-                           ((:file "2d-test"
-diff -u cl-sdl.orig/sdl-ffi.asd cl-sdl/sdl-ffi.asd
---- cl-sdl.orig/sdl-ffi.asd	2002-12-08 08:48:10.000000000 -0600
-+++ cl-sdl/sdl-ffi.asd	2003-10-17 13:06:37.926140456 -0500
-@@ -4,7 +4,7 @@
- 
- (in-package #:asdf)
- 
--(defsystem sdl-ffi
-+#-clisp (defsystem sdl-ffi
-     :components ((:module :ffi
-                           :components ((:file "uffi"))))
-     :depends-on (uffi))
-Common subdirectories: cl-sdl.orig/sdl-img and cl-sdl/sdl-img
-diff -u cl-sdl.orig/sdl-img.asd cl-sdl/sdl-img.asd
---- cl-sdl.orig/sdl-img.asd	2002-12-10 17:27:56.000000000 -0600
-+++ cl-sdl/sdl-img.asd	2003-10-17 13:06:44.368161120 -0500
-@@ -3,7 +3,7 @@
- ;;;; ASDF System Definition
- (in-package #:asdf)
- 
--(defsystem sdl-img
-+#-clisp (defsystem sdl-img
-     :components ((:module :sdl-img
-                           :components ((:file "sdl-img"
-                                               :depends-on ("lib"))
-Common subdirectories: cl-sdl.orig/sdl-mix and cl-sdl/sdl-mix
-diff -u cl-sdl.orig/sdl-mix.asd cl-sdl/sdl-mix.asd
---- cl-sdl.orig/sdl-mix.asd	2002-12-10 17:27:56.000000000 -0600
-+++ cl-sdl/sdl-mix.asd	2003-10-17 13:06:50.749191056 -0500
-@@ -3,7 +3,7 @@
- ;;;; ASDF System Definition
- (in-package #:asdf)
- 
--(defsystem sdl-mix
-+#-clisp (defsystem sdl-mix
-     :components ((:module :sdl-mix
-                           :components ((:file "sdl-mix"
-                                               :depends-on ("lib"))
-Common subdirectories: cl-sdl.orig/sdl-ttf and cl-sdl/sdl-ttf
-diff -u cl-sdl.orig/sdl-ttf.asd cl-sdl/sdl-ttf.asd
---- cl-sdl.orig/sdl-ttf.asd	2002-12-18 18:43:30.000000000 -0600
-+++ cl-sdl/sdl-ttf.asd	2003-10-17 13:06:56.721283160 -0500
-@@ -3,7 +3,7 @@
- ;;;; ASDF System Definition
- (in-package #:asdf)
- 
--(defsystem sdl-ttf
-+#-clisp (defsystem sdl-ttf
-     :components ((:module :sdl-ttf
-                           :components ((:file "sdl-ttf"
-                                               :depends-on ("lib"))
-diff -u cl-sdl.orig/sdl.asd cl-sdl/sdl.asd
---- cl-sdl.orig/sdl.asd	2002-12-18 18:43:30.000000000 -0600
-+++ cl-sdl/sdl.asd	2003-10-17 13:07:02.305434240 -0500
-@@ -4,7 +4,7 @@
- 
- (in-package #:asdf)
- 
--(defsystem sdl
-+#-clisp (defsystem sdl
-     :components ((:module :sdl
-                           :components
-                           ((:file "sdl")
diff --git a/dev-lisp/cl-sdl/files/digest-cl-sdl-0.2.2-r1 b/dev-lisp/cl-sdl/files/digest-cl-sdl-0.2.2-r2
index 096de2653310..096de2653310 100644
--- a/dev-lisp/cl-sdl/files/digest-cl-sdl-0.2.2-r1
+++ b/dev-lisp/cl-sdl/files/digest-cl-sdl-0.2.2-r2