gentoo resync : 25.08.2020

4 files changed, 8 insertions, 187 deletions

diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 3926e6cadf8a..7f9ccd73f125 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,6 +1,5 @@
 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-r4.ebuild 5561 BLAKE2B 2e2bb11514bd884f02649b6a620a9f4f92097a8d53bc04e1e9b594ea0022ee00de1facd1189c1d93b68edcb9677469c5cb6190fede0ce47eee9ec89ef199204c SHA512 8c2661960d0e099309b0f28f82c301e56accae7a85ef70edbb133fc4ad4c4be71b20b36cecb1f50a8ffcd680e8ff8f55e69ec201fa270dc9b22d08900c15606b
-EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6017 BLAKE2B a715a37f3c9125a15b6f71bf68911484ed7b79a058f8bc060d51691cd94ebf624fc7a60ed9079727c4531bc131f68679fee69cfc05b87e0b4f2852f0f2c07f2d SHA512 5d2ec4fa02fb0d2e1ff79f0d5d54ad4112b9ae7f9d317ea8048ab30c916d36a9cfbf5446ba59517eeea3ee24bc7abc7847ef0036b98fd2537334636e954143b9
-MISC metadata.xml 3436 BLAKE2B 7c72d72e9be5929fac6f655c2607e5b4140ffb499b4dd3dadfb8a23202c9dedc80650de7593331cb617dfdd04a321679c91e23f7ad187569ab54790eb1dcac49 SHA512 e38a9292bd89f0fa2027b131c60b9faa82c3e12c76caf22d3ec36fe33b51cf3dba3d5e753e2a2587dbc576d5c6a89662806f006d6a665ad1b00f87a6c1b6f29e
+EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6022 BLAKE2B 25a6ed8c7bb2f7f722bb8bc2cf14af4ca48e288e787b47f06a970531f1df0843c3ab5daff2238303264771b154b6357938cc04d6be5a65ff95838e1cb2ea40dc SHA512 bf818e0d9bc24e2653d2886a8671fcf965c94133211cca8e79d4ceabde3c9ea13a24e89c5c6d99d31a56b4ba413afcb797d928286cec9d087f727dbf40b1116c
+MISC metadata.xml 3520 BLAKE2B 061b85175547ddd4e0571cfca26438e324313143eb7435f358c9ee4eccc12eef8c5ffcd31bcb0318bd1d7b283d0da8075d1e8bc0338ec9702d42459be25066ed SHA512 9d26b18c84e6f1cff74fb8a5007f5ef1e7ef1b42aba4cc1fb408af1105433db8e1eef8ff24406071f0b7009bd29fdc924855a8a9e0bee954118c736c9e7fe4fe
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
deleted file mode 100644
index 99a2dd057f55..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# 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://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-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/lcd4linux-0.11.0_pre20170527-r5.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
index c8254373f7a8..cfb01cb28216 100644
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
 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/"
+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"
+KEYWORDS="amd64 x86"
 IUSE="dmalloc outb"
 REQUIRED_USE="
 	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
@@ -73,7 +73,7 @@ DEPEND_LCD_DEVICES="
 	lcd_devices_lcd2usb? ( virtual/libusb:0= )
 	lcd_devices_ledmatrix? ( virtual/libusb:0= )
 	lcd_devices_luise? (
-		dev-libs/luise-bin
+		dev-libs/luise
 		virtual/libusb:0=
 	)
 	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index 669193270cb0..a7279fdf0c72 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -49,4 +49,7 @@
 		<flag name="w1retap">Enable the w1retap plugin.</flag>
 		<flag name="wireless">Enable the wireless plugin, to get wireless statistics.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jmccrohan/lcd4linux</remote-id>
+	</upstream>
 </pkgmetadata>