Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/lpeg/files/, dev-lua/lpeg/
Date: Wed, 27 Jan 2021 20:19:34
Message-Id: 1611778762.e5da30592de7265e67f18a6c80f1f4bcb9ebefbe.conikost@gentoo
1 commit: e5da30592de7265e67f18a6c80f1f4bcb9ebefbe
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 27 20:19:22 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 27 20:19:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5da3059
7
8 dev-lua/lpeg: drop old version
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
12
13 dev-lua/lpeg/Manifest | 1 -
14 dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch | 37 -------------------
15 dev-lua/lpeg/lpeg-1.0.1.ebuild | 53 ---------------------------
16 dev-lua/lpeg/lpeg-1.0.2.ebuild | 53 ---------------------------
17 4 files changed, 144 deletions(-)
18
19 diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
20 index 6addf6c1ed1..ef58ad92dd6 100644
21 --- a/dev-lua/lpeg/Manifest
22 +++ b/dev-lua/lpeg/Manifest
23 @@ -1,2 +1 @@
24 -DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
25 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
26
27 diff --git a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
28 deleted file mode 100644
29 index a0be0558aa9..00000000000
30 --- a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
31 +++ /dev/null
32 @@ -1,37 +0,0 @@
33 ---- lpeg-0.12.1/makefile
34 -+++ lpeg-0.12.1/makefile
35 -@@ -1,7 +1,7 @@
36 - LIBNAME = lpeg
37 - LUADIR = ../lua/
38 -
39 --COPT = -O2
40 -+#COPT = -O2
41 - # COPT = -DLPEG_DEBUG -g
42 -
43 - CWARNS = -Wall -Wextra -pedantic \
44 -@@ -22,21 +22,21 @@
45 - # -Wunreachable-code \
46 -
47 -
48 --CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
49 -+CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
50 - CC = gcc
51 -
52 - FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
53 -
54 - # For Linux
55 - linux:
56 -- make lpeg.so "DLLFLAGS = -shared -fPIC"
57 -+ $(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
58 -
59 - # For Mac OS
60 - macosx:
61 -- make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
62 -+ $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
63 -
64 - lpeg.so: $(FILES)
65 -- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
66 -+ env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
67 -
68 - $(FILES): makefile
69 -
70
71 diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild
72 deleted file mode 100644
73 index 063616f2b42..00000000000
74 --- a/dev-lua/lpeg/lpeg-1.0.1.ebuild
75 +++ /dev/null
76 @@ -1,53 +0,0 @@
77 -# Copyright 1999-2020 Gentoo Authors
78 -# Distributed under the terms of the GNU General Public License v2
79 -
80 -EAPI=6
81 -
82 -inherit flag-o-matic toolchain-funcs
83 -
84 -DESCRIPTION="Parsing Expression Grammars for Lua"
85 -HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
86 -SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
87 -
88 -LICENSE="MIT"
89 -SLOT="0"
90 -KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
91 -IUSE="debug doc luajit"
92 -
93 -RDEPEND="
94 - !luajit? ( >=dev-lang/lua-5.1:0= )
95 - luajit? ( dev-lang/luajit:2= )"
96 -
97 -DEPEND="
98 - ${RDEPEND}
99 - virtual/pkgconfig"
100 -
101 -DOCS=( "HISTORY" )
102 -HTML_DOCS=( "lpeg.html" "re.html" )
103 -PATCHES=( "${FILESDIR}"/${PN}-0.12.1-makefile.patch )
104 -
105 -src_prepare() {
106 - default
107 - use debug && append-cflags -DLPEG_DEBUG
108 -}
109 -
110 -src_compile() {
111 - emake CC="$(tc-getCC)" \
112 - LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
113 -}
114 -
115 -src_test() {
116 - $(usex luajit 'luajit' 'lua') test.lua || die
117 -}
118 -
119 -src_install() {
120 - local instdir
121 - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
122 - exeinto "${instdir#${EPREFIX}}"
123 - doexe lpeg.so
124 - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
125 - insinto "${instdir#${EPREFIX}}"
126 - doins re.lua
127 -
128 - use doc && einstalldocs
129 -}
130
131 diff --git a/dev-lua/lpeg/lpeg-1.0.2.ebuild b/dev-lua/lpeg/lpeg-1.0.2.ebuild
132 deleted file mode 100644
133 index 3297c2ab4fa..00000000000
134 --- a/dev-lua/lpeg/lpeg-1.0.2.ebuild
135 +++ /dev/null
136 @@ -1,53 +0,0 @@
137 -# Copyright 1999-2020 Gentoo Authors
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI=7
141 -
142 -inherit flag-o-matic toolchain-funcs
143 -
144 -DESCRIPTION="Parsing Expression Grammars for Lua"
145 -HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
146 -SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
147 -
148 -LICENSE="MIT"
149 -SLOT="0"
150 -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
151 -IUSE="debug doc luajit"
152 -
153 -RDEPEND="
154 - !luajit? ( >=dev-lang/lua-5.1:0= )
155 - luajit? ( dev-lang/luajit:2= )"
156 -
157 -DEPEND="
158 - ${RDEPEND}
159 - virtual/pkgconfig"
160 -
161 -DOCS=( HISTORY )
162 -HTML_DOCS=( lpeg.html re.html )
163 -PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
164 -
165 -src_prepare() {
166 - default
167 - use debug && append-cflags -DLPEG_DEBUG
168 -}
169 -
170 -src_compile() {
171 - emake CC="$(tc-getCC)" \
172 - LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
173 -}
174 -
175 -src_test() {
176 - $(usex luajit 'luajit' 'lua') test.lua || die
177 -}
178 -
179 -src_install() {
180 - local instdir
181 - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
182 - exeinto "${instdir#${EPREFIX}}"
183 - doexe lpeg.so
184 - instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
185 - insinto "${instdir#${EPREFIX}}"
186 - doins re.lua
187 -
188 - use doc && einstalldocs
189 -}