Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/lisp:master commit in: dev-lisp/linedit/files/, dev-lisp/linedit/
Date: Sat, 02 Apr 2022 15:35:02
Message-Id: 1648911740.fe2a32c0de09b784bac448ce8389b1aa4f4a4558.ulm@gentoo
1 commit: fe2a32c0de09b784bac448ce8389b1aa4f4a4558
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 2 15:02:20 2022 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 2 15:02:20 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=fe2a32c0
7
8 dev-lisp/linedit: Remove old
9
10 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
11
12 .../0.17.5-linedit.asd-drop-madeira-port.patch | 21 --------
13 .../files/0.17.5-linedit.asd-uffi-glue.patch | 58 --------------------
14 dev-lisp/linedit/linedit-0.17.5.ebuild | 62 ----------------------
15 3 files changed, 141 deletions(-)
16
17 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
18 deleted file mode 100644
19 index a6576ec9..00000000
20 --- a/dev-lisp/linedit/files/0.17.5-linedit.asd-drop-madeira-port.patch
21 +++ /dev/null
22 @@ -1,21 +0,0 @@
23 -diff -Nuar a/linedit.asd b/linedit.asd
24 ---- a/linedit.asd 2017-10-16 23:10:11.424173773 +0200
25 -+++ b/linedit.asd 2017-10-16 23:10:48.764173614 +0200
26 -@@ -30,7 +30,6 @@
27 - :licence "MIT"
28 - :author "Nikodemus Siivola <nikodemus@××××××××××××.net>"
29 - :depends-on (:uffi :terminfo :osicat :alexandria)
30 -- :defsystem-depends-on (:madeira-port)
31 - :components
32 - (
33 - ;; Common
34 -@@ -60,6 +59,6 @@
35 - (:module "ports"
36 - :depends-on ("main")
37 - :components
38 -- ((:madeira-port "sbcl" :when :sbcl)
39 -- (:madeira-port "ccl" :when :ccl)
40 -- (:madeira-port "generic" :unless (:or :sbcl :ccl))))))
41 -+ ((:file "sbcl" :if-feature :sbcl)
42 -+ (:file "ccl" :if-feature :ccl)
43 -+ (:file "generic" :if-feature (:not (:or :sbcl :ccl)))))))
44
45 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
46 deleted file mode 100644
47 index fbbd38da..00000000
48 --- a/dev-lisp/linedit/files/0.17.5-linedit.asd-uffi-glue.patch
49 +++ /dev/null
50 @@ -1,58 +0,0 @@
51 -diff -Nuar a/linedit.asd b/linedit.asd
52 ---- a/linedit.asd 2015-06-24 00:10:05.000000000 +0200
53 -+++ b/linedit.asd 2017-10-16 21:17:13.314174329 +0200
54 -@@ -24,40 +24,6 @@
55 -
56 - (in-package :linedit-system)
57 -
58 --(defvar *gcc* "/usr/bin/gcc")
59 --
60 --(defvar *gcc-options*
61 -- #-(or darwin macosx)
62 -- (list "-shared" "-fPIC")
63 -- #+(or darwin macosx)
64 -- (append
65 -- (list "-dynamic" "-bundle")
66 -- #+(or x86 x86-64)
67 -- (list "-arch" "x86_64" "-arch" "i386")
68 -- #-sbcl
69 -- (list "/usr/lib/bundle1.o" "-flat_namespace" "-undefined" "suppress")))
70 --
71 --;;; Separate class so that we don't mess up other packages
72 --(defclass uffi-c-source-file (c-source-file) ())
73 --
74 --(defmethod output-files ((o compile-op) (c uffi-c-source-file))
75 -- (list (make-pathname :name (component-name c)
76 -- :type #-(or darwin macosx) "so" #+(or darwin macosx) "dylib"
77 -- :defaults (component-pathname c))))
78 --
79 --(defmethod perform ((o load-op) (c uffi-c-source-file))
80 -- (let ((loader (intern (symbol-name '#:load-foreign-library) :uffi)))
81 -- (dolist (f (asdf::input-files o c))
82 -- (funcall loader f :module (pathname-name f)))))
83 --
84 --(defmethod perform ((o compile-op) (c uffi-c-source-file))
85 -- (unless (zerop (run-shell-command "~S ~S ~{~S ~}-o ~S"
86 -- *gcc*
87 -- (namestring (component-pathname c))
88 -- *gcc-options*
89 -- (namestring (car (output-files o c)))))
90 -- (error 'operation-error :component c :operation o)))
91 --
92 - (defsystem :linedit
93 - :version "0.17.5"
94 - :description "Readline-style library."
95 -@@ -74,10 +40,10 @@
96 - (:file "matcher" :depends-on ("packages"))
97 -
98 - ;; Backend
99 -- (:file "backend" :depends-on ("utility-macros"))
100 -- (:uffi-c-source-file "terminal_glue")
101 -+ (:file "uffi-loader" :depends-on ("packages"))
102 -+ (:file "backend" :depends-on ("utility-macros" "uffi-loader"))
103 - (:file "terminal-translations" :depends-on ("packages"))
104 -- (:file "terminal" :depends-on ("terminal-translations" "backend" "terminal_glue"))
105 -+ (:file "terminal" :depends-on ("terminal-translations" "backend" "uffi-loader"))
106 - (:file "smart-terminal" :depends-on ("terminal" "matcher"))
107 - (:file "dumb-terminal" :depends-on ("terminal"))
108 -
109
110 diff --git a/dev-lisp/linedit/linedit-0.17.5.ebuild b/dev-lisp/linedit/linedit-0.17.5.ebuild
111 deleted file mode 100644
112 index a13ea021..00000000
113 --- a/dev-lisp/linedit/linedit-0.17.5.ebuild
114 +++ /dev/null
115 @@ -1,62 +0,0 @@
116 -# Copyright 1999-2018 Gentoo Foundation
117 -# Distributed under the terms of the GNU General Public License v2
118 -
119 -EAPI=6
120 -
121 -inherit common-lisp-3 eutils flag-o-matic multilib toolchain-funcs
122 -
123 -DESCRIPTION="Linedit is a readline-style library written in Common Lisp."
124 -HOMEPAGE="http://www.common-lisp.net/project/linedit/"
125 -SRC_URI="mirror://gentoo/${P}.tar.gz"
126 -
127 -LICENSE="MIT"
128 -SLOT="0"
129 -KEYWORDS="~amd64 ~ppc ~sparc ~x86"
130 -IUSE=""
131 -
132 -RDEPEND="dev-lisp/alexandria
133 - dev-lisp/osicat
134 - dev-lisp/terminfo
135 - dev-lisp/uffi"
136 -
137 -HTML_DOCS=( public_html/. )
138 -
139 -@cc() {
140 - local cc=$(tc-getCC)
141 - echo "${cc}" "${@}"
142 - "${cc}" "${@}"
143 -}
144 -
145 -create_uffi_loader() {
146 - cat > uffi-loader.lisp <<-EOF
147 - ;;;; -*- mode: lisp; syntax: common-lisp; indent-tabs-mode: nil; base: 10; package: linedit -*-
148 - (in-package :linedit)
149 -
150 - (uffi:load-foreign-library #p"/usr/$(get_libdir)/linedit/signals.so")
151 - (uffi:load-foreign-library #p"/usr/$(get_libdir)/linedit/terminal_glue.so")
152 - EOF
153 -}
154 -
155 -src_prepare() {
156 - # terminfo lives in a separate package
157 - rm "${S}"/terminfo.* || die
158 - eapply "${FILESDIR}"/${PV}-${PN}.asd-uffi-glue.patch
159 - eapply "${FILESDIR}"/${PV}-${PN}.asd-drop-madeira-port.patch
160 - create_uffi_loader
161 - eapply_user
162 -}
163 -
164 -src_compile() {
165 - strip-flags
166 - @cc "terminal_glue.c" ${CFLAGS} ${LDFLAGS} \
167 - -fPIC -DPIC -shared -Wl,-soname="terminal_glue" -o "terminal_glue.so" \
168 - || die
169 -}
170 -
171 -src_install() {
172 - common-lisp-install-sources -t all *.lisp ports/
173 - common-lisp-install-asdf
174 - einstalldocs
175 - exeinto "/usr/$(get_libdir)/${PN}"
176 - doexe *.so
177 -}