Package-Manager: portage-2.0.51-r15

11 files changed, 47 insertions, 130 deletions

diff --git a/dev-lisp/cl-port/ChangeLog b/dev-lisp/cl-port/ChangeLog
index 138cf50c7e12..7b880926025c 100644
--- a/dev-lisp/cl-port/ChangeLog
+++ b/dev-lisp/cl-port/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lisp/cl-port
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-port/ChangeLog,v 1.6 2004/09/03 15:05:39 dholm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-port/ChangeLog,v 1.7 2005/02/08 07:28:22 mkennedy Exp $
+
+  08 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.0.1.2-cmucl-graystream-gentoo.patch, -cl-port-1.0.1.1.ebuild,
+  -cl-port-1.0.1.2-r1.ebuild, cl-port-1.0.1.2-r2.ebuild,
+  -cl-port-1.0.1.2.ebuild:
+  Fix for CMUCL -- use #'ASDF:OOS and not #'REQUIRE
 
   03 Sep 2004; David Holm <dholm@gentoo.org> cl-port-1.0.1.2-r2.ebuild:
   Added to ~ppc.
diff --git a/dev-lisp/cl-port/Manifest b/dev-lisp/cl-port/Manifest
index 54412a3e393b..8d85da59066a 100644
--- a/dev-lisp/cl-port/Manifest
+++ b/dev-lisp/cl-port/Manifest
@@ -1,10 +1,5 @@
-MD5 0bdfe9dac2abae6a5cbcea0afd61c0f7 ChangeLog 851
-MD5 0ad60422904e4e6876438d7532680300 cl-port-1.0.1.1.ebuild 825
-MD5 5395a20b86a95c3df2f758d09c81d2b2 cl-port-1.0.1.2-r1.ebuild 1160
-MD5 4f285aaba63eb33a44964de15e6f77fa cl-port-1.0.1.2-r2.ebuild 968
-MD5 7d52b39326e365770c3ca8379f7d8d33 cl-port-1.0.1.2.ebuild 1134
+MD5 df4cb0750ad260aeaca94e4b0e6c7e3a ChangeLog 1117
 MD5 9af8fbe392048da0baca3c1d961774c9 metadata.xml 444
-MD5 d8fafbc1ce715736d3afd21892baae6a files/digest-cl-port-1.0.1.1 71
-MD5 a0d5f29f1a213ceccab34d305f2b16cd files/digest-cl-port-1.0.1.2 139
-MD5 a0d5f29f1a213ceccab34d305f2b16cd files/digest-cl-port-1.0.1.2-r1 139
-MD5 a0d5f29f1a213ceccab34d305f2b16cd files/digest-cl-port-1.0.1.2-r2 139
+MD5 5c4259bb75751ae67d1de42c611bd868 cl-port-1.0.1.2-r2.ebuild 1018
+MD5 b1b119cd779741fd09cb076574659c45 files/1.0.1.2-cmucl-graystream-gentoo.patch 1324
+MD5 cb98238c358054349ad790b85099b0ee files/digest-cl-port-1.0.1.2-r2 139
diff --git a/dev-lisp/cl-port/cl-port-1.0.1.1.ebuild b/dev-lisp/cl-port/cl-port-1.0.1.1.ebuild
deleted file mode 100644
index f5a6ba806e59..000000000000
--- a/dev-lisp/cl-port/cl-port-1.0.1.1.ebuild
+++ /dev/null
@@ -1,24 +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-port/cl-port-1.0.1.1.ebuild,v 1.4 2004/07/14 15:59:41 agriffis Exp $
-
-inherit common-lisp
-
-DESCRIPTION="Cross-implementation portability functions taken from the Common Lisp Object Code Collection such as code for sockets, shell functions and paths."
-HOMEPAGE="http://www.sourceforge.net/projects/clocc/
-	http://packages.debian.org/unstable/devel/cl-port.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-port/${PN}_${PV}.orig.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-CLPACKAGE=port
-
-src_install() {
-	common-lisp-install *.lisp *.asd
-	common-lisp-system-symlink
-	dodoc port.html
-}
diff --git a/dev-lisp/cl-port/cl-port-1.0.1.2-r1.ebuild b/dev-lisp/cl-port/cl-port-1.0.1.2-r1.ebuild
deleted file mode 100644
index 3ad831f58dc1..000000000000
--- a/dev-lisp/cl-port/cl-port-1.0.1.2-r1.ebuild
+++ /dev/null
@@ -1,42 +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-port/cl-port-1.0.1.2-r1.ebuild,v 1.3 2004/06/24 23:49:50 agriffis Exp $
-
-inherit common-lisp eutils
-
-DEB_PV=2
-
-DESCRIPTION="Cross-implementation portability functions taken from the Common Lisp Object Code Collection such as code for sockets, shell functions and paths."
-HOMEPAGE="http://www.sourceforge.net/projects/clocc/ http://packages.debian.org/unstable/devel/cl-port.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-port/${PN}_${PV}.orig.tar.gz
-	http://ftp.debian.org/debian/pool/main/c/cl-port/cl-port_${PV}-${DEB_PV}.diff.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp
-	dev-lisp/cmucl-source"
-
-CLPACKAGE=port
-
-src_unpack() {
-	unpack ${A}
-	epatch cl-port_${PV}-${DEB_PV}.diff
-}
-
-src_install() {
-	common-lisp-install *.lisp *.asd
-	common-lisp-system-symlink
-	dodoc port.html
-}
-
-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-port/cl-port-1.0.1.2-r2.ebuild b/dev-lisp/cl-port/cl-port-1.0.1.2-r2.ebuild
index 69a78b44c5dd..4756fbe0f4d3 100644
--- a/dev-lisp/cl-port/cl-port-1.0.1.2-r2.ebuild
+++ b/dev-lisp/cl-port/cl-port-1.0.1.2-r2.ebuild
@@ -1,10 +1,10 @@
-# 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-port/cl-port-1.0.1.2-r2.ebuild,v 1.4 2004/09/03 15:05:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-port/cl-port-1.0.1.2-r2.ebuild,v 1.5 2005/02/08 07:28:22 mkennedy Exp $
 
 inherit common-lisp eutils
 
-DEB_PV=2
+DEB_PV=3
 
 DESCRIPTION="Cross-implementation portability functions taken from the Common Lisp Object Code Collection"
 HOMEPAGE="http://www.sourceforge.net/projects/clocc/ http://packages.debian.org/unstable/devel/cl-port.html"
@@ -17,14 +17,14 @@ KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp
-	dev-lisp/cmucl-source"
+	virtual/commonlisp"
 
 CLPACKAGE=port
 
 src_unpack() {
 	unpack ${A}
-	epatch cl-port_${PV}-${DEB_PV}.diff
+	epatch cl-port_${PV}-${DEB_PV}.diff || die
+	epatch ${FILESDIR}/${PV}-cmucl-graystream-gentoo.patch || die
 }
 
 src_install() {
diff --git a/dev-lisp/cl-port/cl-port-1.0.1.2.ebuild b/dev-lisp/cl-port/cl-port-1.0.1.2.ebuild
deleted file mode 100644
index d038d68bc216..000000000000
--- a/dev-lisp/cl-port/cl-port-1.0.1.2.ebuild
+++ /dev/null
@@ -1,41 +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-port/cl-port-1.0.1.2.ebuild,v 1.3 2004/06/24 23:49:50 agriffis Exp $
-
-inherit common-lisp eutils
-
-DEB_PV=2
-
-DESCRIPTION="Cross-implementation portability functions taken from the Common Lisp Object Code Collection such as code for sockets, shell functions and paths."
-HOMEPAGE="http://www.sourceforge.net/projects/clocc/ http://packages.debian.org/unstable/devel/cl-port.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/c/cl-port/${PN}_${PV}.orig.tar.gz
-	http://ftp.debian.org/debian/pool/main/c/cl-port/cl-port_${PV}-${DEB_PV}.diff.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-lisp/common-lisp-controller
-	virtual/commonlisp"
-
-CLPACKAGE=port
-
-src_unpack() {
-	unpack ${A}
-	epatch cl-port_${PV}-${DEB_PV}.diff
-}
-
-src_install() {
-	common-lisp-install *.lisp *.asd
-	common-lisp-system-symlink
-	dodoc port.html
-}
-
-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-port/files/1.0.1.2-cmucl-graystream-gentoo.patch b/dev-lisp/cl-port/files/1.0.1.2-cmucl-graystream-gentoo.patch
new file mode 100644
index 000000000000..d83c1522a4b6
--- /dev/null
+++ b/dev-lisp/cl-port/files/1.0.1.2-cmucl-graystream-gentoo.patch
@@ -0,0 +1,28 @@
+diff -ur cl-port-1.0.1.2.orig/gray.lisp cl-port-1.0.1.2/gray.lisp
+--- cl-port-1.0.1.2.orig/gray.lisp	2005-02-08 01:10:30.557332299 -0600
++++ cl-port-1.0.1.2/gray.lisp	2005-02-08 01:16:49.032328495 -0600
+@@ -15,11 +15,7 @@
+   #-(or allegro clisp cmu lispworks sbcl)
+   (error 'not-implemented :proc "Gray streams")
+   #+clocc-lpn
+-  (require :port-ext (translate-logical-pathname "clocc:src;port;ext"))
+-  #+cmu
+-  (unless (ignore-errors (find-class 'ext:fundamental-input-stream))
+-    #+common-lisp-controller (require :cmucl-graystream)
+-    #-common-lisp-controller (load "library:subsystems/gray-streams-library")))
++  (require :port-ext (translate-logical-pathname "clocc:src;port;ext")))
+ 
+ (in-package #+allegro :excl
+             #+(and clisp      lisp=cl)  :ext
+Only in cl-port-1.0.1.2: gray.lisp~
+diff -ur cl-port-1.0.1.2.orig/port.asd cl-port-1.0.1.2/port.asd
+--- cl-port-1.0.1.2.orig/port.asd	2005-02-08 01:10:30.555332493 -0600
++++ cl-port-1.0.1.2/port.asd	2005-02-08 01:17:08.687388125 -0600
+@@ -15,4 +15,5 @@
+      (:file "path" :depends-on ("ext"))
+      (:file "proc" :depends-on ("ext"))
+      (:file "shell" :depends-on ("ext"))
+-     (:file "sys" :depends-on ("ext" "path"))))
++     (:file "sys" :depends-on ("ext" "path")))
++    :depends-on (#+cmu :cmucl-graystream))
+Only in cl-port-1.0.1.2: port.asd~
diff --git a/dev-lisp/cl-port/files/digest-cl-port-1.0.1.1 b/dev-lisp/cl-port/files/digest-cl-port-1.0.1.1
deleted file mode 100644
index bcdd94e9b999..000000000000
--- a/dev-lisp/cl-port/files/digest-cl-port-1.0.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e78d66ede3ab2264acef4839679ea3e cl-port_1.0.1.1.orig.tar.gz 20399
diff --git a/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2 b/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2
deleted file mode 100644
index 90d962c89838..000000000000
--- a/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 572b1fc1cf15001d793cbd6b709d7c63 cl-port_1.0.1.2.orig.tar.gz 20367
-MD5 71d31c54915e7b2378c93e877ae58885 cl-port_1.0.1.2-2.diff.gz 2673
diff --git a/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2-r1 b/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2-r1
deleted file mode 100644
index 90d962c89838..000000000000
--- a/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 572b1fc1cf15001d793cbd6b709d7c63 cl-port_1.0.1.2.orig.tar.gz 20367
-MD5 71d31c54915e7b2378c93e877ae58885 cl-port_1.0.1.2-2.diff.gz 2673
diff --git a/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2-r2 b/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2-r2
index 90d962c89838..a38d807a0909 100644
--- a/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2-r2
+++ b/dev-lisp/cl-port/files/digest-cl-port-1.0.1.2-r2
@@ -1,2 +1,2 @@
 MD5 572b1fc1cf15001d793cbd6b709d7c63 cl-port_1.0.1.2.orig.tar.gz 20367
-MD5 71d31c54915e7b2378c93e877ae58885 cl-port_1.0.1.2-2.diff.gz 2673
+MD5 8e95f3035b34be058a7b8af60e763c42 cl-port_1.0.1.2-3.diff.gz 2829