1 |
commit: 4ffe604126ee3b579e2d7358758458cc9b4cce43 |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 9 13:23:27 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 9 13:23:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffe6041 |
7 |
|
8 |
app-misc/lcdproc: drop old version |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
12 |
|
13 |
app-misc/lcdproc/Manifest | 2 - |
14 |
.../files/lcdproc-0.5.9-fix-fno-common-build.patch | 53 ----- |
15 |
.../files/lcdproc-0.5.9-fix-parallel-make.patch | 16 -- |
16 |
.../lcdproc-0.5.9-respect-users-ldflags.patch | 25 --- |
17 |
app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild | 233 --------------------- |
18 |
5 files changed, 329 deletions(-) |
19 |
|
20 |
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest |
21 |
index 62c1c256c92..5a2a694879e 100644 |
22 |
--- a/app-misc/lcdproc/Manifest |
23 |
+++ b/app-misc/lcdproc/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25 |
26 |
DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd |
27 |
-DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0 |
28 |
|
29 |
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch |
30 |
deleted file mode 100644 |
31 |
index 2dc472f5d22..00000000000 |
32 |
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch |
33 |
+++ /dev/null |
34 |
@@ -1,53 +0,0 @@ |
35 |
-From fda5302878692da933dc03cd011f8ddffefa07a4 Mon Sep 17 00:00:00 2001 |
36 |
-From: Conrad Kostecki <conrad@××××××××.com> |
37 |
-Date: Sun, 2 Feb 2020 18:48:07 +0100 |
38 |
-Subject: [PATCH] Fix compilation with GCC >= 10.x |
39 |
- |
40 |
-Starting with GCC >= 10.x, -fno-common is used as default |
41 |
-instead of -fcommon. This patch fixes the compilation. |
42 |
- |
43 |
-Signed-off-by: Conrad Kostecki <conrad@××××××××.com> |
44 |
---- |
45 |
- clients/lcdproc/iface.c | 1 + |
46 |
- clients/lcdproc/iface.h | 2 -- |
47 |
- clients/lcdproc/main.c | 2 ++ |
48 |
- 3 files changed, 3 insertions(+), 2 deletions(-) |
49 |
- |
50 |
-diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c |
51 |
-index 40e50cb7..45be5b97 100644 |
52 |
---- a/clients/lcdproc/iface.c |
53 |
-+++ b/clients/lcdproc/iface.c |
54 |
-@@ -32,6 +32,7 @@ |
55 |
- #define UNSET_INT -1 |
56 |
- #define UNSET_STR "\01" |
57 |
- |
58 |
-+IfaceInfo iface[MAX_INTERFACES]; /* interface info */ |
59 |
- |
60 |
- static int iface_count = 0; /* number of interfaces */ |
61 |
- static char unit_label[10] = "B"; /* default unit label is Bytes */ |
62 |
-diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h |
63 |
-index cc6dbaaf..ee188f38 100644 |
64 |
---- a/clients/lcdproc/iface.h |
65 |
-+++ b/clients/lcdproc/iface.h |
66 |
-@@ -18,8 +18,6 @@ |
67 |
- /** max number of interfaces in multi-interface mode */ |
68 |
- #define MAX_INTERFACES 3 |
69 |
- |
70 |
--IfaceInfo iface[MAX_INTERFACES]; /* interface info */ |
71 |
-- |
72 |
- /** Update screen content */ |
73 |
- int iface_screen(int rep, int display, int *flags_ptr); |
74 |
- /** read interface stats from /proc/net/dev */ |
75 |
-diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c |
76 |
-index 01b02baf..7c7a4215 100644 |
77 |
---- a/clients/lcdproc/main.c |
78 |
-+++ b/clients/lcdproc/main.c |
79 |
-@@ -53,6 +53,8 @@ |
80 |
- # include "eyebox.h" |
81 |
- #endif |
82 |
- |
83 |
-+extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */ |
84 |
-+ |
85 |
- /* The following 8 variables are defined 'external' in main.h! */ |
86 |
- int Quit = 0; |
87 |
- int sock = -1; |
88 |
|
89 |
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch |
90 |
deleted file mode 100644 |
91 |
index 763038d14ab..00000000000 |
92 |
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch |
93 |
+++ /dev/null |
94 |
@@ -1,16 +0,0 @@ |
95 |
---- a/server/drivers/Makefile.am 2017-01-22 23:18:54.000000000 +0100 |
96 |
-+++ b/server/drivers/Makefile.am 2018-10-04 22:48:50.302344274 +0200 |
97 |
-@@ -47,11 +47,11 @@ |
98 |
- futaba_LDADD = @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a |
99 |
- g15_LDADD = @LIBG15@ |
100 |
- glcd_LDADD = libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@ |
101 |
--glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o |
102 |
-+glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a |
103 |
- glcdlib_LDADD = @LIBGLCD@ |
104 |
- glk_LDADD = libbignum.a |
105 |
- hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a |
106 |
--hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ |
107 |
-+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a |
108 |
- i2500vfd_LDADD = @LIBFTDI_LIBS@ |
109 |
- imon_LDADD = libLCD.a libbignum.a |
110 |
- imonlcd_LDADD = libLCD.a |
111 |
|
112 |
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch |
113 |
deleted file mode 100644 |
114 |
index 8b48d004410..00000000000 |
115 |
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch |
116 |
+++ /dev/null |
117 |
@@ -1,25 +0,0 @@ |
118 |
-From 28cca1d998fc9a74f16ea00e61c3eaa34017db7c Mon Sep 17 00:00:00 2001 |
119 |
-From: Conrad Kostecki <conrad@××××××××.com> |
120 |
-Date: Mon, 11 May 2020 23:43:57 +0200 |
121 |
-Subject: [PATCH] Include AM_PROG_AR to use systems AR |
122 |
- |
123 |
-If AM_PROG_AR is not included, |
124 |
-the 'ar' command is directly called. |
125 |
- |
126 |
-Signed-off-by: Conrad Kostecki <conrad@××××××××.com> |
127 |
---- |
128 |
- configure.ac | 1 + |
129 |
- 1 file changed, 1 insertion(+) |
130 |
- |
131 |
-diff --git a/configure.ac b/configure.ac |
132 |
-index 98a2fb1c..53f7bf50 100644 |
133 |
---- a/configure.ac |
134 |
-+++ b/configure.ac |
135 |
-@@ -73,6 +73,7 @@ AC_PROG_CC_STDC |
136 |
- AC_PROG_CPP |
137 |
- AC_PROG_INSTALL |
138 |
- AC_PROG_RANLIB |
139 |
-+AM_PROG_AR |
140 |
- AM_PROG_CC_C_O |
141 |
- AC_PATH_PROG([XMLTO], [xmlto], [no]) |
142 |
- |
143 |
|
144 |
diff --git a/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild |
145 |
deleted file mode 100644 |
146 |
index e3149731d12..00000000000 |
147 |
--- a/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild |
148 |
+++ /dev/null |
149 |
@@ -1,233 +0,0 @@ |
150 |
-# Copyright 1999-2020 Gentoo Authors |
151 |
-# Distributed under the terms of the GNU General Public License v2 |
152 |
- |
153 |
-EAPI=6 |
154 |
- |
155 |
-inherit autotools systemd |
156 |
- |
157 |
-DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD" |
158 |
-HOMEPAGE="http://www.lcdproc.org/" |
159 |
-SRC_URI=" |
160 |
- https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz |
161 |
- https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook |
162 |
-" |
163 |
- |
164 |
-KEYWORDS="amd64 ppc ppc64 x86" |
165 |
-LICENSE="GPL-2" |
166 |
-SLOT="0" |
167 |
-IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu" |
168 |
-REQUIRED_USE=" |
169 |
- ethlcd? ( lcd_devices_hd44780 ) |
170 |
- freetype? ( lcd_devices_glcd ) |
171 |
- png? ( lcd_devices_glcd ) |
172 |
-" |
173 |
- |
174 |
-# Define the list of valid lcd devices. |
175 |
-# Some drivers were removed from this list: |
176 |
-# - svga: It needs media-libs/svgalib, which is masked and obsolete. |
177 |
-IUSE_LCD_DEVICES=( |
178 |
- bayrad CFontz CFontzPacket curses CwLnx ea65 |
179 |
- EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd |
180 |
- icp_a106 imon imonlcd IOWarrior irman irtrans |
181 |
- joy lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a |
182 |
- ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD |
183 |
- Olimex_MOD_LCD1x9 picolcd pyramid rawserial |
184 |
- sdeclcd sed1330 sed1520 serialPOS serialVFD |
185 |
- shuttleVFD sli stv5730 SureElec t6963 text |
186 |
- tyan ula200 vlsys_m428 xosd yard2LCD |
187 |
-) |
188 |
- |
189 |
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE' |
190 |
-REQUIRED_USE+=" || ( " |
191 |
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do |
192 |
- LCD_DEVICE="${LCD_DEVICE,,}" |
193 |
- IUSE+=" lcd_devices_${LCD_DEVICE} " |
194 |
- REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} " |
195 |
-done |
196 |
-REQUIRED_USE+=" ) " |
197 |
-unset LCD_DEVICE |
198 |
- |
199 |
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES' |
200 |
-DEPEND_LCD_DEVICES=" |
201 |
- lcd_devices_cfontz? ( dev-libs/libhid:= ) |
202 |
- lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) |
203 |
- lcd_devices_cwlnx? ( dev-libs/libhid:= ) |
204 |
- lcd_devices_futaba? ( virtual/libusb:1= ) |
205 |
- lcd_devices_g15? ( |
206 |
- app-misc/g15daemon |
207 |
- dev-libs/libg15render:= |
208 |
- virtual/libusb:0= |
209 |
- ) |
210 |
- lcd_devices_glcd? ( |
211 |
- app-misc/glcdprocdriver:= |
212 |
- dev-embedded/libftdi:1= |
213 |
- dev-libs/libhid:= |
214 |
- dev-libs/serdisplib:= |
215 |
- virtual/libusb:0= |
216 |
- x11-libs/libX11:= |
217 |
- ) |
218 |
- lcd_devices_hd44780? ( |
219 |
- dev-embedded/libftdi:1= |
220 |
- dev-libs/libugpio:= |
221 |
- virtual/libusb:0= |
222 |
- ) |
223 |
- lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) |
224 |
- lcd_devices_irman? ( media-libs/libirman:= ) |
225 |
- lcd_devices_iowarrior? ( virtual/libusb:0= ) |
226 |
- lcd_devices_lirc? ( app-misc/lirc ) |
227 |
- lcd_devices_lis? ( dev-embedded/libftdi:1= ) |
228 |
- lcd_devices_lb216? ( dev-libs/libhid:= ) |
229 |
- lcd_devices_mdm166a? ( dev-libs/libhid:= ) |
230 |
- lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) |
231 |
- lcd_devices_mx5000? ( app-misc/mx5000tools ) |
232 |
- lcd_devices_noritakevfd? ( dev-libs/libhid:= ) |
233 |
- lcd_devices_picolcd? ( virtual/libusb:1= ) |
234 |
- lcd_devices_shuttlevfd? ( virtual/libusb:0= ) |
235 |
- lcd_devices_ula200? ( dev-embedded/libftdi:1= ) |
236 |
- lcd_devices_xosd? ( |
237 |
- x11-libs/libX11:= |
238 |
- x11-libs/xosd:= |
239 |
- ) |
240 |
-" |
241 |
- |
242 |
-RDEPEND="${DEPEND_LCD_DEVICES}" |
243 |
-DEPEND=" |
244 |
- ${RDEPEND} |
245 |
- doc? ( |
246 |
- app-doc/doxygen[dot] |
247 |
- app-text/xmlto |
248 |
- ) |
249 |
- freetype? ( media-libs/freetype:2= ) |
250 |
- nfs? ( net-fs/nfs-utils ) |
251 |
- png? ( media-libs/libpng:0= ) |
252 |
- samba? ( net-fs/samba ) |
253 |
-" |
254 |
- |
255 |
-DOCS=( "CREDITS.md" "TODO" ) |
256 |
- |
257 |
-PATCHES=( |
258 |
- "${FILESDIR}/${P}-fix-fno-common-build.patch" |
259 |
- "${FILESDIR}/${P}-fix-parallel-make.patch" |
260 |
- "${FILESDIR}/${P}-respect-users-ldflags.patch" |
261 |
- "${FILESDIR}/${P}-use-freetype2-pkg-config.patch" |
262 |
-) |
263 |
- |
264 |
-src_unpack() { |
265 |
- unpack ${P}.tar.gz |
266 |
- |
267 |
- # Copy missing docbook or the buildung of the lcdproc-user docbook will fail |
268 |
- cp "${DISTDIR}"/linux_input.docbook "${S}"/docs/lcdproc-user/drivers/linux_input.docbook || die |
269 |
-} |
270 |
- |
271 |
-src_prepare() { |
272 |
- default |
273 |
- |
274 |
- # Fix path for modules |
275 |
- sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die |
276 |
- |
277 |
- eautoreconf |
278 |
-} |
279 |
- |
280 |
-src_configure() { |
281 |
- # Enable all users enabled lcd devices |
282 |
- local myeconfargs_lcd_devices |
283 |
- for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do |
284 |
- if use "lcd_devices_${lcd_device,,}"; then |
285 |
- myeconfargs_lcd_devices+=",${lcd_device}" |
286 |
- fi |
287 |
- done |
288 |
- |
289 |
- local enable_ftdi="--disable-libftdi" |
290 |
- if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then |
291 |
- enable_ftdi="--enable-libftdi" |
292 |
- fi |
293 |
- |
294 |
- local enable_hid="--disable-libhid" |
295 |
- if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then |
296 |
- enable_hid="--enable-libhid" |
297 |
- fi |
298 |
- |
299 |
- local enable_png="--disable-libpng" |
300 |
- use lcd_devices_glcd && enable_png="" |
301 |
- |
302 |
- local enable_usb0="--disable-libusb" |
303 |
- if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then |
304 |
- enable_usb0="--enable-libusb" |
305 |
- fi |
306 |
- |
307 |
- local enable_usb1="--disable-libusb-1-0" |
308 |
- if use lcd_devices_futaba || use lcd_devices_picolcd; then |
309 |
- enable_usb1="--enable-libusb-1-0" |
310 |
- fi |
311 |
- |
312 |
- local enable_x11="--disable-libX11" |
313 |
- use lcd_devices_glcd && enable_x11="--enable-libX11" |
314 |
- |
315 |
- local myeconfargs=( |
316 |
- --enable-drivers="${myeconfargs_lcd_devices#,}" |
317 |
- $(use_enable debug) |
318 |
- $(use_enable doc doxygen) |
319 |
- $(use_enable doc dot) |
320 |
- $(use_enable doc html-dox) |
321 |
- $(use_enable doc latex-dox) |
322 |
- $(use_enable ethlcd) |
323 |
- $(use_enable extra-charmaps) |
324 |
- $(use_enable freetype) |
325 |
- $(use_enable menu lcdproc-menus) |
326 |
- $(use_enable nfs stat-nfs) |
327 |
- $(use_enable samba stat-smbfs) |
328 |
- $(use_enable test-menu testmenus) |
329 |
- ${enable_ftdi} |
330 |
- ${enable_hid} |
331 |
- ${enable_png} |
332 |
- ${enable_usb0} |
333 |
- ${enable_usb1} |
334 |
- ${enable_x11} |
335 |
- --with-lcdport="13666" |
336 |
- --with-pidfile-dir="/run" |
337 |
- --without-included-getopt |
338 |
- ) |
339 |
- |
340 |
- econf "${myeconfargs[@]}" |
341 |
-} |
342 |
- |
343 |
-src_compile() { |
344 |
- default |
345 |
- |
346 |
- if use doc; then |
347 |
- emake dox |
348 |
- |
349 |
- local docbook |
350 |
- for docbook in lcdproc-user lcdproc-dev; do |
351 |
- cd "${S}"/docs/"${docbook}" || die |
352 |
- xmlto html "${docbook}".docbook || die |
353 |
- done |
354 |
- fi |
355 |
-} |
356 |
- |
357 |
-src_install() { |
358 |
- default |
359 |
- |
360 |
- # Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients' |
361 |
- rm -f "${ED%/}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die |
362 |
- insinto /usr/share/lcdproc/clients |
363 |
- doins clients/examples/*.pl clients/metar/*.pl |
364 |
- |
365 |
- newinitd "${FILESDIR}"/LCDd.initd LCDd |
366 |
- newinitd "${FILESDIR}"/lcdexec.initd lcdexec |
367 |
- newinitd "${FILESDIR}"/lcdproc.initd lcdproc |
368 |
- |
369 |
- systemd_dounit "${FILESDIR}"/LCDd.service |
370 |
- systemd_dounit "${FILESDIR}"/lcdexec.service |
371 |
- systemd_dounit "${FILESDIR}"/lcdproc.service |
372 |
- |
373 |
- if use doc; then |
374 |
- dodoc -r docs/html |
375 |
- |
376 |
- local docbook |
377 |
- for docbook in lcdproc-user lcdproc-dev; do |
378 |
- docinto "${docbook}" |
379 |
- dodoc docs/"${docbook}"/*.html |
380 |
- done |
381 |
- fi |
382 |
-} |