dev-lisp/rsm-string: bump to version 1.6

4 files changed, 28 insertions, 32 deletions

diff --git a/dev-lisp/rsm-string/Manifest b/dev-lisp/rsm-string/Manifest
index 3c6a2648..c1f68d27 100644
--- a/dev-lisp/rsm-string/Manifest
+++ b/dev-lisp/rsm-string/Manifest
@@ -1,3 +1,3 @@
-AUX 1.3-ftype-gentoo.patch 1196 RMD160 55518ddcac19c78809ef408f0b56c5d70312efb9 SHA1 a1b05201ce559380a425cd614177ee16db8ae66e SHA256 9397c40fc7048a41506aa9ac9a085c91f5e38e8be03c0d6793013cf079aa29b2
-DIST cl-rsm-string_1.3.tar.gz 8345 RMD160 22de7f03c9988348eab4d66eb382fcf467bb5614 SHA1 ca39d3f2ee149a63260c94829374d5788b09c5cb SHA256 8c29f1ac8908bc32dafdcb5ff159a4c6fa532541975efaf0cf0a625d48ebea7f
-EBUILD rsm-string-1.3.ebuild 645 RMD160 bdbac9e1d07f5a543678d6eda059063379cd226c SHA1 427d0257ecedb8d24e95ffa5b3f30280c918b5f1 SHA256 a046ee5915977abc5a3453df4f5a593e0bac9185d23bd6abc1472878b58af9d9
+AUX 1.6-gentoo-fix-ftype.patch 911 RMD160 516e549dc43d90b8dd5ca1855be887c314d57806 SHA1 7b681bdad98e667e358b8076b3b969ba658f2c8d SHA256 645069075311f3b5b62cd73d13f5d5e79347560a52263a3f15dda666329ac32d
+DIST cl-rsm-string_1.6.tar.gz 8186 RMD160 858ef1c78ebce91b648f007a0d22bc74b3716d9c SHA1 13695742ae3413158d092fb427dd0cc7d4c65f2f SHA256 ef51778c47d98ffb7d8f2e4902b8cfb5057c0feb08d8dba9c4b0be235fb651ce
+EBUILD rsm-string-1.6.ebuild 650 RMD160 dbda5a8dbc9b219a87f8a897738d7db7204e8f26 SHA1 47ab1f152259de9beaf5d8136c44543a4ee37f0e SHA256 fa41e58b54d4ea0996e8411f18552c9f0896874a60f26830cc882642ad108e5a
diff --git a/dev-lisp/rsm-string/files/1.3-ftype-gentoo.patch b/dev-lisp/rsm-string/files/1.3-ftype-gentoo.patch
deleted file mode 100644
index aae3b62e..00000000
--- a/dev-lisp/rsm-string/files/1.3-ftype-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Common subdirectories: cl-rsm-string-1.3.orig/debian and cl-rsm-string-1.3/debian
-Only in cl-rsm-string-1.3: package.x86f
-Only in cl-rsm-string-1.3: semantic.cache
-diff -u cl-rsm-string-1.3.orig/string.lisp cl-rsm-string-1.3/string.lisp
---- cl-rsm-string-1.3.orig/string.lisp	2003-10-22 21:35:29.000000000 -0500
-+++ cl-rsm-string-1.3/string.lisp	2004-08-06 23:02:18.627475008 -0500
-@@ -75,8 +75,7 @@
-                      (concatenate 'string s1 join-string s2)) str-list))))
- 
- 
--(declaim (ftype (function ((list string) (list string) 
--                                         &key function) list)
-+(declaim (ftype (function ((or list string) (or list string) &key (:function function)) list)
-                 contains))
- 
- (defun contains (str-list elem-list &key (contain-meaning #'some))
-@@ -92,9 +91,6 @@
-       collect str))
- 
- 
--(declaim (ftype (function (list string &key (:unique t)) list)
--                does-not-contain))
--
- (defun does-not-contain (str-list str-elems &key (unique nil))
-   "Return a list of strings from the string list, <str-list>, that do not
- contain any of the strings from the list of strings <str-elems.> If unique is
-Only in cl-rsm-string-1.3: string.lisp~
diff --git a/dev-lisp/rsm-string/files/1.6-gentoo-fix-ftype.patch b/dev-lisp/rsm-string/files/1.6-gentoo-fix-ftype.patch
new file mode 100644
index 00000000..c5b582d4
--- /dev/null
+++ b/dev-lisp/rsm-string/files/1.6-gentoo-fix-ftype.patch
@@ -0,0 +1,23 @@
+diff -Naur cl-rsm-string.orig/string.lisp cl-rsm-string/string.lisp
+--- cl-rsm-string.orig/string.lisp	2006-07-14 23:03:56.000000000 +0200
++++ cl-rsm-string/string.lisp	2008-12-16 01:48:55.000000000 +0100
+@@ -75,8 +75,8 @@
+                      (concatenate 'string s1 join-string s2)) str-list))))
+ 
+ 
+-(declaim (ftype (function ((list string) (list string) 
+-                                         &key (function t)) list)
++(declaim (ftype (function ((or list string) (or list string)
++                           &key (function t)) list)
+                 contains))
+ 
+ (defun contains (str-list elem-list &key (contain-meaning #'some))
+@@ -92,7 +92,7 @@
+       collect str))
+ 
+ 
+-(declaim (ftype (function (list string &key (:unique t)) list)
++(declaim (ftype (function (list list &key (:unique t)) list)
+                 does-not-contain))
+ 
+ (defun does-not-contain (str-list str-elems &key (unique nil))
diff --git a/dev-lisp/rsm-string/rsm-string-1.3.ebuild b/dev-lisp/rsm-string/rsm-string-1.6.ebuild
index 555d8708..61ab62c9 100644
--- a/dev-lisp/rsm-string/rsm-string-1.3.ebuild
+++ b/dev-lisp/rsm-string/rsm-string-1.6.ebuild
@@ -15,11 +15,11 @@ IUSE=""
 
 DEPEND="!dev-lisp/cl-${PN}"
 
-S="${WORKDIR}"/cl-${P}
+S="${WORKDIR}"/cl-${PN}
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/${PV}-ftype-gentoo.patch
+	epatch "${FILESDIR}"/${PV}-gentoo-fix-ftype.patch
 }
 
 src_install() {