gentoo resync : 29.12.2022

3 files changed, 244 insertions, 0 deletions

diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 01e507ddcdb0..d3fc9202402d 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,5 +1,7 @@
+AUX lcd4linux-0.11.0_pre20170527-libtool.patch 1137 BLAKE2B 4247f176b8146ddedea3bd6a93af0255b00b1f93079f6269e587ded25c550030f0d2cbc951d20a2df0f388dc7baafcb594e4ead9056a9e4f1ae9b22c71dd8e13 SHA512 137eebf5b0d8cafc88bcc24968e48d7275921d9e3a5d6c3a2aa2265e460da00077f734d39b5696360e336887a901bc4c51adec56f8abc2fd610e2f736f9d2b99
 AUX lcd4linux-0.11.0_pre20170527-python3.patch 1437 BLAKE2B b6b3e3267761d4b8df64687137451bba8cb564e9de2c5e1891061d0adf7927aeb1834ef40d46594569f3fa04141083ef43957efa54dbbac7a83a1ffa742e1f76 SHA512 ea4ddb89702d37200e0118df019d3971dd85f977ffeb1f50b3b54d48536efa91e9f0747bd235a68b0b0a33f7a7a3be76b4a29e852431a17887b370200e2cfe62
 AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
 EBUILD lcd4linux-0.11.0_pre20170527-r6.ebuild 6032 BLAKE2B 038142850695f63640a61f875d2745c14081c007c1e2f6fd95d81ceba229e4dc2d364981b0499535b1a471bb0e99f331cf8854613307e0838f60081f29b371f7 SHA512 503c71a9baafe2cc1188abe54f1763620493d954a220c1a1f109ca6a6b18e4a6a0703fabc77ff9a6e8bdce97c8d173a7346889b390dcfda10f084ec499d74693
+EBUILD lcd4linux-0.11.0_pre20170527-r7.ebuild 6082 BLAKE2B a9f318dcdd93e095cab96f478eb9e755ddd8bed765dea0c6d9547616b7391d4a864eae3f72ef253c9d42af5141d173da71b6366b32bd1afb97ac40a816afe5fd SHA512 824e03411340c5bfa36d28aa22297de962f09940d630b58ebad169469c564220d17511a1b8c26eaa29a31046d26ba18ff193c6acee1abccdf7f3d3b472ba8d09
 MISC metadata.xml 3521 BLAKE2B 9298d38f09f03e569eebc1166d344ac0af5f21a8bafa0023a17075f3c98901cf3c31f6de78e0376008a0dd1560da9d54421a87c66ac44a46f41596a4d66742c1 SHA512 bc96d20515ef44346ad270964b23e58ed3e8d7102ea7a5d194dbcf3b67c6e8a1e2ad5a7cc76804fd15131ce7b0e4a2e95c3d546a33a9bddf7d7b3b433f60cc01
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-libtool.patch b/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-libtool.patch
new file mode 100644
index 000000000000..3ba98fdc1503
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.11.0_pre20170527-libtool.patch
@@ -0,0 +1,40 @@
+Upstream-PR: https://github.com/jmccrohan/lcd4linux/pull/3
+
+From cffb509a8471b26177de0887e5461a408fdb8e35 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 20 Jun 2022 17:43:23 -0700
+Subject: [PATCH] configure: Use macros earlier
+
+When building with slibtool using the rlibtool symlink the build will
+fail because it doesn't find the generated libtool. This is required so
+rlibtool can determine if its a shared or static build.
+
+This can be fixed easily by using LT_INIT earlier before AC_OUTPUT.
+Generally these should be used near the top of configure.ac.
+
+Gentoo Bug: https://bugs.gentoo.org/783492
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,7 @@
+ 
+ AC_PREREQ(2.59)
+ AC_INIT([LCD4Linux],[0.11.0-SVN],[lcd4linux-users@lists.sourceforge.net])
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR([lcd4linux.c])
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+@@ -40,6 +41,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ PKG_PROG_PKG_CONFIG
++LT_INIT
+ 
+ # dmalloc
+ AM_WITH_DMALLOC
+@@ -171,6 +173,3 @@ AC_MSG_RESULT(
+ [  $PLUGINS]
+ [-----------------------------------------]
+ )
+-
+-AC_CONFIG_MACRO_DIR([m4])
+-LT_INIT
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild
new file mode 100644
index 000000000000..2f2874567136
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r7.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A small program that grabs information and displays it on an external LCD"
+HOMEPAGE="https://github.com/jmccrohan/lcd4linux/"
+SRC_URI="https://dev.gentoo.org/~conikost/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
+		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}"
+
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libtool.patch" # 783492
+	"${FILESDIR}/${P}-python3.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use python; then
+		# Shipped one is outdated and doesn't know python3, use system's instead.
+		rm ax_python_devel.m4
+
+		# Use correct python version.
+		# (See: bug #793869)
+		append-libs $(python_get_LIBS)
+	fi
+
+	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
+}
+
+pkg_postinst() {
+	if [[ ! -z ${REPLACING_VERSIONS} ]]; then
+		use python && einfo "Starting with this version, the python plugins now uses python3 instead of python2!"
+	fi
+}