gentoo resync : 20.03.2022

3 files changed, 226 insertions, 3 deletions

diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 4d3e9af452f8..e6d189dac86c 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -6,5 +6,7 @@ AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75
 AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
 DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd
-EBUILD lcdproc-0.5.9_p20200721-r1.ebuild 6273 BLAKE2B cc138508e66102a3666809c6a22e2dce10a06848b480a220fc679b85ced8b4ff7bab6239ce7113350b25a06deba9aee8ae23529c1922d6e807f5f1fbd4145cd0 SHA512 a35e94408dbc28c1cd54c5fdf90456b1f1eb9c60bef2b04ef47f1c1b7bcc8736d9db9e1ec029716b2b5323f20cc9a9bcbad5ce6f13f4c35ce5bbdb02fd59f698
+DIST lcdproc-0.5.9_p20211220.tar.gz 941272 BLAKE2B 910504e86a8c3b2c764b20b175b76287166c6fa1d93fec74e7ea91adc7027530a40f415c26c2820f300d2bf5222e9bebec082aedf76b53d0a70a386c91b8d540 SHA512 6901a92cb8d7102f5fb429d59d416fcd98b57e1cae41bddbfe592befaa97738acff3d46be250cbb5b1ad012322f88ac549d220e96aa399bb4cd8c19ee28407c8
+EBUILD lcdproc-0.5.9_p20200721-r2.ebuild 6273 BLAKE2B f71841b9fcff2c2399411523a051dfcc39cc212570b13186f63dd2f10a1d8d81e554f20f806d4c4e93751bc7069b62bd10e310072a4ae122139bc1f36e232d39 SHA512 4cbbaf98aa4c07a5fbc41b4fc2860a307d8cfdb36910eab66482d727094323ffa5b0b6a9227bdca8f2cf4ee87155da05c103e3da9197f5543f82c28c7f24cecd
+EBUILD lcdproc-0.5.9_p20211220.ebuild 6203 BLAKE2B 1887cc69812a6804ed5348d364cf228b6f473a821c1e16bc0970a9f5e2912a50b445049237c08d03177a43ce6474014fe9df34a3c91b4a30b7c368739f08cafa SHA512 9877cbf6cc21655f8d7dfd084edc83842bdb729a001e39a277b0cfc16221c9d9c1d9d4c9ee42aa73aa86ccbf478f8fc0d68c280ff8996ae3337ecb160581560e
 MISC metadata.xml 1539 BLAKE2B d2f01507bd93dbaf286576e2f66e5c617f8b0fbfbbe94565f5de2eee406fdd7a66d77467db5af7c521ff3838b718a4872fac74332f587ff602c20681b968a09d SHA512 d5a36d6c40c5c49245f62dee9063fad6eb8f1391ac694bd7a2a9cc1cdc0cc1d74659a3e2baefd9750f3267aee8ae53dfc1b3527c32e3e4811b268d45ac5f83c1
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild
index 5cf2727dfe34..32ab3bf75e73 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r1.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.9_p20200721-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 EGIT_COMMIT="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1"
 
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20211220.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20211220.ebuild
new file mode 100644
index 000000000000..52b0722dfbd5
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.9_p20211220.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="0e2ce9b9c46c47363436f9ee730f7c71bf455f0f"
+
+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" )
+
+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
+}