gentoo resync : 25.11.2020

6 files changed, 3 insertions, 335 deletions

diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 341e70dfb345..6230df6c70f8 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -2,15 +2,9 @@ AUX LCDd.initd 310 BLAKE2B 415321c1b8c80016f21e283339e21c6adbbb92dbf99649846044f
 AUX LCDd.service 166 BLAKE2B ef3d9a7af9e8e8d8bb54e11110dbcb44c968cbc8fec63529f86dbb0a027154997d12e927405ca228a5740fcadc7518448c640ddbe5f38eabee1b7698b17b3035 SHA512 d09829efb26c9b8ca01f6cd07f704d55d05b3328866c169251683b1343ec37e569f95ad14b3b51e2d832ea7b0d3eba5579cec02decb86504016e535a61d7ea46
 AUX lcdexec.initd 325 BLAKE2B 7a7b48e2e24c763533934bca78debd36a1fb6146f6e72204777f50d7dc962a519ab06ef0bc9b1c91b36cd726b67679e7a94d2edbd28bd524ecccf6d20f6a53de SHA512 f8bf380b2e452e830cc3805f297d06c4cdf623db91eff310da2b20cd87cd87ef850c1c7e5b843044333167fa8724acb8de8d65752328ec4144b486d0bed6bfce
 AUX lcdexec.service 171 BLAKE2B cad9c32ce67365158a210fbc65c794881cf84ddcba870019e2772eb6b0913fcbcba99f82f803621930b867d72c63f16bc61710174c35da0ba923e9f68dc119dd SHA512 5372cf10ee750122d2312ecb595a827aa3c5f14bf34049f90950b36b7a77a7c36bcf2d72a30dc6ebf8830251c901c9703c05a6c92fdc580940b6ffe1e421cb2f
-AUX lcdproc-0.5.9-fix-fno-common-build.patch 1751 BLAKE2B 4132254e240ec6e2268174c977332bf8ce31b4da28f6e09279d3afa7774051dab5c87b368366f1050da23337152384e1a2d1a116940b4d45cde61fed6083ffd7 SHA512 2a230cf311699f5d30a36d73784e9539c6a018b281282f341a167a0f946212a9d156b23efdf7f921f5ed8941f7dc6f68878ec2d87247727bec78230eb04eda0f
-AUX lcdproc-0.5.9-fix-parallel-make.patch 910 BLAKE2B 5a9daa1871e64b4bfcc7ea2fbc06f0e4ec6493fe61d678d5b0cc252764ecbc1906c102f2347e18a10432bd390b19d990a270423e8054690283b17174a8297a08 SHA512 75c42f716175751c07b5385f87c2d378229c59cb7ef5adb517b23d3c032373627f9d6173987251c5d3c259764dbaa2ad167d8769bdcb2afa1b1387ff1926a316
-AUX lcdproc-0.5.9-respect-users-ldflags.patch 646 BLAKE2B 6b0bbf237fe3f3e8a4392f35d8ae9299d53697268b0964aa9db9b40463c39c5f23f850d654332f07612aad6a644d7088293b393d8978ca2304327f197be340d4 SHA512 2169f4a7ce56a0a1da847fcb7a55c068d97d985969e0e96e25711ff6bf7e6617e917e29706882e2485cf7be71452713e0577ea2e0435da61a7ec9d26bf3fed52
 AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75f5306ed26a5447289618575c26873bf5335c94286c36dc0444b2ef8b74dd7087b0a3d2529602c25de680ff534df303e094a90f258f8bd SHA512 d5922c61274b420dc3138c5345868924ab7562f7aaa267068c925b4c36b74309ce8132103e265cdfc5b84cb6f3d6f5bea7036c617e14e7a22aa32c360202014e
 AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
-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
-EBUILD lcdproc-0.5.9-r1.ebuild 6563 BLAKE2B c583192d2e154aa3dfe75e022214bf514f46eb531b3173a91a7749b252ec3de3bae65a26c12057e7e615eed4f33580c2b11d433c8d83beb971cab21b46df1a1c SHA512 1a9917a1179d9fb5713e299ab17dcf0caeb89d823e06d3ec7718fffd83f9297927452ae8dc91b521edf5bba00767998a216b43a1814e8afc5857343da060d3f2
-EBUILD lcdproc-0.5.9_p20200721.ebuild 6217 BLAKE2B 747c93e3afb5287b089ca2e1ea0ef64d29ee002346a4c426b1c23733084b87d5a43d53caf16b2354a6a24a9f625c3033c32daee77f80d8362b0197414983679f SHA512 8e3a0c4c36d7c9e07fecd728763c7c8ca29fd61befd3916246248d24f7c787f12258c2f72a40a0bf8de504f5f01ac6c8255b40c58031c332c562999d1e7a3d9d
+EBUILD lcdproc-0.5.9_p20200721.ebuild 6265 BLAKE2B af1bcfb8adef86ae9ed86a8da82f8735ff199b7b5b3ae1b22c4fed1360ef2a616e03f66140e910fee2b1b6201ef382134075018bbedaab4b6110251655082537 SHA512 46879d75a8ce5018bcb36ec0ce181a806223430dbc207485518654ab76d1af5958441eb2bc9990f3155d35b619cbd4eed0cb1b0d3abd1a9820721d822c0f4f3c
 MISC metadata.xml 1538 BLAKE2B 33c2755d4bae3208e9fb175f57b8e241d62cde6c63ac509d6443722bc8617cd48f566ec6300fbad08bb0b3ab04c5aee652e1b67340f5d82e61423c02ae948aab SHA512 52c3e7e8e0dbfdd2b06cbda0e6bd7b538a4f0a2ddb396940cb3345920ed2e7917f22e2620ac9de1e0a4acb3e9144848f13916ce91f54252632eccdc8974dbfd3
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 2dc472f5d22a..000000000000
--- 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 763038d14ab5..000000000000
--- 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 8b48d0044108..000000000000
--- 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 e3149731d121..000000000000
--- 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
-}
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
index 4d597162ee55..85a8e7263990 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a
 HOMEPAGE="http://www.lcdproc.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
@@ -43,6 +43,7 @@ for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
 	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