gentoo resync : 25.11.2020

3 files changed, 2 insertions, 95 deletions

diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index da8677d2f709..55e380fa5da8 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,6 +1,4 @@
 AUX graphlcd-base-2.0.0-musl.patch 334 BLAKE2B 4930f69284c65ac852c54ce921fc3860bfbb34b2402daad3c58c0bc1aed704065db6b8698bd004b0eda95d8bc23b7a39ebdef42a529c40ca766fc685d21efbb4 SHA512 02f5628e59d0d0144ab51d8eba5abc914d7fbb10997d0ed90fddaad4f359b7cf390154bf70743a7edda9ab14fd56d4af37f9f1761385fa7965013be7623cdfaf
-DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
 DIST graphlcd-base-2.0.0.tar.bz2 522921 BLAKE2B 34223a84b11fef03d6dbd3f9d5f17362206823a5df0828b7494e88809f313ccd82ccc3ef62df129e6ccd6912a4152829a49c56024976aaf58fbf127d98b0903c SHA512 7fd0d558df16b845b4cd788f597552be85563b00d26d37181b3e0cc7cdc1a9eb00f2437b1c0dc6e9bb7851c6c9168dcc2d952898c1a371aeb8684b6c6aa8d995
-EBUILD graphlcd-base-1.0.2-r2.ebuild 2260 BLAKE2B 7a960a69fa4e1156fe07487207a1ab91fc8b6f324bd5d7803906d6eede089dae5bc22cabef9352ccc44a70319897f7008901cb86c261e9fad3c099ed00e66acf SHA512 dcc3c86ebca122bb90743961e4c8cca049124520b98b2511e37858e008fd5ab7dd34da76d9797763d76242f2a6cdf8ba8d6563fe41eccbdffeb03ce8a01140ea
-EBUILD graphlcd-base-2.0.0-r1.ebuild 2255 BLAKE2B 6ce25c403b1602079a59b5687d505d6d3fecf443bba119b4cee035f064c49ba6d60d5a2da17faa99fb83afcecc572ecec5d064d2dbcc52e4083ea7c3c1de0247 SHA512 0928035a4eda13629dd55bd4d7d14dec10945582014c50f6d865fb7648eb3d43b880619d90d32ec5dc17ce6666f53dda7e8bd66ce8b5af8f17a9a0213a5dce02
+EBUILD graphlcd-base-2.0.0-r1.ebuild 2253 BLAKE2B 0e83b669cc0dd70229486acfa64f924e15db37101ec7f93e4a6b8f52367a18e1c2e6cb3f160950e51c38632febc30027b4cb908dc77b92580089bcfee50733d9 SHA512 15f511771840a9ffe67d73370bf69aa1eb4bf5132149dd7648a49e7914b83a8bbad79898e59625fed5be84620bcf06bfd2f44c51cef4c5d3ffab7a3c1f1e453c
 MISC metadata.xml 1009 BLAKE2B a227fe76bfafa6f3aa6977ec5bd56959187999926e4c95436411e255db079d919fb174970b198bc8a26cb488f82e8466512342e00cca4f7a367e6d5730dc8f6b SHA512 8bccbe3bf3457e280fcbe9bded2cf5bb78f64ce528b5bed27249e33392f9fef6d2716744c08385df915e0839d9146b1e0fa2db7b46d574e9a7cedf4a8079240a
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r2.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r2.ebuild
deleted file mode 100644
index 8dab507a5d16..000000000000
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature toolchain-funcs udev
-
-DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
-HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
-SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-
-RDEPEND="
-	dev-libs/libhid
-	net-libs/libvncserver
-	freetype? ( media-libs/freetype:2= )
-	fontconfig? ( media-libs/fontconfig:1.0= )
-	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] )
-	imagemagick? ( <media-gfx/imagemagick-7 )
-	lcd_devices_ax206dpf? ( virtual/libusb:0 )
-	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "HISTORY" "README" "TODO" "docs/." )
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" )
-
-src_prepare() {
-	default
-
-	# Change '/usr/local/' to '/usr'
-	# Change '/usr/lib' to '/usr/$(get_libdir)'
-	sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
-
-	# Fix newer GCC version with the Futaba MDM166A lcd driver
-	sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die
-
-	tc-export CC CXX
-}
-
-src_configure() {
-	# Build optional drivers
-	if use lcd_devices_ax206dpf; then
-		sed -e "78s:#::" -i Make.config || die
-	fi
-	if use lcd_devices_picolcd_256x64; then
-		sed -e "81s:#::" -i Make.config || die
-	fi
-	if use lcd_devices_vnc; then
-		sed -e "72s:1:0:" -i Make.config || die
-	fi
-
-	# Build optional features
-	if ! use freetype; then
-		sed -e "59s:HAVE:#HAVE:" -i Make.config || die
-	fi
-	if ! use fontconfig; then
-		sed -e "62s:HAVE:#HAVE:" -i Make.config || die
-	fi
-	if use graphicsmagick; then
-		sed -e "69s:#::" -i Make.config || die
-	fi
-	if use imagemagick; then
-		sed -e "68s:#::" -i Make.config || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	udev_reload
-
-	optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
index 07ed81f3ce63..ccc4b2335727 100644
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
 HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
 SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"