Gentoo Archives: gentoo-commits

From: "José María Alonso" <nimiux@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/lisp:master commit in: dev-lisp/linedit/files/, dev-lisp/linedit/
Date: Mon, 28 May 2018 18:01:36
Message-Id: 1527530490.bf70061a93ecc9acfec2c99c564bb5b41d9343aa.nimiux@gentoo
1 commit: bf70061a93ecc9acfec2c99c564bb5b41d9343aa
2 Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 28 18:01:30 2018 +0000
4 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
5 CommitDate: Mon May 28 18:01:30 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=bf70061a
7
8 dev-lisp/linedit: Drop old version 0.17.0
9
10 .../0.17.0-linedit.asd-uffi-glue-gentoo.patch | 68 ----------------------
11 dev-lisp/linedit/linedit-0.17.0.ebuild | 61 -------------------
12 2 files changed, 129 deletions(-)
13
14 diff --git a/dev-lisp/linedit/files/0.17.0-linedit.asd-uffi-glue-gentoo.patch b/dev-lisp/linedit/files/0.17.0-linedit.asd-uffi-glue-gentoo.patch
15 deleted file mode 100644
16 index e4965029..00000000
17 --- a/dev-lisp/linedit/files/0.17.0-linedit.asd-uffi-glue-gentoo.patch
18 +++ /dev/null
19 @@ -1,68 +0,0 @@
20 -diff -Nur a/linedit.asd b/linedit.asd
21 ---- a/linedit.asd 2010-09-14 22:08:59.000000000 +0200
22 -+++ b/linedit.asd 2013-04-01 20:08:27.109977598 +0200
23 -@@ -24,40 +24,6 @@
24 -
25 - (in-package :linedit-system)
26 -
27 --(defvar *gcc* "/usr/bin/gcc")
28 --
29 --(defvar *gcc-options*
30 -- #-(or darwin macosx)
31 -- (list "-shared" "-fPIC")
32 -- #+(or darwin macosx)
33 -- (append
34 -- (list "-dynamic" "-bundle")
35 -- #+(or x86 x86-64)
36 -- (list "-arch" "x86_64" "-arch" "i386")
37 -- #-sbcl
38 -- (list "/usr/lib/bundle1.o" "-flat_namespace" "-undefined" "suppress")))
39 --
40 --;;; Separate class so that we don't mess up other packages
41 --(defclass uffi-c-source-file (c-source-file) ())
42 --
43 --(defmethod output-files ((o compile-op) (c uffi-c-source-file))
44 -- (list (make-pathname :name (component-name c)
45 -- :type #-(or darwin macosx) "so" #+(or darwin macosx) "dylib"
46 -- :defaults (component-pathname c))))
47 --
48 --(defmethod perform ((o load-op) (c uffi-c-source-file))
49 -- (let ((loader (intern (symbol-name '#:load-foreign-library) :uffi)))
50 -- (dolist (f (asdf::input-files o c))
51 -- (funcall loader f :module (pathname-name f)))))
52 --
53 --(defmethod perform ((o compile-op) (c uffi-c-source-file))
54 -- (unless (zerop (run-shell-command "~A ~A ~{~A ~}-o ~A"
55 -- *gcc*
56 -- (namestring (component-pathname c))
57 -- *gcc-options*
58 -- (namestring (car (output-files o c)))))
59 -- (error 'operation-error :component c :operation o)))
60 --
61 - (defsystem :linedit
62 - :version "0.17.0"
63 - :depends-on (:uffi :terminfo :osicat)
64 -@@ -69,10 +35,10 @@
65 - (:file "matcher" :depends-on ("packages"))
66 -
67 - ;; Backend
68 -- (:file "backend" :depends-on ("utility-macros"))
69 -- (:uffi-c-source-file "terminal_glue")
70 -+ (:file "uffi-loader" :depends-on ("packages"))
71 -+ (:file "backend" :depends-on ("utility-macros" "uffi-loader"))
72 - (:file "terminal-translations" :depends-on ("packages"))
73 -- (:file "terminal" :depends-on ("terminal-translations" "backend" "terminal_glue"))
74 -+ (:file "terminal" :depends-on ("terminal-translations" "backend" "uffi-loader"))
75 - (:file "smart-terminal" :depends-on ("terminal" "matcher"))
76 - (:file "dumb-terminal" :depends-on ("terminal"))
77 -
78 -@@ -81,8 +47,7 @@
79 - (:file "line" :depends-on ("utility-macros"))
80 - (:file "buffer" :depends-on ("utility-macros"))
81 - (:file "command-keys" :depends-on ("packages"))
82 -- (:uffi-c-source-file "signals")
83 -- (:file "editor" :depends-on ("backend" "rewindable" "signals"
84 -+ (:file "editor" :depends-on ("backend" "rewindable"
85 - "line" "buffer" "command-keys"))
86 - (:file "main" :depends-on ("editor"))
87 - (:file "complete" :depends-on ("utility-macros"))
88
89 diff --git a/dev-lisp/linedit/linedit-0.17.0.ebuild b/dev-lisp/linedit/linedit-0.17.0.ebuild
90 deleted file mode 100644
91 index 1a97e8f6..00000000
92 --- a/dev-lisp/linedit/linedit-0.17.0.ebuild
93 +++ /dev/null
94 @@ -1,61 +0,0 @@
95 -# Copyright 1999-2018 Gentoo Foundation
96 -# Distributed under the terms of the GNU General Public License v2
97 -
98 -EAPI=6
99 -
100 -inherit common-lisp-3 eutils flag-o-matic multilib toolchain-funcs
101 -
102 -MY_P="${PN}_${PV}"
103 -
104 -DESCRIPTION="Linedit is a readline-style library written in Common Lisp."
105 -HOMEPAGE="http://www.common-lisp.net/project/linedit/"
106 -SRC_URI="http://common-lisp.net/project/${PN}/files/${MY_P}.tar.gz"
107 -
108 -LICENSE="MIT"
109 -SLOT="0"
110 -KEYWORDS="~amd64 ~ppc ~sparc ~x86"
111 -IUSE=""
112 -
113 -RDEPEND="dev-lisp/osicat
114 - dev-lisp/terminfo
115 - dev-lisp/uffi"
116 -
117 -S="${WORKDIR}/${MY_P}"
118 -
119 -@cc() {
120 - local cc=$(tc-getCC)
121 - echo "${cc}" "${@}"
122 - "${cc}" "${@}"
123 -}
124 -
125 -create_uffi_loader() {
126 - cat > uffi-loader.lisp <<-EOF
127 - ;;;; -*- mode: lisp; syntax: common-lisp; indent-tabs-mode: nil; base: 10; package: linedit -*-
128 - (in-package :linedit)
129 -
130 - (uffi:load-foreign-library #p"/usr/$(get_libdir)/linedit/signals.so")
131 - (uffi:load-foreign-library #p"/usr/$(get_libdir)/linedit/terminal_glue.so")
132 - EOF
133 -}
134 -
135 -src_prepare() {
136 - default
137 - eapply "${FILESDIR}"/${PV}-${PN}.asd-uffi-glue-gentoo.patch
138 - create_uffi_loader
139 -}
140 -
141 -src_compile() {
142 - strip-flags
143 - for filename in signals terminal_glue ; do
144 - @cc "${filename}.c" ${CFLAGS} ${LDFLAGS} \
145 - -fPIC -DPIC -shared -Wl,-soname="${filename}" -o "${filename}.so" \
146 - || die "Cannot compile ${filename}.c"
147 - done
148 -}
149 -
150 -src_install() {
151 - common-lisp-install-sources -t all *.lisp version.lisp-expr
152 - common-lisp-install-asdf
153 - exeinto "/usr/$(get_libdir)/${PN}"
154 - doexe *.so
155 -}