gentoo resync : 25.08.2020

4 files changed, 96 insertions, 6 deletions

diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 0fe6496cf799..7d1169d4c2d2 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,3 +1,5 @@
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
-EBUILD graphlcd-base-1.0.2.ebuild 2187 BLAKE2B 2815e92d5d4e1c97a86d8fee3cf36e41c94fbbf6bcc59e378d2f03e8205a7e524843633dc8335f78e07720512575e25d865022c48b199b12dba470d170b2d69b SHA512 2951e92b05e00f47c51e7d53122065f4a3e450f92927d657f15f57f9059b9799282990a8d534a5a6d531048935b2c37a3da99281bd01778100c72058d2107cd7
-MISC metadata.xml 1117 BLAKE2B e3d013a602807ef6a36ad0975c6b31ce1f99933fd50411882095595df5913077e257e08d019060216df048c6b01d38c296725efa329aaba7a376e1102aba458a SHA512 9bf31404b8812b414871f45d9312b6e2dfd492ef4ff3de0230d1eec731b93875729d76fb0e2a06f383aa88d8921f03fbf2e4a054e7ac794722eae32bcd99b747
+DIST graphlcd-base-2.0.0.tar.bz2 522921 BLAKE2B 34223a84b11fef03d6dbd3f9d5f17362206823a5df0828b7494e88809f313ccd82ccc3ef62df129e6ccd6912a4152829a49c56024976aaf58fbf127d98b0903c SHA512 7fd0d558df16b845b4cd788f597552be85563b00d26d37181b3e0cc7cdc1a9eb00f2437b1c0dc6e9bb7851c6c9168dcc2d952898c1a371aeb8684b6c6aa8d995
+EBUILD graphlcd-base-1.0.2-r1.ebuild 2214 BLAKE2B 9ad78dfc2f604d56584924debf66a9fc3d2dd0aa69f1973afc9904e305872cb00debcf7f8f727719b0199374d459f171f778b502a8fc7c0a4e4a0fb24fa7ece4 SHA512 72af5113f2132a857ee53a17a129cbcc2508e5932caff3f5d6461fe529162ecb7ab269b134afb58d1f8b7187a0d451f2e6825774c84264cd671e15c1d136d6e4
+EBUILD graphlcd-base-2.0.0.ebuild 2203 BLAKE2B a4cc16b6ca862c9d7ce465a8cd8ebc703934394b66911d1f986d98fcee8bb21ebe0d1abc0dd1c833e0da34c8de32013f18b4d3bf7f07bf0b90df43ae533da50e SHA512 784bc5fb63bae7b310ff7f32e6a4e67485508b6640f42dfd4939e9ed43f1a6e4d0ee0f0be02d46cf82b82deca709e646680a15ebdcbaa228485ad68eecabd1a5
+MISC metadata.xml 1009 BLAKE2B a227fe76bfafa6f3aa6977ec5bd56959187999926e4c95436411e255db079d919fb174970b198bc8a26cb488f82e8466512342e00cca4f7a367e6d5730dc8f6b SHA512 8bccbe3bf3457e280fcbe9bded2cf5bb78f64ce528b5bed27249e33392f9fef6d2716744c08385df915e0839d9146b1e0fa2db7b46d574e9a7cedf4a8079240a
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
index 9aa1ba4ab64d..d865aa64e510 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ 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 g15 graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
+IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 
 RDEPEND="
@@ -73,9 +73,9 @@ src_configure() {
 }
 
 src_install() {
-	default
+	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
 
-	udev_dorules 99-graphlcd-base.rules
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
new file mode 100644
index 000000000000..ddb8aac8b96d
--- /dev/null
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils 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 )
+	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/." )
+
+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/metadata.xml b/app-misc/graphlcd-base/metadata.xml
index 3e6de0049c66..3f12c9e81353 100644
--- a/app-misc/graphlcd-base/metadata.xml
+++ b/app-misc/graphlcd-base/metadata.xml
@@ -20,7 +20,6 @@
 	<use>
 		<flag name="fontconfig">Add support for <pkg>media-libs/fontconfig</pkg> font names.</flag>
 		<flag name="freetype">Add support for <pkg>media-libs/freetype</pkg>.</flag>
-		<flag name="g15">Add support for <pkg>app-misc/g15daemon</pkg>, used by the Logitech G15 keyboard.</flag>
 		<flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg>.</flag>
 		<flag name="imagemagick">Add support for <pkg>media-gfx/imagemagick</pkg>.</flag>
 	</use>