[gentoo-commits] proj/lisp:master commit in: dev-lisp/linedit/, dev-lisp/linedit/files/

[José María Alonso]

commit: cdff442df5a8e313ac5c8c7b8ccfc141dab8abbb
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Mon Oct 16 21:18:24 2017 +
Commit: José María Alonso  gentoo  org>
CommitDate: Mon Oct 16 21:18:24 2017 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=cdff442d

dev-lisp/linedit: Drops live ebuild

 .../files/-linedit.asd-uffi-glue-gentoo.patch  | 20 ---
 dev-lisp/linedit/linedit-.ebuild   | 66 --
 2 files changed, 86 deletions(-)

diff --git a/dev-lisp/linedit/files/-linedit.asd-uffi-glue-gentoo.patch 
b/dev-lisp/linedit/files/-linedit.asd-uffi-glue-gentoo.patch
deleted file mode 100644
index 97dabc4d..
--- a/dev-lisp/linedit/files/-linedit.asd-uffi-glue-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nuar a/linedit.asd b/linedit.asd
 a/linedit.asd  2014-07-26 14:24:03.109913304 +0200
-+++ b/linedit.asd  2014-07-26 14:25:34.279912792 +0200
-@@ -75,10 +75,13 @@
-(:file "matcher" :depends-on ("packages"))
- 
-;; Backend
--   (:file "backend" :depends-on ("utility-macros"))
--   (:uffi-c-source-file "terminal_glue")
-+   ;(:file "backend" :depends-on ("utility-macros"))
-+   ;(:uffi-c-source-file "terminal_glue")
-+   (:file "uffi-loader" :depends-on ("packages"))
-+   (:file "backend" :depends-on ("utility-macros" "uffi-loader"))
-+ 
-(:file "terminal-translations" :depends-on ("packages"))
--   (:file "terminal" :depends-on ("terminal-translations" "backend" 
"terminal_glue"))
-+   (:file "terminal" :depends-on ("terminal-translations" "backend" 
"uffi-loader"))
-(:file "smart-terminal" :depends-on ("terminal" "matcher"))
-(:file "dumb-terminal" :depends-on ("terminal"))
- 

diff --git a/dev-lisp/linedit/linedit-.ebuild 
b/dev-lisp/linedit/linedit-.ebuild
deleted file mode 100644
index bccaff67..
--- a/dev-lisp/linedit/linedit-.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 flag-o-matic git-r3 multilib toolchain-funcs
-
-DESCRIPTION="Linedit is a readline-style library written in Common Lisp."
-HOMEPAGE="http://www.common-lisp.net/project/linedit/";
-EGIT_REPO_URI="https://gitlab.common-lisp.net/${PN}/${PN}.git";
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!dev-lisp/cl-${PN}
-   dev-lisp/alexandria
-   dev-lisp/madeira-port
-   >=dev-lisp/osicat-0.6.0
-   dev-lisp/terminfo
-   dev-lisp/uffi"
-
-CFILES="terminal_glue"
-
-@cc() {
-   local cc=$(tc-getCC)
-   echo "${cc}" "${@}"
-   "${cc}" "${@}"
-}
-
-create_uffi_loader() {
-   cat > uffi-loader.lisp <<-EOF
-    -*- mode: lisp; syntax: common-lisp; indent-tabs-mode: nil; base: 
10; package: linedit -*-
-   (in-package :linedit)
-
-   (uffi:load-foreign-library 
#p"/usr/$(get_libdir)/linedit/terminal_glue.so")
-   EOF
-}
-
-cleanup_terminfo_files() {
-   rm "${D}/${CLSOURCEROOT}/${PN}/terminfo.lisp" || die
-   rm "${D}/${CLSYSTEMROOT}/terminfo.asd" || die
-}
-
-src_prepare() {
-   default
-   eapply "${FILESDIR}"/${PV}-${PN}.asd-uffi-glue-gentoo.patch
-   create_uffi_loader
-}
-
-src_compile() {
-   strip-flags
-   for filename in "${CFILES}" ; do
-   @cc "${filename}.c" ${CFLAGS} ${LDFLAGS} \
-   -fPIC -DPIC -shared -Wl,-soname="${filename}" -o 
"${filename}.so" \
-   || die "Cannot compile ${filename}.c"
-   done
-}
-
-src_install() {
-   common-lisp-install-sources *.lisp ports/
-   common-lisp-install-asdf
-   cleanup_terminfo_files
-   exeinto "/usr/$(get_libdir)/${PN}"
-   doexe *.so
-}

[gentoo-commits] proj/lisp:master commit in: dev-lisp/linedit/, dev-lisp/linedit/files/

[José María Alonso]

commit: 6aa322fae7f3c46b013dea5c0942b6272b1a4fcb
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Mon Oct 16 21:16:10 2017 +
Commit: José María Alonso  gentoo  org>
CommitDate: Mon Oct 16 21:16:10 2017 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=6aa322fa

dev-lisp/linedit: Bumps version to 0.17.5

 .../0.17.5-linedit.asd-drop-madeira-port.patch | 21 
 .../files/0.17.5-linedit.asd-uffi-glue.patch   | 58 ++
 .../{linedit-.ebuild => linedit-0.17.5.ebuild} | 35 ++---
 dev-lisp/linedit/linedit-.ebuild   |  1 +
 4 files changed, 96 insertions(+), 19 deletions(-)

diff --git a/dev-lisp/linedit/files/0.17.5-linedit.asd-drop-madeira-port.patch 
b/dev-lisp/linedit/files/0.17.5-linedit.asd-drop-madeira-port.patch
new file mode 100644
index ..a6576ec9
--- /dev/null
+++ b/dev-lisp/linedit/files/0.17.5-linedit.asd-drop-madeira-port.patch
@@ -0,0 +1,21 @@
+diff -Nuar a/linedit.asd b/linedit.asd
+--- a/linedit.asd  2017-10-16 23:10:11.424173773 +0200
 b/linedit.asd  2017-10-16 23:10:48.764173614 +0200
+@@ -30,7 +30,6 @@
+   :licence "MIT"
+   :author "Nikodemus Siivola "
+   :depends-on (:uffi :terminfo :osicat :alexandria)
+-  :defsystem-depends-on (:madeira-port)
+   :components
+   (
+;; Common
+@@ -60,6 +59,6 @@
+(:module "ports"
+ :depends-on ("main")
+ :components
+-((:madeira-port "sbcl" :when :sbcl)
+- (:madeira-port "ccl" :when :ccl)
+- (:madeira-port "generic" :unless (:or :sbcl :ccl))
++((:file "sbcl" :if-feature :sbcl)
++(:file "ccl" :if-feature :ccl)
++(:file "generic" :if-feature (:not (:or :sbcl :ccl)))

diff --git a/dev-lisp/linedit/files/0.17.5-linedit.asd-uffi-glue.patch 
b/dev-lisp/linedit/files/0.17.5-linedit.asd-uffi-glue.patch
new file mode 100644
index ..fbbd38da
--- /dev/null
+++ b/dev-lisp/linedit/files/0.17.5-linedit.asd-uffi-glue.patch
@@ -0,0 +1,58 @@
+diff -Nuar a/linedit.asd b/linedit.asd
+--- a/linedit.asd  2015-06-24 00:10:05.0 +0200
 b/linedit.asd  2017-10-16 21:17:13.314174329 +0200
+@@ -24,40 +24,6 @@
+ 
+ (in-package :linedit-system)
+ 
+-(defvar *gcc* "/usr/bin/gcc")
+-
+-(defvar *gcc-options*
+-  #-(or darwin macosx)
+-  (list "-shared" "-fPIC")
+-  #+(or darwin macosx)
+-  (append
+-   (list "-dynamic"  "-bundle")
+-   #+(or x86 x86-64)
+-   (list "-arch" "x86_64" "-arch" "i386")
+-   #-sbcl
+-   (list "/usr/lib/bundle1.o" "-flat_namespace" "-undefined" "suppress")))
+-
+-;;; Separate class so that we don't mess up other packages
+-(defclass uffi-c-source-file (c-source-file) ())
+-
+-(defmethod output-files ((o compile-op) (c uffi-c-source-file))
+-  (list (make-pathname :name (component-name c)
+- :type #-(or darwin macosx) "so" #+(or darwin macosx) 
"dylib"
+- :defaults (component-pathname c
+-
+-(defmethod perform ((o load-op) (c uffi-c-source-file))
+-  (let ((loader (intern (symbol-name '#:load-foreign-library) :uffi)))
+-(dolist (f (asdf::input-files o c))
+-  (funcall loader f :module (pathname-name f)
+-
+-(defmethod perform ((o compile-op) (c uffi-c-source-file))
+-  (unless (zerop (run-shell-command "~S ~S ~{~S ~}-o ~S"
+-  *gcc*
+-  (namestring (component-pathname c))
+-  *gcc-options*
+-  (namestring (car (output-files o c)
+-(error 'operation-error :component c :operation o)))
+-
+ (defsystem :linedit
+   :version "0.17.5"
+   :description "Readline-style library."
+@@ -74,10 +40,10 @@
+(:file "matcher" :depends-on ("packages"))
+ 
+;; Backend
+-   (:file "backend" :depends-on ("utility-macros"))
+-   (:uffi-c-source-file "terminal_glue")
++   (:file "uffi-loader" :depends-on ("packages"))
++   (:file "backend" :depends-on ("utility-macros" "uffi-loader"))
+(:file "terminal-translations" :depends-on ("packages"))
+-   (:file "terminal" :depends-on ("terminal-translations" "backend" 
"terminal_glue"))
++   (:file "terminal" :depends-on ("terminal-translations" "backend" 
"uffi-loader"))
+(:file "smart-terminal" :depends-on ("terminal" "matcher"))
+(:file "dumb-terminal" :depends-on ("terminal"))
+ 

diff --git a/dev-lisp/linedit/linedit-.ebuild 
b/dev-lisp/linedit/linedit-0.17.5.ebuild
similarity index 55%
copy from dev-lisp/linedit/linedit-.ebuild
copy to dev-lisp/linedit/linedit-0.17.5.ebuild
index 01dcc0d7..c120ec65 100644
--- a/dev-lisp/linedit/linedit-.ebuild
+++ b/dev-lisp/linedit/linedit-0.17.5.ebuild
@@ -3,24 +3,23 @@
 
 EAPI=6
 
-inherit common-lisp-3 flag-o-matic git-r3 multilib toolchain-funcs
+inherit common-lisp-3 eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Linedit is a readline-style library written in Common Lisp."
 HOMEPAGE="http://www.common-lisp.net/project/linedit/";
-EGIT_REPO_URI="https://gitlab.common-lisp.net/${