(Portage version: 2.0.51.19)

3 files changed, 52 insertions, 14 deletions

diff --git a/dev-lisp/cl-icu/ChangeLog b/dev-lisp/cl-icu/ChangeLog
index 09dfccbc58b4..6d808a64f31a 100644
--- a/dev-lisp/cl-icu/ChangeLog
+++ b/dev-lisp/cl-icu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lisp/cl-icu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-icu/ChangeLog,v 1.1 2005/01/11 16:53:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-icu/ChangeLog,v 1.2 2005/03/21 08:14:13 mkennedy Exp $
+
+  21 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  files/0.0_p11-gentoo.patch, cl-icu-0.0_p11.ebuild:
+  Keywording for ~amd64
+
+  23 Feb 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  files/0.0_p11-gentoo.patch, cl-icu-0.0_p11.ebuild:
+  Update for dev-libs/icu-3.2
 
 *cl-icu-0.0_p11 (11 Jan 2005)
 
diff --git a/dev-lisp/cl-icu/cl-icu-0.0_p11.ebuild b/dev-lisp/cl-icu/cl-icu-0.0_p11.ebuild
index 9dee09092d11..bd1371218b1e 100644
--- a/dev-lisp/cl-icu/cl-icu-0.0_p11.ebuild
+++ b/dev-lisp/cl-icu/cl-icu-0.0_p11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-icu/cl-icu-0.0_p11.ebuild,v 1.1 2005/01/11 16:53:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-icu/cl-icu-0.0_p11.ebuild,v 1.2 2005/03/21 08:14:13 mkennedy Exp $
 
 inherit common-lisp eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://common-lisp.net/project/bese/cl-icu.html"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 # ICU is not binary compatible between *minor* version releases because they
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND="dev-lisp/cl-uffi
 	dev-lisp/cl-arnesi
-	=dev-libs/icu-2.6*"
+	=dev-libs/icu-3.2*"
 
 CLPACKAGE=cl-icu
 
@@ -27,8 +27,8 @@ S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	local version=$(icu-config --version)
-	if [ "${version:0:3}" != "2.6" ]; then
-		die "dev-lisp/cl-icue is only compatible with =dev-libs/icu-2.6 (ICU ${version} was installed)"
+	if [ "${version:0:3}" != "3.2" ]; then
+		warn "Note: dev-lisp/cl-icu when used against versions other than ICU 3.2 may not work."
 	fi
 }
 
@@ -42,7 +42,8 @@ src_unpack() {
 src_install() {
 	dodir /usr/share/common-lisp/source/cl-icu
 	dodir /usr/share/common-lisp/systems
-	cp -R src ${D}/usr/share/common-lisp/source/cl-icu/
+	insinto /usr/share/common-lisp/source/cl-icu/
+	doins -r src
 	common-lisp-install cl-icu.asd
 	common-lisp-system-symlink
 	dosym /usr/share/common-lisp/source/cl-icu/cl-icu.asd \
diff --git a/dev-lisp/cl-icu/files/0.0_p11-gentoo.patch b/dev-lisp/cl-icu/files/0.0_p11-gentoo.patch
index 69cf6fd49350..58f03a1ef1a7 100644
--- a/dev-lisp/cl-icu/files/0.0_p11-gentoo.patch
+++ b/dev-lisp/cl-icu/files/0.0_p11-gentoo.patch
@@ -1,6 +1,6 @@
 diff -ur cl-icu--dev--0.0--patch-11.orig/src/calendar.lisp cl-icu--dev--0.0--patch-11/src/calendar.lisp
---- cl-icu--dev--0.0--patch-11.orig/src/calendar.lisp	2004-12-28 17:49:51.000000000 -0600
-+++ cl-icu--dev--0.0--patch-11/src/calendar.lisp	2005-01-11 09:50:02.000000000 -0600
+--- cl-icu--dev--0.0--patch-11.orig/src/calendar.lisp	2005-02-23 21:21:58.544789648 -0600
++++ cl-icu--dev--0.0--patch-11/src/calendar.lisp	2005-02-23 21:21:48.087379416 -0600
 @@ -49,7 +49,7 @@
    (make-date (ucal-getnow)))
  
@@ -10,9 +10,26 @@ diff -ur cl-icu--dev--0.0--patch-11.orig/src/calendar.lisp cl-icu--dev--0.0--pat
  
  (defmethod make-date ((millis double-float))
    (make-instance 'date :uobject millis))
+diff -ur cl-icu--dev--0.0--patch-11.orig/src/icu/ucal.lisp cl-icu--dev--0.0--patch-11/src/icu/ucal.lisp
+--- cl-icu--dev--0.0--patch-11.orig/src/icu/ucal.lisp	2005-02-23 21:21:58.549788888 -0600
++++ cl-icu--dev--0.0--patch-11/src/icu/ucal.lisp	2005-02-23 21:21:48.097377896 -0600
+@@ -228,13 +228,3 @@
+    (limit udate-limit-type)
+    (status (* UErrorCode)))
+   :returning :int)
+-
+-(def-icu-function "ucal_getAvailableTZIDs"
+-  ((rawOffset :int)
+-   (index :int)
+-   (status (* UErrorCode)))
+-  :returning (* UChar))
+-
+-(def-icu-function "ucal_countAvailableTZIDs"
+-  ((rawOffset :int))
+-  :returning :int)
 diff -ur cl-icu--dev--0.0--patch-11.orig/src/init-icu.lisp cl-icu--dev--0.0--patch-11/src/init-icu.lisp
---- cl-icu--dev--0.0--patch-11.orig/src/init-icu.lisp	2004-12-28 17:49:51.000000000 -0600
-+++ cl-icu--dev--0.0--patch-11/src/init-icu.lisp	2005-01-11 09:47:49.000000000 -0600
+--- cl-icu--dev--0.0--patch-11.orig/src/init-icu.lisp	2005-02-23 21:21:58.552788432 -0600
++++ cl-icu--dev--0.0--patch-11/src/init-icu.lisp	2005-02-23 21:21:48.139371512 -0600
 @@ -14,7 +14,7 @@
    "The namse of the libraries we need to load for ICU support.")
  
@@ -23,8 +40,8 @@ diff -ur cl-icu--dev--0.0--patch-11.orig/src/init-icu.lisp cl-icu--dev--0.0--pat
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 diff -ur cl-icu--dev--0.0--patch-11.orig/src/locale.lisp cl-icu--dev--0.0--patch-11/src/locale.lisp
---- cl-icu--dev--0.0--patch-11.orig/src/locale.lisp	2004-12-28 17:49:51.000000000 -0600
-+++ cl-icu--dev--0.0--patch-11/src/locale.lisp	2005-01-11 09:51:15.000000000 -0600
+--- cl-icu--dev--0.0--patch-11.orig/src/locale.lisp	2005-02-23 21:21:58.555787976 -0600
++++ cl-icu--dev--0.0--patch-11/src/locale.lisp	2005-02-23 21:21:48.139371512 -0600
 @@ -11,11 +11,7 @@
  
  (defun make-locale (id)
@@ -34,7 +51,19 @@ diff -ur cl-icu--dev--0.0--patch-11.orig/src/locale.lisp cl-icu--dev--0.0--patch
 -                                                       (string (map-into (make-string (length id))
 -                                                                         #'identity
 -                                                                         id))))))
-+                 :uobject id))
++                 :uobject (convert-to-foreign-string id)))
  
  (defun default-locale ()
    (make-instance 'locale :uobject (uloc-getDefault)))
+diff -ur cl-icu--dev--0.0--patch-11.orig/src/uffi-extras.lisp cl-icu--dev--0.0--patch-11/src/uffi-extras.lisp
+--- cl-icu--dev--0.0--patch-11.orig/src/uffi-extras.lisp	2005-02-23 21:21:58.558787520 -0600
++++ cl-icu--dev--0.0--patch-11/src/uffi-extras.lisp	2005-02-23 21:21:48.141371208 -0600
+@@ -2,7 +2,7 @@
+ 
+ (in-package :it.bese.cl-icu)
+ 
+-(defvar *icu-symbol-suffix* "_2_6")
++(defvar *icu-symbol-suffix* "_3_2")
+ 
+ (defmacro def-icu-function (name &rest def-function-args)
+   (destructuring-bind (c-name lisp-name)