Convert to PKGBUILD, replace cl-alexandria, new Git repo

3 files changed, 32 insertions, 139 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c64175e0a42b..67315a733e35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,11 @@
 pkgbase = cl-alexandria-git
-	pkgdesc = Common Lisp portability library
-	pkgver = r194.b1c6ee0
+	pkgdesc = A set of common-lisp help functions
+	pkgver = r237.3b849bc
 	pkgrel = 1
-	url = http://common-lisp.net/project/alexandria/
-	install = cl-alexandria.install
-	arch = i686
-	arch = x86_64
+	url = https://common-lisp.net/project/alexandria/
+	arch = any
 	license = custom
-	makedepends = git
-	depends = common-lisp
-	provides = cl-alexandria
-	conflicts = cl-alexandria-darcs
-	options = docs
-	source = git+https://github.com/keithj/alexandria.git
+	source = git+https://gitlab.common-lisp.net/alexandria/alexandria.git
 	md5sums = SKIP
 
 pkgname = cl-alexandria-git
diff --git a/PKGBUILD b/PKGBUILD
index 63121845d37a..3143e00b0466 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,33 @@
-# Maintainer:  mrshpot <mrshpot at gmail dot com>
-#Contributor:  Peter Mukhachev <rolling[dot]robot [shift-two] gmail [dot] com>
+# Maintainer: Julian DeMille <jtdemille@demilletech.net>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
-# 'alexandria' is taken by another app
 pkgname=cl-alexandria-git
-pkgver=r194.b1c6ee0
-pkgrel=1
-pkgdesc="Common Lisp portability library"
-arch=('i686' 'x86_64')
-url="http://common-lisp.net/project/alexandria/"
-license=('custom') # Public Domain
-provides=('cl-alexandria')
-conflicts=('cl-alexandria-darcs')
-depends=('common-lisp')
-makedepends=('git')
-install=cl-alexandria.install
-source=("git+https://github.com/keithj/alexandria.git")
-md5sums=("SKIP")
-options=(docs)
-
-_clname=alexandria
-
-_gitname="alexandria"
-
+_pkgname=${pkgname#cl-}
+_pkgname=${_pkgname%-git}
+pkgver=r237.3b849bc
 pkgver() {
-	cd ${_gitname}
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-	}
+  cd "$_pkgname"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+pkgrel=1
+pkgdesc="A set of common-lisp help functions"
+arch=('any')
+url="https://common-lisp.net/project/alexandria/"
+license=('custom')
+source=('git+https://gitlab.common-lisp.net/alexandria/alexandria.git')
+md5sums=('SKIP')
+replaces=cl-alexandria
 
 package() {
-
-    cat << EOM
-
-	WARNING!
-
-	You are about to build a pre-release package using a snapshot from a
-	repository. The resulting package may be unusable or pose a security
-	risk, since the install script does not check source file hashes. Do
-	not continue if this is undesirable.
-
-EOM
-
-	install -d ${pkgdir}/usr/share/common-lisp/source/${_clname}
-	install -d ${pkgdir}/usr/share/common-lisp/systems
-	install -d ${pkgdir}/usr/share/licenses/${_clname}
-
-	install -m 644 -t ${pkgdir}/usr/share/common-lisp/source/${_clname} \
-		${srcdir}/${_clname}/*.lisp
-	install -m 644 -t ${pkgdir}/usr/share/common-lisp/source/${_clname} \
-		${srcdir}/${_clname}/*.asd
-	install -m 644 -t ${pkgdir}/usr/share/licenses/${_clname} \
-		${srcdir}/${_clname}/LICENCE
-
-	cd ${pkgdir}/usr/share/common-lisp/systems
-	ln -s ../source/${_clname}/alexandria.asd .
-	ln -s ../source/${_clname}/alexandria-tests.asd .
+  cd ${_pkgname}
+  install -Dm644 LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENCE
+  install -d "$pkgdir"/usr/share/common-lisp/source/${_pkgname}
+  install -d "$pkgdir"/usr/share/common-lisp/systems
+  
+  install -m 644 -t "$pkgdir"/usr/share/common-lisp/source/${_pkgname} *.lisp
+  install -m 644 -t "$pkgdir"/usr/share/common-lisp/source/${_pkgname} *.asd
+
+  cd "$pkgdir"/usr/share/common-lisp/systems
+  ln -s ../source/${_pkgname}/${_pkgname}.asd .
+  ln -s ../source/${_pkgname}/${_pkgname}.asd $pkgname-unicode.asd
 }
diff --git a/cl-alexandria.install b/cl-alexandria.install
deleted file mode 100644
index 6e4abb69e54b..000000000000
--- a/cl-alexandria.install
+++ /dev/null
@@ -1,76 +0,0 @@
-# arg 1:  the new package version
-
-_pkgname=alexandria
-_compile_log=n
-_lisp=()
-
-if pacman -Qq clisp-new-clx &>/dev/null ||
-   pacman -Qq clisp-gtk2 &>/dev/null ||
-   pacman -Qq clisp-new-clx &>/dev/null; then
-    _lisp=(${_lisp[@]} 'clisp')
-fi
-if pacman -Qq sbcl &>/dev/null; then
-    _lisp=(${_lisp[@]} 'sbcl')
-fi
-if pacman -Qq cmucl &> /dev/null; then
-    _lisp=(${_lisp[@]} 'cmucl')
-fi
-
-_compile_sbcl() {
-    sbcl --noinform --no-sysinit --no-userinit \
-        --eval "(require :asdf)" \
-        --eval "(pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)" \
-        --eval "(asdf:operate 'asdf:compile-op '${_pkgname})" \
-        --eval "(quit)" &> ${_compile_log_file} || return 1
-}
-_compile_clisp() {
-    clisp --silent -norc -x \
-        "(load #p\"/usr/share/common-lisp/source/asdf/asdf\")
-        (pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)
-        (asdf:operate 'asdf:compile-op '${_pkgname})
-        (quit)" &> ${_compile_log_file} || return 1
-}
-_compile_cmucl() {
-    cmucl -quiet -nositeinit -noinit -eval \
-        "(load #p\"/usr/share/common-lisp/source/asdf/asdf\")
-        (pushnew #p\"/usr/share/common-lisp/systems/\" asdf:*central-registry* :test #'equal)
-        (asdf:operate 'asdf:compile-op '${_pkgname})
-        (quit)" &> ${_compile_log_file} || return 1
-}
-
-post_install() {
-    for _lispiter in ${_lisp[@]}; do
-        echo "---> Compiling lisp files using ${_lispiter} <---"
-        if [ $_compile_log = 'y' ]; then
-            _compile_log_file=/tmp/${_pkgname}_${_lispiter}.log
-        else
-            _compile_log_file=/dev/null
-        fi
-        _compile_${_lispiter}
-        echo "---> Done compiling lisp files (using ${_lispiter}) <---"
-    done
-
-    cat << EOM
-
-    To load this library, load asdf and then run the following lines
-    (or their equivalent for your lisp of choice):
-
-    (push #p"/usr/share/common-lisp/systems/" asdf:*central-registry*)
-    (asdf:operate 'asdf:load-op '${_pkgname})
-EOM
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    rm -f /usr/share/common-lisp/$_pkgname/{*.fas,*.fasl,*.lib,*.x86f}
-}
-
-op=$1
-shift
-
-$op $*
-
-# End of file