* [gentoo-commits] repo/gentoo:master commit in: app-misc/lcdproc/, app-misc/lcdproc/files/
@ 2020-05-11 21:54 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2020-05-11 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 49ac6b2067ef13ec331862fb25937ee5f0128749
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 21:52:03 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May 11 21:53:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ac6b20
app-misc/lcdproc: don't call directly ar
Closes: https://bugs.gentoo.org/722346
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../lcdproc-0.5.9-respect-users-ldflags.patch | 25 +++
app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild | 233 +++++++++++++++++++++
2 files changed, 258 insertions(+)
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
new file mode 100644
index 00000000000..8b48d004410
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch
@@ -0,0 +1,25 @@
+From 28cca1d998fc9a74f16ea00e61c3eaa34017db7c Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Mon, 11 May 2020 23:43:57 +0200
+Subject: [PATCH] Include AM_PROG_AR to use systems AR
+
+If AM_PROG_AR is not included,
+the 'ar' command is directly called.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 98a2fb1c..53f7bf50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,6 +73,7 @@ AC_PROG_CC_STDC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AM_PROG_CC_C_O
+ AC_PATH_PROG([XMLTO], [xmlto], [no])
+
diff --git a/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
new file mode 100644
index 00000000000..e3149731d12
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
+HOMEPAGE="http://www.lcdproc.org/"
+SRC_URI="
+ https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+ https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook
+"
+
+KEYWORDS="amd64 ppc ppc64 x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
+REQUIRED_USE="
+ ethlcd? ( lcd_devices_hd44780 )
+ freetype? ( lcd_devices_glcd )
+ png? ( lcd_devices_glcd )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - svga: It needs media-libs/svgalib, which is masked and obsolete.
+IUSE_LCD_DEVICES=(
+ bayrad CFontz CFontzPacket curses CwLnx ea65
+ EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
+ icp_a106 imon imonlcd IOWarrior irman irtrans
+ joy lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
+ ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
+ Olimex_MOD_LCD1x9 picolcd pyramid rawserial
+ sdeclcd sed1330 sed1520 serialPOS serialVFD
+ shuttleVFD sli stv5730 SureElec t6963 text
+ tyan ula200 vlsys_m428 xosd yard2LCD
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+ LCD_DEVICE="${LCD_DEVICE,,}"
+ IUSE+=" lcd_devices_${LCD_DEVICE} "
+ REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+ lcd_devices_cfontz? ( dev-libs/libhid:= )
+ lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
+ lcd_devices_cwlnx? ( dev-libs/libhid:= )
+ lcd_devices_futaba? ( virtual/libusb:1= )
+ lcd_devices_g15? (
+ app-misc/g15daemon
+ dev-libs/libg15render:=
+ virtual/libusb:0=
+ )
+ lcd_devices_glcd? (
+ app-misc/glcdprocdriver:=
+ dev-embedded/libftdi:1=
+ dev-libs/libhid:=
+ dev-libs/serdisplib:=
+ virtual/libusb:0=
+ x11-libs/libX11:=
+ )
+ lcd_devices_hd44780? (
+ dev-embedded/libftdi:1=
+ dev-libs/libugpio:=
+ virtual/libusb:0=
+ )
+ lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
+ lcd_devices_irman? ( media-libs/libirman:= )
+ lcd_devices_iowarrior? ( virtual/libusb:0= )
+ lcd_devices_lirc? ( app-misc/lirc )
+ lcd_devices_lis? ( dev-embedded/libftdi:1= )
+ lcd_devices_lb216? ( dev-libs/libhid:= )
+ lcd_devices_mdm166a? ( dev-libs/libhid:= )
+ lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
+ lcd_devices_mx5000? ( app-misc/mx5000tools )
+ lcd_devices_noritakevfd? ( dev-libs/libhid:= )
+ lcd_devices_picolcd? ( virtual/libusb:1= )
+ lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+ lcd_devices_ula200? ( dev-embedded/libftdi:1= )
+ lcd_devices_xosd? (
+ x11-libs/libX11:=
+ x11-libs/xosd:=
+ )
+"
+
+RDEPEND="${DEPEND_LCD_DEVICES}"
+DEPEND="
+ ${RDEPEND}
+ doc? (
+ app-doc/doxygen[dot]
+ app-text/xmlto
+ )
+ freetype? ( media-libs/freetype:2= )
+ nfs? ( net-fs/nfs-utils )
+ png? ( media-libs/libpng:0= )
+ samba? ( net-fs/samba )
+"
+
+DOCS=( "CREDITS.md" "TODO" )
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-fno-common-build.patch"
+ "${FILESDIR}/${P}-fix-parallel-make.patch"
+ "${FILESDIR}/${P}-respect-users-ldflags.patch"
+ "${FILESDIR}/${P}-use-freetype2-pkg-config.patch"
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ # Copy missing docbook or the buildung of the lcdproc-user docbook will fail
+ cp "${DISTDIR}"/linux_input.docbook "${S}"/docs/lcdproc-user/drivers/linux_input.docbook || die
+}
+
+src_prepare() {
+ default
+
+ # Fix path for modules
+ sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # Enable all users enabled lcd devices
+ local myeconfargs_lcd_devices
+ for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+ if use "lcd_devices_${lcd_device,,}"; then
+ myeconfargs_lcd_devices+=",${lcd_device}"
+ fi
+ done
+
+ local enable_ftdi="--disable-libftdi"
+ if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
+ enable_ftdi="--enable-libftdi"
+ fi
+
+ local enable_hid="--disable-libhid"
+ 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
+ enable_hid="--enable-libhid"
+ fi
+
+ local enable_png="--disable-libpng"
+ use lcd_devices_glcd && enable_png=""
+
+ local enable_usb0="--disable-libusb"
+ 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
+ enable_usb0="--enable-libusb"
+ fi
+
+ local enable_usb1="--disable-libusb-1-0"
+ if use lcd_devices_futaba || use lcd_devices_picolcd; then
+ enable_usb1="--enable-libusb-1-0"
+ fi
+
+ local enable_x11="--disable-libX11"
+ use lcd_devices_glcd && enable_x11="--enable-libX11"
+
+ local myeconfargs=(
+ --enable-drivers="${myeconfargs_lcd_devices#,}"
+ $(use_enable debug)
+ $(use_enable doc doxygen)
+ $(use_enable doc dot)
+ $(use_enable doc html-dox)
+ $(use_enable doc latex-dox)
+ $(use_enable ethlcd)
+ $(use_enable extra-charmaps)
+ $(use_enable freetype)
+ $(use_enable menu lcdproc-menus)
+ $(use_enable nfs stat-nfs)
+ $(use_enable samba stat-smbfs)
+ $(use_enable test-menu testmenus)
+ ${enable_ftdi}
+ ${enable_hid}
+ ${enable_png}
+ ${enable_usb0}
+ ${enable_usb1}
+ ${enable_x11}
+ --with-lcdport="13666"
+ --with-pidfile-dir="/run"
+ --without-included-getopt
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ emake dox
+
+ local docbook
+ for docbook in lcdproc-user lcdproc-dev; do
+ cd "${S}"/docs/"${docbook}" || die
+ xmlto html "${docbook}".docbook || die
+ done
+ fi
+}
+
+src_install() {
+ default
+
+ # Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
+ rm -f "${ED%/}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
+ insinto /usr/share/lcdproc/clients
+ doins clients/examples/*.pl clients/metar/*.pl
+
+ newinitd "${FILESDIR}"/LCDd.initd LCDd
+ newinitd "${FILESDIR}"/lcdexec.initd lcdexec
+ newinitd "${FILESDIR}"/lcdproc.initd lcdproc
+
+ systemd_dounit "${FILESDIR}"/LCDd.service
+ systemd_dounit "${FILESDIR}"/lcdexec.service
+ systemd_dounit "${FILESDIR}"/lcdproc.service
+
+ if use doc; then
+ dodoc -r docs/html
+
+ local docbook
+ for docbook in lcdproc-user lcdproc-dev; do
+ docinto "${docbook}"
+ dodoc docs/"${docbook}"/*.html
+ done
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/lcdproc/, app-misc/lcdproc/files/
@ 2020-10-09 13:36 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2020-10-09 13:36 UTC (permalink / raw
To: gentoo-commits
commit: 4ffe604126ee3b579e2d7358758458cc9b4cce43
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 9 13:23:27 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 13:23:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffe6041
app-misc/lcdproc: drop old version
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-misc/lcdproc/Manifest | 2 -
.../files/lcdproc-0.5.9-fix-fno-common-build.patch | 53 -----
.../files/lcdproc-0.5.9-fix-parallel-make.patch | 16 --
.../lcdproc-0.5.9-respect-users-ldflags.patch | 25 ---
app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild | 233 ---------------------
5 files changed, 329 deletions(-)
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 62c1c256c92..5a2a694879e 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,3 +1 @@
-DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd
-DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
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
deleted file mode 100644
index 2dc472f5d22..00000000000
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fda5302878692da933dc03cd011f8ddffefa07a4 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Sun, 2 Feb 2020 18:48:07 +0100
-Subject: [PATCH] Fix compilation with GCC >= 10.x
-
-Starting with GCC >= 10.x, -fno-common is used as default
-instead of -fcommon. This patch fixes the compilation.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- clients/lcdproc/iface.c | 1 +
- clients/lcdproc/iface.h | 2 --
- clients/lcdproc/main.c | 2 ++
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
-index 40e50cb7..45be5b97 100644
---- a/clients/lcdproc/iface.c
-+++ b/clients/lcdproc/iface.c
-@@ -32,6 +32,7 @@
- #define UNSET_INT -1
- #define UNSET_STR "\01"
-
-+IfaceInfo iface[MAX_INTERFACES]; /* interface info */
-
- static int iface_count = 0; /* number of interfaces */
- static char unit_label[10] = "B"; /* default unit label is Bytes */
-diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
-index cc6dbaaf..ee188f38 100644
---- a/clients/lcdproc/iface.h
-+++ b/clients/lcdproc/iface.h
-@@ -18,8 +18,6 @@
- /** max number of interfaces in multi-interface mode */
- #define MAX_INTERFACES 3
-
--IfaceInfo iface[MAX_INTERFACES]; /* interface info */
--
- /** Update screen content */
- int iface_screen(int rep, int display, int *flags_ptr);
- /** read interface stats from /proc/net/dev */
-diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c
-index 01b02baf..7c7a4215 100644
---- a/clients/lcdproc/main.c
-+++ b/clients/lcdproc/main.c
-@@ -53,6 +53,8 @@
- # include "eyebox.h"
- #endif
-
-+extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */
-+
- /* The following 8 variables are defined 'external' in main.h! */
- int Quit = 0;
- int sock = -1;
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
deleted file mode 100644
index 763038d14ab..00000000000
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/server/drivers/Makefile.am 2017-01-22 23:18:54.000000000 +0100
-+++ b/server/drivers/Makefile.am 2018-10-04 22:48:50.302344274 +0200
-@@ -47,11 +47,11 @@
- futaba_LDADD = @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a
- g15_LDADD = @LIBG15@
- glcd_LDADD = libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@
--glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o
-+glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a
- glcdlib_LDADD = @LIBGLCD@
- glk_LDADD = libbignum.a
- hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a
--hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@
-+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a
- i2500vfd_LDADD = @LIBFTDI_LIBS@
- imon_LDADD = libLCD.a libbignum.a
- imonlcd_LDADD = libLCD.a
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
deleted file mode 100644
index 8b48d004410..00000000000
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 28cca1d998fc9a74f16ea00e61c3eaa34017db7c Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Mon, 11 May 2020 23:43:57 +0200
-Subject: [PATCH] Include AM_PROG_AR to use systems AR
-
-If AM_PROG_AR is not included,
-the 'ar' command is directly called.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 98a2fb1c..53f7bf50 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,6 +73,7 @@ AC_PROG_CC_STDC
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-+AM_PROG_AR
- AM_PROG_CC_C_O
- AC_PATH_PROG([XMLTO], [xmlto], [no])
-
diff --git a/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
deleted file mode 100644
index e3149731d12..00000000000
--- a/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
-HOMEPAGE="http://www.lcdproc.org/"
-SRC_URI="
- https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
- https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook
-"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
-REQUIRED_USE="
- ethlcd? ( lcd_devices_hd44780 )
- freetype? ( lcd_devices_glcd )
- png? ( lcd_devices_glcd )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - svga: It needs media-libs/svgalib, which is masked and obsolete.
-IUSE_LCD_DEVICES=(
- bayrad CFontz CFontzPacket curses CwLnx ea65
- EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
- icp_a106 imon imonlcd IOWarrior irman irtrans
- joy lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
- ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
- Olimex_MOD_LCD1x9 picolcd pyramid rawserial
- sdeclcd sed1330 sed1520 serialPOS serialVFD
- shuttleVFD sli stv5730 SureElec t6963 text
- tyan ula200 vlsys_m428 xosd yard2LCD
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
- LCD_DEVICE="${LCD_DEVICE,,}"
- IUSE+=" lcd_devices_${LCD_DEVICE} "
- REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
- lcd_devices_cfontz? ( dev-libs/libhid:= )
- lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
- lcd_devices_cwlnx? ( dev-libs/libhid:= )
- lcd_devices_futaba? ( virtual/libusb:1= )
- lcd_devices_g15? (
- app-misc/g15daemon
- dev-libs/libg15render:=
- virtual/libusb:0=
- )
- lcd_devices_glcd? (
- app-misc/glcdprocdriver:=
- dev-embedded/libftdi:1=
- dev-libs/libhid:=
- dev-libs/serdisplib:=
- virtual/libusb:0=
- x11-libs/libX11:=
- )
- lcd_devices_hd44780? (
- dev-embedded/libftdi:1=
- dev-libs/libugpio:=
- virtual/libusb:0=
- )
- lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
- lcd_devices_irman? ( media-libs/libirman:= )
- lcd_devices_iowarrior? ( virtual/libusb:0= )
- lcd_devices_lirc? ( app-misc/lirc )
- lcd_devices_lis? ( dev-embedded/libftdi:1= )
- lcd_devices_lb216? ( dev-libs/libhid:= )
- lcd_devices_mdm166a? ( dev-libs/libhid:= )
- lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
- lcd_devices_mx5000? ( app-misc/mx5000tools )
- lcd_devices_noritakevfd? ( dev-libs/libhid:= )
- lcd_devices_picolcd? ( virtual/libusb:1= )
- lcd_devices_shuttlevfd? ( virtual/libusb:0= )
- lcd_devices_ula200? ( dev-embedded/libftdi:1= )
- lcd_devices_xosd? (
- x11-libs/libX11:=
- x11-libs/xosd:=
- )
-"
-
-RDEPEND="${DEPEND_LCD_DEVICES}"
-DEPEND="
- ${RDEPEND}
- doc? (
- app-doc/doxygen[dot]
- app-text/xmlto
- )
- freetype? ( media-libs/freetype:2= )
- nfs? ( net-fs/nfs-utils )
- png? ( media-libs/libpng:0= )
- samba? ( net-fs/samba )
-"
-
-DOCS=( "CREDITS.md" "TODO" )
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-fno-common-build.patch"
- "${FILESDIR}/${P}-fix-parallel-make.patch"
- "${FILESDIR}/${P}-respect-users-ldflags.patch"
- "${FILESDIR}/${P}-use-freetype2-pkg-config.patch"
-)
-
-src_unpack() {
- unpack ${P}.tar.gz
-
- # Copy missing docbook or the buildung of the lcdproc-user docbook will fail
- cp "${DISTDIR}"/linux_input.docbook "${S}"/docs/lcdproc-user/drivers/linux_input.docbook || die
-}
-
-src_prepare() {
- default
-
- # Fix path for modules
- sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
-
- eautoreconf
-}
-
-src_configure() {
- # Enable all users enabled lcd devices
- local myeconfargs_lcd_devices
- for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
- if use "lcd_devices_${lcd_device,,}"; then
- myeconfargs_lcd_devices+=",${lcd_device}"
- fi
- done
-
- local enable_ftdi="--disable-libftdi"
- if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
- enable_ftdi="--enable-libftdi"
- fi
-
- local enable_hid="--disable-libhid"
- 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
- enable_hid="--enable-libhid"
- fi
-
- local enable_png="--disable-libpng"
- use lcd_devices_glcd && enable_png=""
-
- local enable_usb0="--disable-libusb"
- 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
- enable_usb0="--enable-libusb"
- fi
-
- local enable_usb1="--disable-libusb-1-0"
- if use lcd_devices_futaba || use lcd_devices_picolcd; then
- enable_usb1="--enable-libusb-1-0"
- fi
-
- local enable_x11="--disable-libX11"
- use lcd_devices_glcd && enable_x11="--enable-libX11"
-
- local myeconfargs=(
- --enable-drivers="${myeconfargs_lcd_devices#,}"
- $(use_enable debug)
- $(use_enable doc doxygen)
- $(use_enable doc dot)
- $(use_enable doc html-dox)
- $(use_enable doc latex-dox)
- $(use_enable ethlcd)
- $(use_enable extra-charmaps)
- $(use_enable freetype)
- $(use_enable menu lcdproc-menus)
- $(use_enable nfs stat-nfs)
- $(use_enable samba stat-smbfs)
- $(use_enable test-menu testmenus)
- ${enable_ftdi}
- ${enable_hid}
- ${enable_png}
- ${enable_usb0}
- ${enable_usb1}
- ${enable_x11}
- --with-lcdport="13666"
- --with-pidfile-dir="/run"
- --without-included-getopt
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use doc; then
- emake dox
-
- local docbook
- for docbook in lcdproc-user lcdproc-dev; do
- cd "${S}"/docs/"${docbook}" || die
- xmlto html "${docbook}".docbook || die
- done
- fi
-}
-
-src_install() {
- default
-
- # Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
- rm -f "${ED%/}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
- insinto /usr/share/lcdproc/clients
- doins clients/examples/*.pl clients/metar/*.pl
-
- newinitd "${FILESDIR}"/LCDd.initd LCDd
- newinitd "${FILESDIR}"/lcdexec.initd lcdexec
- newinitd "${FILESDIR}"/lcdproc.initd lcdproc
-
- systemd_dounit "${FILESDIR}"/LCDd.service
- systemd_dounit "${FILESDIR}"/lcdexec.service
- systemd_dounit "${FILESDIR}"/lcdproc.service
-
- if use doc; then
- dodoc -r docs/html
-
- local docbook
- for docbook in lcdproc-user lcdproc-dev; do
- docinto "${docbook}"
- dodoc docs/"${docbook}"/*.html
- done
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/lcdproc/, app-misc/lcdproc/files/
@ 2022-04-23 21:24 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-04-23 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 6e089dc724ac10bd031632cb715564c9be2be542
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 20:41:15 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 20:41:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e089dc7
app-misc/lcdproc: drop 0.5.9_p20200721-r2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-misc/lcdproc/Manifest | 1 -
.../lcdproc-0.5.9-use-freetype2-pkg-config.patch | 15 --
app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild | 223 ---------------------
3 files changed, 239 deletions(-)
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index ae6719b58531..4a7327a55378 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,2 +1 @@
-DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd
DIST lcdproc-0.5.9_p20211220.tar.gz 941272 BLAKE2B 910504e86a8c3b2c764b20b175b76287166c6fa1d93fec74e7ea91adc7027530a40f415c26c2820f300d2bf5222e9bebec082aedf76b53d0a70a386c91b8d540 SHA512 6901a92cb8d7102f5fb429d59d416fcd98b57e1cae41bddbfe592befaa97738acff3d46be250cbb5b1ad012322f88ac549d220e96aa399bb4cd8c19ee28407c8
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch
deleted file mode 100644
index 9149bf784276..000000000000
--- a/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac 2017-06-18 22:33:56.000000000 +0200
-+++ b/configure.ac 2018-10-04 22:30:22.668770478 +0200
-@@ -389,11 +389,7 @@
- AC_MSG_RESULT($enable_freetype)
-
- if test "$enable_freetype" = "yes"; then
-- ifdef([AC_CHECK_FT2],
-- [AC_CHECK_FT2([],
-- [AC_DEFINE(HAVE_FT2, [1], [Define to 1 if you have freetype])],
-- [enable_freetype=no])],
-- [AC_MSG_WARN([freetype does not seem to be installed])])
-+ PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [enable_freetype="yes"],[enable_freetype="no"])
- fi
- AC_SUBST([FT2_CFLAGS])
- AC_SUBST([FT2_LIBS])
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild
deleted file mode 100644
index 32ab3bf75e73..000000000000
--- a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1"
-
-inherit autotools systemd
-
-DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
-HOMEPAGE="http://www.lcdproc.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug doc ethlcd extra-charmaps menu nfs png samba test-menu truetype"
-REQUIRED_USE="
- ethlcd? ( lcd_devices_hd44780 )
- png? ( lcd_devices_glcd )
- truetype? ( lcd_devices_glcd )
-"
-
-# Define the list of valid lcd devices.
-# Some drivers were removed from this list:
-# - svga: It needs media-libs/svgalib, which is masked and obsolete.
-IUSE_LCD_DEVICES=(
- bayrad CFontz CFontzPacket curses CwLnx ea65
- EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
- icp_a106 imon imonlcd IOWarrior irman irtrans
- joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
- ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
- Olimex_MOD_LCD1x9 picolcd pyramid rawserial
- sdeclcd sed1330 sed1520 serialPOS serialVFD
- shuttleVFD sli stv5730 SureElec t6963 text
- tyan ula200 vlsys_m428 xosd yard2LCD
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-REQUIRED_USE+=" || ( "
-for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
- LCD_DEVICE="${LCD_DEVICE,,}"
- IUSE+=" lcd_devices_${LCD_DEVICE} "
- REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
-done
-IUSE="${IUSE/lcd_devices_glcd/+lcd_devices_glcd}"
-REQUIRED_USE+=" ) "
-unset LCD_DEVICE
-
-# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="
- lcd_devices_cfontz? ( dev-libs/libhid:= )
- lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
- lcd_devices_cwlnx? ( dev-libs/libhid:= )
- lcd_devices_futaba? ( virtual/libusb:1= )
- lcd_devices_g15? (
- app-misc/g15daemon
- dev-libs/libg15render:=
- virtual/libusb:0=
- )
- lcd_devices_glcd? (
- app-misc/glcdprocdriver:=
- dev-embedded/libftdi:1=
- dev-libs/libhid:=
- dev-libs/serdisplib:=
- virtual/libusb:0=
- x11-libs/libX11:=
- )
- lcd_devices_hd44780? (
- dev-embedded/libftdi:1=
- dev-libs/libugpio:=
- virtual/libusb:0=
- )
- lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
- lcd_devices_irman? ( media-libs/libirman:= )
- lcd_devices_iowarrior? ( virtual/libusb:0= )
- lcd_devices_lirc? ( app-misc/lirc )
- lcd_devices_lis? ( dev-embedded/libftdi:1= )
- lcd_devices_lb216? ( dev-libs/libhid:= )
- lcd_devices_mdm166a? ( dev-libs/libhid:= )
- lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
- lcd_devices_mx5000? ( app-misc/mx5000tools )
- lcd_devices_noritakevfd? ( dev-libs/libhid:= )
- lcd_devices_picolcd? ( virtual/libusb:1= )
- lcd_devices_shuttlevfd? ( virtual/libusb:0= )
- lcd_devices_ula200? ( dev-embedded/libftdi:1= )
- lcd_devices_xosd? (
- x11-libs/libX11:=
- x11-libs/xosd:=
- )
-"
-
-RDEPEND="${DEPEND_LCD_DEVICES}"
-
-DEPEND="
- ${RDEPEND}
- doc? (
- app-doc/doxygen[dot]
- app-text/xmlto
- )
- nfs? ( net-fs/nfs-utils )
- png? ( media-libs/libpng:0= )
- samba? ( net-fs/samba )
- truetype? ( media-libs/freetype:2= )
-"
-
-DOCS=( "CREDITS.md" "TODO" )
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.9-use-freetype2-pkg-config.patch" )
-
-src_prepare() {
- default
-
- # Fix path for modules
- sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
-
- eautoreconf
-}
-
-src_configure() {
- # Enable all users enabled lcd devices
- local myeconfargs_lcd_devices
- for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
- if use "lcd_devices_${lcd_device,,}"; then
- myeconfargs_lcd_devices+=",${lcd_device}"
- fi
- done
-
- local enable_ftdi="--disable-libftdi"
- if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
- enable_ftdi="--enable-libftdi"
- fi
-
- local enable_hid="--disable-libhid"
- 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
- enable_hid="--enable-libhid"
- fi
-
- local enable_png="--disable-libpng"
- use lcd_devices_glcd && enable_png=""
-
- local enable_usb0="--disable-libusb"
- 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
- enable_usb0="--enable-libusb"
- fi
-
- local enable_usb1="--disable-libusb-1-0"
- if use lcd_devices_futaba || use lcd_devices_picolcd; then
- enable_usb1="--enable-libusb-1-0"
- fi
-
- local enable_x11="--disable-libX11"
- use lcd_devices_glcd && enable_x11="--enable-libX11"
-
- local myeconfargs=(
- --enable-drivers="${myeconfargs_lcd_devices#,}"
- $(use_enable debug)
- $(use_enable doc doxygen)
- $(use_enable doc dot)
- $(use_enable doc html-dox)
- $(use_enable doc latex-dox)
- $(use_enable ethlcd)
- $(use_enable extra-charmaps)
- $(use_enable menu lcdproc-menus)
- $(use_enable nfs stat-nfs)
- $(use_enable samba stat-smbfs)
- $(use_enable test-menu testmenus)
- $(use_enable truetype freetype)
- ${enable_ftdi}
- ${enable_hid}
- ${enable_png}
- ${enable_usb0}
- ${enable_usb1}
- ${enable_x11}
- --with-lcdport="13666"
- --with-pidfile-dir="/run"
- --without-included-getopt
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use doc; then
- emake dox
-
- local docbook
- for docbook in lcdproc-user lcdproc-dev; do
- cd "${S}"/docs/"${docbook}" || die
- xmlto html "${docbook}".docbook || die
- done
- fi
-}
-
-src_install() {
- default
-
- # Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
- rm -f "${ED}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
- insinto /usr/share/lcdproc/clients
- doins clients/examples/*.pl clients/metar/*.pl
-
- newinitd "${FILESDIR}"/LCDd.initd LCDd
- newinitd "${FILESDIR}"/lcdexec.initd lcdexec
- newinitd "${FILESDIR}"/lcdproc.initd lcdproc
-
- systemd_dounit "${FILESDIR}"/LCDd.service
- systemd_dounit "${FILESDIR}"/lcdexec.service
- systemd_dounit "${FILESDIR}"/lcdproc.service
-
- if use doc; then
- dodoc -r docs/html
-
- local docbook
- for docbook in lcdproc-user lcdproc-dev; do
- docinto "${docbook}"
- dodoc docs/"${docbook}"/*.html
- done
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-23 21:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-23 21:24 [gentoo-commits] repo/gentoo:master commit in: app-misc/lcdproc/, app-misc/lcdproc/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2020-10-09 13:36 Conrad Kostecki
2020-05-11 21:54 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox