app-misc/lcd4linux: fix qa issues

Since underscore is not allowed in use flags, renamed button_exec,
i2c_sensors, mpris_dbus and proc_stat to use minus instead.

Bug: https://bugs.gentoo.org/694624
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

2 files changed, 187 insertions, 2 deletions

diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
new file mode 100644
index 000000000000..064c6ffca9da
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A small program that grabs information and displays it on an external LCD"
+HOMEPAGE="https://lcd4linux.bulix.org/"
+SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dmalloc outb"
+REQUIRED_USE="
+	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
+# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
+# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
+IUSE_LCD_DEVICES=(
+	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
+	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
+	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
+	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
+	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
+)
+
+# Define the list of valid lcd4linux plugins.
+# Some plugins were removed from this list:
+# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
+# - ppp: It has been replaced by the netdev plugin.
+# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
+# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
+IUSE_LCD4LINUX_PLUGINS=(
+	apm asterisk button-exec cpuinfo dbus diskstats dvb exec event
+	fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv
+	loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3
+	proc-stat python qnaplog raspi sample statfs uname uptime
+	w1retap wireless
+)
+
+# 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
+
+# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
+REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+	lcd_devices_astusb? ( virtual/libusb:0= )
+	lcd_devices_bwct? ( virtual/libusb:0= )
+	lcd_devices_curses? ( sys-libs/ncurses:0= )
+	lcd_devices_dpf? ( virtual/libusb:0= )
+	lcd_devices_g15? ( virtual/libusb:0= )
+	lcd_devices_glcd2usb? ( virtual/libusb:0= )
+	lcd_devices_irlcd? ( virtual/libusb:0= )
+	lcd_devices_lcd2usb? ( virtual/libusb:0= )
+	lcd_devices_ledmatrix? ( virtual/libusb:0= )
+	lcd_devices_luise? (
+		dev-libs/luise-bin
+		virtual/libusb:0=
+	)
+	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
+	lcd_devices_mdm166a? ( virtual/libusb:0= )
+	lcd_devices_picolcd? ( virtual/libusb:0= )
+	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
+	lcd_devices_png? (
+		media-libs/gd[png]
+		media-libs/libpng:0=
+	)
+	lcd_devices_ppm? ( media-libs/gd )
+	lcd_devices_samsungspf? ( virtual/libusb:0= )
+	lcd_devices_serdisplib? ( dev-libs/serdisplib )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_trefon? ( virtual/libusb:0= )
+	lcd_devices_ula200? (
+		dev-embedded/libftdi:1=
+		virtual/libusb:0=
+	)
+	lcd_devices_usbhub? ( virtual/libusb:0= )
+	lcd_devices_usblcd? ( virtual/libusb:0= )
+	lcd_devices_vnc? ( net-libs/libvncserver )
+	lcd_devices_x11? ( x11-libs/libX11 )
+"
+
+# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
+DEPEND_LCD4LINUX_PLUGINS="
+	asterisk? ( net-misc/asterisk )
+	dbus? ( sys-apps/dbus )
+	gps? ( dev-libs/nmeap )
+	hddtemp? ( app-admin/hddtemp )
+	iconv? ( virtual/libiconv )
+	mpd? ( media-libs/libmpd )
+	mpris-dbus? ( sys-apps/dbus )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	python? ( ${PYTHON_DEPS} )
+	wireless? (
+		|| (
+			net-wireless/iw
+			net-wireless/wireless-tools
+		)
+	)
+"
+
+RDEPEND="
+	dmalloc? ( dev-libs/dmalloc )
+	${DEPEND_LCD_DEVICES}
+	${DEPEND_LCD4LINUX_PLUGINS}"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	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
+
+	# Enable all users enabled lcd4linux plugins
+	local myeconfargs_lcd4linux_plugins
+	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
+		if use "${lcd4linux_plugin}"; then
+			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin/-/_}"
+		fi
+	done
+
+	local myeconfargs=(
+		--disable-rpath
+		$(use_with dmalloc)
+		$(use_with outb)
+		$(use_with python)
+		$(use_with lcd_devices_x11 x)
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
+		--x-include="/usr/include"
+		--x-libraries="/usr/$(get_libdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install sample config, and must have 600, as lcd4linux checks this.
+	insinto	/etc/lcd4linux
+	insopts -m 0600
+	doins lcd4linux.conf.sample
+
+	newinitd "${FILESDIR}/lcd4linux-r2.initd" lcd4linux
+}
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index a359d32d1f1e..d35d762d469f 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="apm">Enable the APM plugin.</flag>
 		<flag name="asterisk">Enable the Asterisk plugin.</flag>
 		<flag name="button_exec">Enable the Button plugin, to execute something on keypress.</flag>
+		<flag name="button-exec">Enable the Button plugin, to execute something on keypress.</flag>
 		<flag name="cpuinfo">Enable the cpuinfo plugin.</flag>
 		<flag name="dbus">Enable the dbus plugin.</flag>
 		<flag name="diskstats">Enable the diskstats plugin.</flag>
@@ -29,7 +30,8 @@
 		<flag name="gps">Enable the gps plugin, for reading gps coordinates.</flag>
 		<flag name="hddtemp">Enable the hddtemp plugin, to read from the hddtemp daemon.</flag>
 		<flag name="huawei">Enable the huawei plugin, to read from a huawei device.</flag>
-		<flag name="i2c_sensors">Enable the i2c_sensors plugin, to read sensor data.</flag>
+		<flag name="i2c_sensors">Enable the i2c-sensors plugin, to read sensor data.</flag>
+		<flag name="i2c-sensors">Enable the i2c-sensors plugin, to read sensor data.</flag>
 		<flag name="iconv">Enable the iconv plugin, to convert between encodings.</flag>
 		<flag name="isdn">Enable the isdn plugin, to get information about ISDN.</flag>
 		<flag name="kvv">Enable the kvv plugin, to get realtime train schedule from the Karlsruher Verkehrsverbund.</flag>
@@ -37,12 +39,14 @@
 		<flag name="meminfo">Enable the meminfo plugin, to get memory statistics.</flag>
 		<flag name="mpd">Enable the mpd plugin, to read from the Music Player Daemon.</flag>
 		<flag name="mpris_dbus">Enable the mpris plugin, to read data via dbus for mpris.</flag>
+		<flag name="mpris-dbus">Enable the mpris plugin, to read data via dbus for mpris.</flag>
 		<flag name="mysql">Enable the mysql plugin, to get mysql database information.</flag>
 		<flag name="netdev">Enable the netdev plugin, to get interface statistics.</flag>
 		<flag name="netinfo">Enable the netinfo plugin, to get more interface statistic.</flag>
 		<flag name="outb">Enable raw i/o access.</flag>
 		<flag name="pop3">Enable the pop3 plugin, to get notified about new mails.</flag>
-		<flag name="proc_stat">Enable the proc_stat plugin, to read data from the proc file system.</flag>
+		<flag name="proc_stat">Enable the proc-stat plugin, to read data from the proc file system.</flag>
+		<flag name="proc-stat">Enable the proc-stat plugin, to read data from the proc file system.</flag>
 		<flag name="python">Enable support for dev-lang/python and enable the python plugin, to execute own python scripts.</flag>
 		<flag name="qnaplog">Enable the qnaplog plugin, to read a log from a QNAP device.</flag>
 		<flag name="raspi">Enable the raspi plugin, to read sensor data from a Raspberry Pi.</flag>