From 0ea72faa4e448356665bab3d679d71e0958963aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 11 Jan 2010 00:23:12 +0100
Subject: [PATCH] Make `(ice-9 deprecated)' a module of its own.

* module/ice-9/boot-9.scm: Load `deprecated.scm' with
  `resolve-interface' instead of `primitive-load-path'.

* module/ice-9/deprecated.scm: Turned into a module, `(ice-9
  deprecated)'.
---
 module/ice-9/boot-9.scm     |  2 +-
 module/ice-9/deprecated.scm | 33 +++++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 588673ecd..32b7f6290 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -3549,7 +3549,7 @@ module '(ice-9 q) '(make-q q-length))}."
    (provided? sym)))
 
 (begin-deprecated
- (primitive-load-path "ice-9/deprecated"))
+ (module-use! the-scm-module (resolve-interface '(ice-9 deprecated))))
 
 
 
diff --git a/module/ice-9/deprecated.scm b/module/ice-9/deprecated.scm
index 0d632b2c8..0f2617153 100644
--- a/module/ice-9/deprecated.scm
+++ b/module/ice-9/deprecated.scm
@@ -1,4 +1,4 @@
-;;;; Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
+;;;; Copyright (C) 2003, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -15,11 +15,35 @@
 ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;;;;
 
+(define-module (ice-9 deprecated)
+  #:export (substring-move-left! substring-move-right!
+            dynamic-maybe-call dynamic-maybe-link
+            try-module-linked try-module-dynamic-link
+            list* eval-case unmemoize-expr
+            $asinh
+            $acosh
+            $atanh
+            $sqrt
+            $abs
+            $exp
+            $log
+            $sin
+            $cos
+            $tan
+            $asin
+            $acos
+            $atan
+            $sinh
+            $cosh
+            $tanh
+            closure?))
+
 ;;;; Deprecated definitions.
 
 (define substring-move-left! substring-move!)
 (define substring-move-right! substring-move!)
 
+
 ;; This method of dynamically linking Guile Extensions is deprecated.
 ;; Use `load-extension' explicitly from Scheme code instead.
 
@@ -162,13 +186,11 @@
   (and (find-and-link-dynamic-module module-name)
        (init-dynamic-module module-name)))
 
+
 (define (list* . args)
   (issue-deprecation-warning "'list*' is deprecated.  Use 'cons*' instead.")
   (apply cons* args))
 
-;; The strange prototype system for uniform arrays has been
-;; deprecated.
-
 (define-macro (eval-case . clauses)
   (issue-deprecation-warning
    "`eval-case' is deprecated.  Use `eval-when' instead.")
@@ -186,6 +208,8 @@
    (else
     `(begin))))
 
+;; The strange prototype system for uniform arrays has been
+;; deprecated.
 (read-hash-extend
  #\y
  (lambda (c port)
@@ -224,6 +248,7 @@
 (define ($sinh z) (sinh z))
 (define ($cosh z) (cosh z))
 (define ($tanh z) (tanh z))
+
 (define (closure? x)
   (issue-deprecation-warning
    "`closure?' is deprecated. Use `procedure?' instead.")