pull from git

2 files changed, 18 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 019498beb660..e7c2eb7711fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,54 +1,15 @@
 pkgbase = emacs-icicles
 	pkgdesc = an emacs library that enhances minibuffer completion
-	pkgver = 2020.01.04
-	pkgrel = 6
-	epoch = 1
-	url = http://www.emacswiki.org/emacs/Icicles
+	pkgver = 2018.10.15
+	pkgrel = 1
+	epoch = 2
+	url = https://github.com/emacsmirror/icicles.git
 	arch = any
 	license = GPL
-	makedepends = wget
+	makedepends = git
 	depends = emacs-bookmarkplus
 	depends = emacs-hexrgb
-	source = https://www.emacswiki.org/emacs/download/icicles.el
-	source = https://www.emacswiki.org/emacs/download/icicles-cmd1.el
-	source = https://www.emacswiki.org/emacs/download/icicles-cmd2.el
-	source = https://www.emacswiki.org/emacs/download/icicles-face.el
-	source = https://www.emacswiki.org/emacs/download/icicles-fn.el
-	source = https://www.emacswiki.org/emacs/download/icicles-mac.el
-	source = https://www.emacswiki.org/emacs/download/icicles-mcmd.el
-	source = https://www.emacswiki.org/emacs/download/icicles-mode.el
-	source = https://www.emacswiki.org/emacs/download/icicles-opt.el
-	source = https://www.emacswiki.org/emacs/download/icicles-var.el
-	source = https://www.emacswiki.org/emacs/download/col-highlight.el
-	source = https://www.emacswiki.org/emacs/download/crosshairs.el
-	source = https://www.emacswiki.org/emacs/download/doremi.el
-	source = https://www.emacswiki.org/emacs/download/ring+.el
-	source = https://www.emacswiki.org/emacs/download/hl-line+.el
-	source = https://www.emacswiki.org/emacs/download/icicles-chg.el
-	source = https://www.emacswiki.org/emacs/download/icicles-doc1.el
-	source = https://www.emacswiki.org/emacs/download/icicles-doc2.el
-	source = https://www.emacswiki.org/emacs/download/icomplete+.el
-	source = https://raw.githubusercontent.com/bnbeckwith/bnb-emacs-original/master/lacarte.el
-	sha256sums = 5cb22c855d1311c08f09ab865b5278a3813a8edb877dc5d06ed432d7f3e721ee
-	sha256sums = 1bf0c57fdf06a521fd108bcdc664a93e4b92d6d170b7c871c1f168214d8d0834
-	sha256sums = 46201a9aa47624549a60f85b138d4c4cb36bd330bbe66e219f120615c03dd562
-	sha256sums = abe567f98910afb917824930612ec505cf562f81aa5666a70d6cea54cf6f6b7e
-	sha256sums = 7792d39f8aa0967f58d1e702e931f9e1fd06b087da5f36a82005cad8848ab7fb
-	sha256sums = c4bb7f53e9b0ea58b5e5c2239f6a64a184c59cd18a402c8589daa124ac85bd76
-	sha256sums = 4c5dbbf0b07b130aae4e4aa602c6824351a9d5752188b51b43775802dfbc2eda
-	sha256sums = a5cdccc19ab54f9434a8e11f0755730ea4c5ab1fb21182e37bf521d3b9b5abbf
-	sha256sums = c719dad189828d888bcb052bd5c2f37969bff2a23de9d831032e1c8dd5073354
-	sha256sums = 2645f4c1f82d89646f443545d26487fe6ca588bdf1eb766aac7a98e035c357db
-	sha256sums = 3384917280c34759199f3ef6f9538a1380390b97624212f1bfc6c8b26b544859
-	sha256sums = 8f6211f6daeb80b1cee886b015d4bfc20c367da42654a6d6fe7c10e0f3d86200
-	sha256sums = 559f2e22bde92b5f1dc0d5595c0fd65db80fec92a8a58a414e13237b15a2dc12
-	sha256sums = 1511dd455ea7304d652a5c74f96c832bd4edbec8059fd1f72936976438a23457
-	sha256sums = f87478240b50b2d92f413ef80bbac31dc9751713f6e91298f9c1440495ac3333
-	sha256sums = 0a40d6a7e8387e021806d1a91d1d652da0c03cd84d9ba513ecb8f963ead5399b
-	sha256sums = d96fc7b00b458dc474938da46a239debd143e60b2bd43da92a79ff8f9d85d2d2
-	sha256sums = 5eb32ec4fc4fcaea69493c71b56fb4ff49b17463a0c7b9ddbb7217f17635ad91
-	sha256sums = 2ada538c479057f27487fbdf91d026365d6fc781b8cdc35bc9fe70c87398b926
-	sha256sums = 711f49803e9f74e4ddda7de8e470b5f83de3a0ab7c57b6d250db186701e99989
+	source = git+https://github.com/emacsmirror/icicles.git#commit=9e9c37d2a54771c635d00d1fe171cef5eab4d95d
+	sha256sums = SKIP
 
 pkgname = emacs-icicles
-
diff --git a/PKGBUILD b/PKGBUILD
index 6ef8fcdf84c8..9904035fdc6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,66 +2,31 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
  
 pkgname=emacs-icicles
-epoch=1
-pkgver=2020.01.04 # Taken from icicles.el
-pkgrel=6
+epoch=2
+pkgver=2018.10.15 # Taken from icicles.el
+pkgrel=1
 pkgdesc="an emacs library that enhances minibuffer completion"
 arch=('any')
-url="http://www.emacswiki.org/emacs/Icicles"
+url="https://github.com/emacsmirror/icicles.git"
 depends=('emacs-bookmarkplus' 'emacs-hexrgb')
 license=('GPL')
-makedepends=('wget')
+makedepends=('git')
 _base_url=https://www.emacswiki.org/emacs/download/
-source=("${_base_url}icicles.el" \
-	  "${_base_url}icicles-cmd1.el" \
-	  "${_base_url}icicles-cmd2.el" \
-	  "${_base_url}icicles-face.el" \
-	  "${_base_url}icicles-fn.el" \
-	  "${_base_url}icicles-mac.el" \
-	  "${_base_url}icicles-mcmd.el" \
-	  "${_base_url}icicles-mode.el" \
-	  "${_base_url}icicles-opt.el" \
-	  "${_base_url}icicles-var.el" \
-	  "${_base_url}col-highlight.el" \
-	  "${_base_url}crosshairs.el" \
-	  "${_base_url}doremi.el" \
-	  "${_base_url}ring+.el" \
-	  "${_base_url}hl-line+.el" \
-	  "${_base_url}icicles-chg.el" \
-	  "${_base_url}icicles-doc1.el" \
-	  "${_base_url}icicles-doc2.el" \
-	  "${_base_url}icomplete+.el" \
-	  "https://raw.githubusercontent.com/bnbeckwith/bnb-emacs-original/master/lacarte.el")
-sha256sums=('5cb22c855d1311c08f09ab865b5278a3813a8edb877dc5d06ed432d7f3e721ee'
-            '1bf0c57fdf06a521fd108bcdc664a93e4b92d6d170b7c871c1f168214d8d0834'
-            '46201a9aa47624549a60f85b138d4c4cb36bd330bbe66e219f120615c03dd562'
-            'abe567f98910afb917824930612ec505cf562f81aa5666a70d6cea54cf6f6b7e'
-            '7792d39f8aa0967f58d1e702e931f9e1fd06b087da5f36a82005cad8848ab7fb'
-            'c4bb7f53e9b0ea58b5e5c2239f6a64a184c59cd18a402c8589daa124ac85bd76'
-            '4c5dbbf0b07b130aae4e4aa602c6824351a9d5752188b51b43775802dfbc2eda'
-            'a5cdccc19ab54f9434a8e11f0755730ea4c5ab1fb21182e37bf521d3b9b5abbf'
-            'c719dad189828d888bcb052bd5c2f37969bff2a23de9d831032e1c8dd5073354'
-            '2645f4c1f82d89646f443545d26487fe6ca588bdf1eb766aac7a98e035c357db'
-            '3384917280c34759199f3ef6f9538a1380390b97624212f1bfc6c8b26b544859'
-            '8f6211f6daeb80b1cee886b015d4bfc20c367da42654a6d6fe7c10e0f3d86200'
-            '559f2e22bde92b5f1dc0d5595c0fd65db80fec92a8a58a414e13237b15a2dc12'
-            '1511dd455ea7304d652a5c74f96c832bd4edbec8059fd1f72936976438a23457'
-            'f87478240b50b2d92f413ef80bbac31dc9751713f6e91298f9c1440495ac3333'
-            '0a40d6a7e8387e021806d1a91d1d652da0c03cd84d9ba513ecb8f963ead5399b'
-            'd96fc7b00b458dc474938da46a239debd143e60b2bd43da92a79ff8f9d85d2d2'
-            '5eb32ec4fc4fcaea69493c71b56fb4ff49b17463a0c7b9ddbb7217f17635ad91'
-            '2ada538c479057f27487fbdf91d026365d6fc781b8cdc35bc9fe70c87398b926'
-            '711f49803e9f74e4ddda7de8e470b5f83de3a0ab7c57b6d250db186701e99989')
+source=("git+https://github.com/emacsmirror/icicles.git#commit=9e9c37d2a54771c635d00d1fe171cef5eab4d95d")
+sha256sums=('SKIP')
 
 pkgver() {
+  cd icicles
   echo $(awk '/Version/ {print $3}' icicles.el) 
 }
 
 build() {
+  cd icicles
   emacs -Q -batch -L . -f batch-byte-compile *.el || true
 }
 
 package() {
+  cd icicles
   install -d  "$pkgdir"/usr/share/emacs/site-lisp/
-  cp -r "$srcdir"/*{.el,.elc} "$pkgdir"/usr/share/emacs/site-lisp/
+  cp -r *{.el,.elc} "$pkgdir"/usr/share/emacs/site-lisp/
 }