remove hacks

1 files changed, 19 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7d4f331626bc..9e93f1e02946 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=emacs-sly-git
-pkgver=1.0.0.beta.379.g83c88318
+pkgver=1.0.0.beta.498.gc338f22c
 pkgrel=1
 pkgdesc="Common Lisp IDE for Emacs. Fork of slime."
 arch=('any')
@@ -9,39 +9,38 @@ url="https://github.com/capitaomorte/sly"
 license=('custom')
 depends=('emacs' 'gawk')
 makedepends=('git')
-provides=('sly')
-conflicts=('sly')
+provides=('sly' 'emacs-sly')
+conflicts=('sly' 'emacs-sly')
 source=("emacs-sly::git+https://github.com/capitaomorte/sly.git")
 md5sums=('SKIP')
-_gitname="emacs-sly"
 options=('!makeflags')
 
 pkgver() {
-  cd "$srcdir"/"$_gitname"
+  cd ${pkgname%-git}
   echo $(git describe --tags | sed 's|-|.|g')
 }
 
-prepare () {
-  cd "$srcdir"/"$_gitname"/contrib
-  # some files cannot be byte-compiled
-  mv sly-fancy.el doof1
-  mv sly-stickers.el doof2
-}
+# prepare () {
+#   cd ${pkgname%-git}/contrib
+#   # some files cannot be byte-compiled
+#   mv sly-fancy.el doof1
+#   mv sly-stickers.el doof2
+# }
 
 build() {
-  cd "$srcdir"/"$_gitname"
+  cd ${pkgname%-git}
   make
   # reverting the prepare step to include the not byte-compiled files
-  cd contrib
-  mv doof1 sly-fancy.el
-  mv doof2 sly-stickers.el
+  # cd contrib
+  # mv doof1 sly-fancy.el
+  # mv doof2 sly-stickers.el
 }
 
 package() {
-  cd "$srcdir/$_gitname"
-  install -d $pkgdir/usr/share/emacs/site-lisp/sly
-  cp -r $srcdir/$_gitname/* \
-    $pkgdir/usr/share/emacs/site-lisp/sly
+  cd ${pkgname%-git}
+  install -d "$pkgdir"/usr/share/emacs/site-lisp/sly
+  cp -r "$srcdir"/${pkgname%-git}/* \
+    "$pkgdir"/usr/share/emacs/site-lisp/sly
   install -D -m644 README.md \
-    $pkgdir/usr/share/licenses/$pkgname/public_domain.txt 
+    "$pkgdir"/usr/share/licenses/$pkgname/public_domain.txt 
 }