Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/conf2struct/files/, dev-util/conf2struct/
Date: Wed, 04 Sep 2019 13:20:46
Message-Id: 1567603234.acfbdd45e61563b218e6dd4aebcb7a68d7434e63.candrews@gentoo
1 commit: acfbdd45e61563b218e6dd4aebcb7a68d7434e63
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 4 13:19:10 2019 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 4 13:20:34 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acfbdd45
7
8 dev-util/conf2struct: Cleanup old version
9
10 Package-Manager: Portage-2.3.75, Repoman-2.3.17
11 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
12
13 dev-util/conf2struct/Manifest | 1 -
14 dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild | 43 --------------------
15 .../files/conf2struct-0_pre0-cc-and-cflags.patch | 32 ---------------
16 .../files/conf2struct-0_pre0-dest-exists.patch | 21 ----------
17 .../files/conf2struct-0_pre0-destdir.patch | 47 ----------------------
18 .../conf2struct-0_pre0-install-and-uninstall.patch | 33 ---------------
19 .../conf2struct-0_pre0-install-not-run-all.patch | 22 ----------
20 7 files changed, 199 deletions(-)
21
22 diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
23 index 7a4049e5bb2..cd4a46a636d 100644
24 --- a/dev-util/conf2struct/Manifest
25 +++ b/dev-util/conf2struct/Manifest
26 @@ -1,2 +1 @@
27 -DIST conf2struct-0_pre0.tar.gz 50851 BLAKE2B 21db6cca56ba18a48c65395fbf3def5de6190515be46ca2e7113c17c9b874cdcc7fb72b06b586c57a1803e98b56df5decd10ea1dd6dcc4144a78d6a0ff6bf9dd SHA512 e0eb1d43ec1375e65796197c16246a2cc38e0a4d078c4028e8675cc1ff6ef08c7802ec18f57232d91f2d4133573129f7a2b05a9f1d8b74bbddd072550f846b1d
28 DIST conf2struct-1.0.tar.gz 57393 BLAKE2B 7de4be755ec764d96a321c68ca68b3156889e24f6894ba78b1c88cbeff84525331f1105040d61b1121ca01ece8d50a5aee2268eb73cde3ebbc8b62f679e2451b SHA512 31e8f350af740e79d97f4698dfec9b5e8a31a8a1cee30da0af753db26eda5b61379e9156e1cb492aef5068a4987d5e8202215323b83328e99705ae3ad3c09b81
29
30 diff --git a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
31 deleted file mode 100644
32 index 631e635694c..00000000000
33 --- a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
34 +++ /dev/null
35 @@ -1,43 +0,0 @@
36 -# Copyright 1999-2019 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI="7"
40 -
41 -inherit flag-o-matic systemd toolchain-funcs
42 -
43 -DESCRIPTION="Create C parsers for libconfig and command-line"
44 -HOMEPAGE="https://github.com/yrutschle/conf2struct/"
45 -if [[ ${PV} == "9999" ]] ; then
46 - EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
47 - inherit git-r3
48 -else
49 - KEYWORDS="~amd64 ~arm"
50 - GIT_COMMIT="10ea3356b65e712fb000f4d37f00e1dc09c1e722"
51 - SRC_URI="https://github.com/yrutschle/conf2struct/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
52 - S="${WORKDIR}/${PN}-${GIT_COMMIT}"
53 -fi
54 -
55 -PATCHES=(
56 - "${FILESDIR}/${P}-install-and-uninstall.patch"
57 - "${FILESDIR}/${P}-cc-and-cflags.patch"
58 - "${FILESDIR}/${P}-destdir.patch"
59 - "${FILESDIR}/${P}-install-not-run-all.patch"
60 - "${FILESDIR}/${P}-dest-exists.patch"
61 -)
62 -
63 -LICENSE="BSD-2"
64 -SLOT="0"
65 -IUSE=""
66 -
67 -RDEPEND="dev-libs/libconfig
68 - dev-perl/Conf-Libconfig"
69 -DEPEND="${RDEPEND}"
70 -
71 -src_compile(){
72 - # -j1 due to parallel make issue reported upstream at: https://github.com/yrutschle/conf2struct/issues/10
73 - emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
74 -}
75 -
76 -src_install(){
77 - emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
78 -}
79
80 diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch
81 deleted file mode 100644
82 index 322e8724e6c..00000000000
83 --- a/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch
84 +++ /dev/null
85 @@ -1,32 +0,0 @@
86 -From 8c68116a9c2e086e83075f46a1b21de218c2dd2e Mon Sep 17 00:00:00 2001
87 -From: Craig Andrews <candrews@××××××××××××.com>
88 -Date: Fri, 5 Jul 2019 15:31:59 -0400
89 -Subject: [PATCH] Add CC and use CFLAGS in Makefile
90 -
91 -CC is necessary to specify the compiler to use (default to gcc) and use CFLAGS to specify compiler arguments
92 ----
93 - Makefile | 4 ++--
94 - 1 file changed, 2 insertions(+), 2 deletions(-)
95 -
96 -diff --git a/Makefile b/Makefile
97 -index bf9bae3..5b7212f 100644
98 ---- a/Makefile
99 -+++ b/Makefile
100 -@@ -6,7 +6,7 @@ all: example checker
101 - CFLAGS=-g
102 -
103 - checker: confcheck.o
104 -- gcc -o confcheck confcheck.o -lconfig
105 -+ $(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig
106 -
107 -
108 - install: all
109 -@@ -18,7 +18,7 @@ uninstall:
110 -
111 - EG_OBJ=example.o parser.o argtable3.o
112 - example: $(EG_OBJ)
113 -- gcc -o example $(EG_OBJ) -lconfig
114 -+ $(CC) $(CFLAGS) -o example $(EG_OBJ) -lconfig
115 -
116 - example.c: eg_conf.cfg
117 - ./conf2struct eg_conf.cfg
118
119 diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch
120 deleted file mode 100644
121 index cb345f3588c..00000000000
122 --- a/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch
123 +++ /dev/null
124 @@ -1,21 +0,0 @@
125 -From f4bc59c6cad87f6a237f92ea4c54e38705beeaac Mon Sep 17 00:00:00 2001
126 -From: Craig Andrews <candrews@××××××××××××.com>
127 -Date: Fri, 5 Jul 2019 16:24:14 -0400
128 -Subject: [PATCH] In install, ensure destination exists
129 -
130 ----
131 - Makefile | 1 +
132 - 1 file changed, 1 insertion(+)
133 -
134 -diff --git a/Makefile b/Makefile
135 -index bf9bae3..8bebca4 100644
136 ---- a/Makefile
137 -+++ b/Makefile
138 -@@ -10,6 +10,7 @@ checker: confcheck.o
139 -
140 -
141 - install:
142 -+ mkdir -p $(DESTDIR)/$(bindir)
143 - install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
144 - install -c confcheck $(DESTDIR)$(bindir)/confcheck
145 -
146
147 diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch
148 deleted file mode 100644
149 index bae336e1085..00000000000
150 --- a/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch
151 +++ /dev/null
152 @@ -1,47 +0,0 @@
153 -From f3724170ae5b5e750ec5482241add97217047eb4 Mon Sep 17 00:00:00 2001
154 -From: Craig Andrews <candrews@××××××××××××.com>
155 -Date: Fri, 5 Jul 2019 15:33:49 -0400
156 -Subject: [PATCH 1/2] Use DESTDIR in install target
157 -
158 ----
159 - Makefile | 4 ++--
160 - 1 file changed, 2 insertions(+), 2 deletions(-)
161 -
162 -diff --git a/Makefile b/Makefile
163 -index bf9bae3..fd2f21b 100644
164 ---- a/Makefile
165 -+++ b/Makefile
166 -@@ -10,8 +10,8 @@ checker: confcheck.o
167 -
168 -
169 - install: all
170 -- install -c conf2struct $(bindir)/conf2struct
171 -- install -c confcheck $(bindir)/confcheck
172 -+ install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
173 -+ install -c confcheck $(DESTDIR)$(bindir)/confcheck
174 -
175 - uninstall:
176 - rm -rf $(bindir)/conf2struct $(bindir)/confcheck
177 -
178 -From fa13135f93435de520480be9c1a578b20d538f55 Mon Sep 17 00:00:00 2001
179 -From: Craig Andrews <candrews@××××××××××××.com>
180 -Date: Fri, 5 Jul 2019 15:36:24 -0400
181 -Subject: [PATCH 2/2] Use DESTDIR in uninstall target
182 -
183 ----
184 - Makefile | 2 +-
185 - 1 file changed, 1 insertion(+), 1 deletion(-)
186 -
187 -diff --git a/Makefile b/Makefile
188 -index fd2f21b..ca1e673 100644
189 ---- a/Makefile
190 -+++ b/Makefile
191 -@@ -14,7 +14,7 @@ install: all
192 - install -c confcheck $(DESTDIR)$(bindir)/confcheck
193 -
194 - uninstall:
195 -- rm -rf $(bindir)/conf2struct $(bindir)/confcheck
196 -+ rm -rf $(DESTDIR)$(bindir)/conf2struct $(DESTDIR)$(bindir)/confcheck
197 -
198 - EG_OBJ=example.o parser.o argtable3.o
199 - example: $(EG_OBJ)
200
201 diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch
202 deleted file mode 100644
203 index 79269d62883..00000000000
204 --- a/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch
205 +++ /dev/null
206 @@ -1,33 +0,0 @@
207 -From 9c0e889e29944428106c12ee28ce0074a29eae50 Mon Sep 17 00:00:00 2001
208 -From: Yves Rutschle <git1@××××××××.net>
209 -Date: Sat, 29 Jun 2019 18:41:20 +0200
210 -Subject: [PATCH] added install and uninstall targets to Makefile
211 -
212 ----
213 - Makefile | 9 +++++++++
214 - 1 file changed, 9 insertions(+)
215 -
216 -diff --git a/Makefile b/Makefile
217 -index b03aab3..bf9bae3 100644
218 ---- a/Makefile
219 -+++ b/Makefile
220 -@@ -1,3 +1,5 @@
221 -+prefix=/usr/local
222 -+bindir=$(prefix)/bin
223 -
224 - all: example checker
225 -
226 -@@ -6,6 +8,13 @@ CFLAGS=-g
227 - checker: confcheck.o
228 - gcc -o confcheck confcheck.o -lconfig
229 -
230 -+
231 -+install: all
232 -+ install -c conf2struct $(bindir)/conf2struct
233 -+ install -c confcheck $(bindir)/confcheck
234 -+
235 -+uninstall:
236 -+ rm -rf $(bindir)/conf2struct $(bindir)/confcheck
237 -
238 - EG_OBJ=example.o parser.o argtable3.o
239 - example: $(EG_OBJ)
240
241 diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch
242 deleted file mode 100644
243 index 5eca0a1de7b..00000000000
244 --- a/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch
245 +++ /dev/null
246 @@ -1,22 +0,0 @@
247 -From b43351d0fdd687ed39b38531f673ba634aca5fee Mon Sep 17 00:00:00 2001
248 -From: Craig Andrews <candrews@××××××××××××.com>
249 -Date: Fri, 5 Jul 2019 16:22:49 -0400
250 -Subject: [PATCH] Install target should not run all
251 -
252 ----
253 - Makefile | 2 +-
254 - 1 file changed, 1 insertion(+), 1 deletion(-)
255 -
256 -diff --git a/Makefile b/Makefile
257 -index bf9bae3..8943248 100644
258 ---- a/Makefile
259 -+++ b/Makefile
260 -@@ -9,7 +9,7 @@ checker: confcheck.o
261 - $(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig
262 -
263 -
264 --install: all
265 -+install:
266 - install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
267 - install -c confcheck $(DESTDIR)$(bindir)/confcheck
268 -