gentoo resync : 25.08.2020

3 files changed, 3 insertions, 105 deletions

diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index 8d91940f1ecc..f9fcc1fcd431 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -1,7 +1,5 @@
 AUX disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
 AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
-DIST serdisplib-2.01.tar.gz 472998 BLAKE2B 7ee78703d1d2cb4172e44db443825dd0fb3080284e832c60a102b853a1df6e0812a30a40504b8eb3e5ecda83f57138d78b43c3c40b8e4efabb7071eff7ad1b3e SHA512 0474cce4353edb3640d8432272905859e90efe6140e6791c84e1cb51df7f533734a9c78447d8d8448a70e62dda6d65061bbcc515ee346354825029874ae5e9a9
 DIST serdisplib-2.02.tar.gz 497028 BLAKE2B f35b6df60303a288b2a279d821a510089802019f33b7ee36b9c2fd1d1d6bef0b3118793e6d965076c1665e1e2555a553186ef1a9210712ef9d2bc1e090ec0a98 SHA512 d9936c25dc14e24eb02876f203476752340e621d8ee5c87ee99862575e45199bf46ff8487dfdd80b16a89543958fdf5a16a2aaf78d5cade06811cfb1592c45eb
-EBUILD serdisplib-2.01-r1.ebuild 2557 BLAKE2B f9975f1674dc9eb783c27c8abd4afbf264bf0458f08fb542af48d12b1a48688e86f39a775e8c467286a39ba6fa73a4c4829bb7fca529c6628e48db2ce0e2e1c2 SHA512 696eed79e76bd9aac399ce29d123966c325f6313c15b941080192e41fc9ea8579d817059afaad1bb2a1a59b1ff3b9701e82f04b91e9c808ea09537067730b576
-EBUILD serdisplib-2.02.ebuild 2559 BLAKE2B 9d19520bb7762b794b49c6c0e110f680f1340b8b1cbfe8bf9e914a58f025f99b62950f95b1a56dc05e382e571bd903067df58d29d85b10ebbcc1edcce9482a6a SHA512 e0eb83121bd6e33b01c67f286733bd46aa48dd7fc3c5352b11be786e7f15bb7d72393dec569b15a791c18097dd3729e72846f41975a67acc7e45b1365c93ab96
+EBUILD serdisplib-2.02.ebuild 2556 BLAKE2B abbbf9c3e17ce00f2208664e62427d4fb91361ae16a7bc9b76e7f0917c7bd17518d95bf8eff374f5548276eaa5d49c0f152b16b877b16528920b356997499713 SHA512 80627f7f272a80678374611457131de45e6e80ed48b4e5cd0851b4aee3f41627ece004686dc939eb6ece718724f505b2e8423c42e6307886fddf62dabcd8d0df
 MISC metadata.xml 662 BLAKE2B 08a9e0f6642a8e77f31b102b1874b32e43728451e92ad3db770c06b93a3653c575844fdb1b92d4969640327b94ea56aec3caffe3afd48540709fde7c541644ac SHA512 5f67e02b44a93b45ac7f08be8e569d2974a761f54c4ddc90cc541459adc3e41b5702405d971f29c094e4b7755975d9f5cd4ba4ad0f6d9ee116e5fd6f4a2c2b91
diff --git a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild b/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
deleted file mode 100644
index 04801dd9ca7f..000000000000
--- a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
-HOMEPAGE="http://serdisplib.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="threads tools"
-
-# Define the list of valid lcd devices.
-IUSE_LCD_DEVICES=(
-	acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb
-	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544
-	remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
-REQUIRED_USE+="
-	|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) )
-	lcd_devices_framebuffer? ( threads )
-"
-
-# Specific drivers will need some features to be enabled
-RDEPEND="
-	media-libs/gd[jpeg,png,tiff]
-	lcd_devices_acoolsdcm? ( virtual/libusb:1= )
-	lcd_devices_directgfx? ( media-libs/libsdl )
-	lcd_devices_displaylink? ( x11-libs/libdlo )
-	lcd_devices_glcd2usb? ( virtual/libusb:1= )
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
-
-PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" )
-
-src_prepare() {
-	default
-
-	# Fix Makefile, as it will fail, when USE="tools" is not set
-	if ! use tools; then
-		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
-	fi
-
-	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
-	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
-}
-
-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 use_usb="--disable-libusb"
-	if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then
-		use_usb="--enable-libusb"
-	fi
-
-	local myeconfargs=(
-		$(use_enable lcd_devices_directgfx libSDL)
-		$(use_enable lcd_devices_displaylink deprecated)
-		$(use_enable lcd_devices_displaylink libdlo)
-		$(use_enable lcd_devices_remote experimental)
-		$(use_enable threads pthread)
-		$(use_enable tools)
-		${use_usb}
-		--disable-dynloading
-		--disable-statictools
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	udev_dorules 90-libserdisp.rules
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-libs/serdisplib/serdisplib-2.02.ebuild b/dev-libs/serdisplib/serdisplib-2.02.ebuild
index 3014edbec361..9fb47346044d 100644
--- a/dev-libs/serdisplib/serdisplib-2.02.ebuild
+++ b/dev-libs/serdisplib/serdisplib-2.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="threads tools"
 
 # Define the list of valid lcd devices.