Making the new closer-mop work for bknr.impex

Using closer-common-lisp for both bknr.impex and bknr.datastore now, as that is the intended way to use both cl and closer-mop

src/data/package.lisp

@@ -1,12 +1,12 @@
 (in-package :cl-user)
 
 (defpackage :bknr.datastore
-  (:use :cl :bknr.utils :cl-interpol :cl-ppcre
+  (:use :closer-common-lisp
+        :bknr.utils :cl-interpol :cl-ppcre
         :bknr.indices :bknr.statistics
-        :closer-mop :alexandria)
+        :alexandria)
   #+cmu
   (:shadowing-import-from :common-lisp #:subtypep #:typep)
-  (:shadowing-import-from :closer-mop defmethod defgeneric standard-generic-function)
   (:shadowing-import-from :cl-interpol quote-meta-chars)
   (:shadowing-import-from :bknr.indices array-index)
   #|  (:shadow :cl #:get-internal-run-time #:get-internal-real-time #:get-universal-time #:sleep) |#

src/xml-impex/package.lisp

@@ -1,12 +1,11 @@
 (in-package :cl-user)
 
 (defpackage :bknr.impex
-  (:use :cl
-	:cxml
-	:closer-mop
-	:bknr.utils
-	:bknr.xml
-	:bknr.indices)
+  (:use :cxml
+        :closer-common-lisp
+        :bknr.utils
+        :bknr.xml
+        :bknr.indices)
   #+cmu
   (:shadowing-import-from :common-lisp #:subtypep #:typep)