gentoo resync : 18.11.2018

11 files changed, 359 insertions, 16 deletions

diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 4898e52079d3..f4c4c76678e4 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,11 +1,22 @@
 AUX 0.5.1-LCDd.initd 533 BLAKE2B 65263278bb7bd6cbba7d4c599cefd3735dd5d16ad0d56c130cf035286c7fe6d19c546d43662a513e73eeeaae154f6f24aecd534531e960cf67c6cade635bc8b0 SHA512 66e6ac519ca9919dc1321cdfbac3c8a54be681f534dcdfd06b5ec90c859a14694c6a6925983c3be58f2aa8d6391028fd8d978d7641710a23394ae87dca892900
 AUX 0.5.1-lcdproc.initd 364 BLAKE2B 62cae56b4e7093e7866a3f0f4d64d949930566f4434fb9dc1d6fc104b793f7d4762c3697409de429e8cb73aa0b6ed3cdaa05195acfc594eb25ac61aa47aec7e7 SHA512 4dce2d2e3d18c8fb57c7a84b2f9b7c67b8721e751af1a79fe60107a1559baacbf3531d5a495f68dd2ed890f9dd6d1834b51363e9ae96b606245bd2dc72680e34
 AUX 0.5.2-r2-lcdproc.initd 382 BLAKE2B 9e050b785119e23a749f52a893d2672cab608e7a5881319e1dc230e77ad9ce647f7258d86a8a710aebaf3de94fb691c1e974c21b2445453cd6bd5ca3c0ae3bec SHA512 9dc7667af52a2e95a28ee07c7646a124b46019643df19becc8f129da553a70b40c534b6c73057c73238efd232e98f02372d55a92135fccd9c297d776c53d3767
+AUX LCDd.initd 310 BLAKE2B 415321c1b8c80016f21e283339e21c6adbbb92dbf99649846044f329f23853b603878058f636695ff5c4c8d52938077a46d02c915ed5b225e086b87b5379d6ba SHA512 7ea73b919e81d98d5732624912195f06f711dc34112ae2c5079d325c58409521d6049dbb541d7ae701bf0ce6c9a1f13a8aa0929ef4a7d9184c176f9f3ab3bfc8
+AUX LCDd.service 166 BLAKE2B ef3d9a7af9e8e8d8bb54e11110dbcb44c968cbc8fec63529f86dbb0a027154997d12e927405ca228a5740fcadc7518448c640ddbe5f38eabee1b7698b17b3035 SHA512 d09829efb26c9b8ca01f6cd07f704d55d05b3328866c169251683b1343ec37e569f95ad14b3b51e2d832ea7b0d3eba5579cec02decb86504016e535a61d7ea46
+AUX lcdexec.initd 325 BLAKE2B 7a7b48e2e24c763533934bca78debd36a1fb6146f6e72204777f50d7dc962a519ab06ef0bc9b1c91b36cd726b67679e7a94d2edbd28bd524ecccf6d20f6a53de SHA512 f8bf380b2e452e830cc3805f297d06c4cdf623db91eff310da2b20cd87cd87ef850c1c7e5b843044333167fa8724acb8de8d65752328ec4144b486d0bed6bfce
+AUX lcdexec.service 171 BLAKE2B cad9c32ce67365158a210fbc65c794881cf84ddcba870019e2772eb6b0913fcbcba99f82f803621930b867d72c63f16bc61710174c35da0ba923e9f68dc119dd SHA512 5372cf10ee750122d2312ecb595a827aa3c5f14bf34049f90950b36b7a77a7c36bcf2d72a30dc6ebf8830251c901c9703c05a6c92fdc580940b6ffe1e421cb2f
+AUX lcdproc-0.5.9-fix-parallel-make.patch 910 BLAKE2B 5a9daa1871e64b4bfcc7ea2fbc06f0e4ec6493fe61d678d5b0cc252764ecbc1906c102f2347e18a10432bd390b19d990a270423e8054690283b17174a8297a08 SHA512 75c42f716175751c07b5385f87c2d378229c59cb7ef5adb517b23d3c032373627f9d6173987251c5d3c259764dbaa2ad167d8769bdcb2afa1b1387ff1926a316
+AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75f5306ed26a5447289618575c26873bf5335c94286c36dc0444b2ef8b74dd7087b0a3d2529602c25de680ff534df303e094a90f258f8bd SHA512 d5922c61274b420dc3138c5345868924ab7562f7aaa267068c925b4c36b74309ce8132103e265cdfc5b84cb6f3d6f5bea7036c617e14e7a22aa32c360202014e
+AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
+AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
 DIST lcdproc-0.5.2-patches.tar.gz 6571 BLAKE2B 11cc34b39ceed329ba1aa9d0750a5c90dc0ff33f0650a3e285fd534b54928dc5f6d93854e530c249ed61fa1dde2cd369b32df82dbcb6c4ab3e6d1844672a5692 SHA512 d872099e524ed99525b642783d413f0cbff68aceb30857a4b7078390be9f98aa3acfa23c72e4455802376bc1bedb20019fa8a79e97066e2a1e97b5d68fbcd975
 DIST lcdproc-0.5.2.tar.gz 822695 BLAKE2B f7065c2d6ee1c6305d3682166bb2b4920a9f0ac2a079b57389f76edf75c81fa9ebe954358b216dbad866e2daa10f95857106e125cc54a9207a98553f408ae77b SHA512 e21a1f2d3d5f53aa09477e9aea1f9685c1fe224a8f79f15d0d032214de211c51619a9eea9183743c024859349d481fe35d7999cc51e0de81dc2fa8e0c85d7a5d
 DIST lcdproc-0.5.5.tar.gz 946206 BLAKE2B eb9e1248e84d4c9352a39991a1125e74cbfee9094d19a75da4298811120fcf2ef8fef056b35873b6308af79f92eb9187e504f43c4b28c07ca402de2c5d8fdc97 SHA512 42500188adb018547db4db4a472dded478a03f19974843865e07a466870fbca409b4259b57366b7dfdd4a5fd444a89c1930032d1127ae036128dbd9279a24b29
 DIST lcdproc-0.5.6.tar.gz 998996 BLAKE2B 022ce656390caea0c9394ca7a5458f7285e2655f53c49f6fa7d9f94c0638f9f97cc70af66bb779a6b7ca8024b70c2865d51719b72918a4a7da3f6af7d4451976 SHA512 7c506b4691c8544855dadf939863672230c3e0903bbe4bbde82df04ff932f818cdc406c5b159554ec155d0c46fff23d435121298f4e19bac73658b121c6b8220
+DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
+DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
 EBUILD lcdproc-0.5.2-r1.ebuild 5511 BLAKE2B eaa3431092a1e7794f24b7905e1c6c61a9d268179dfb093bd17a99aeb9a80a88ad9569a29ab8126db6bfeccd54369cce46513a3b625d15e8cdb7c9bc7003a7de SHA512 8a97517fa76ff856a7b56266efd77be52c269c1e651d7ff2bf836554be7bac84db3e0021d18a73592dfcb054a99f9efe7ca4de11f683d59f6a829523aae3f684
 EBUILD lcdproc-0.5.5.ebuild 5888 BLAKE2B 05f74abb99fba00d7cc2b2d633d0c41a743fe0537426b4997970d7fb2df1c89c5bb18e00ae24b7979a51de365f761672516ee266a6b570ed15deec484a8c8403 SHA512 3141859061d9a3d46814e361022c017ad1fab8eb92cad8a3561f371d03eef033908bd5d85391da5aa7a445309006a998699e2e5e412025ca074df5fd0f5ce130
 EBUILD lcdproc-0.5.6-r1.ebuild 6083 BLAKE2B 6d2a29febe9e6ba72fc254fb6d7c34f850dcf5b87f2115d01713b1eeac3b91b0e9004e2306b56774fe64cdbb261822dae08f50490d756a3f7cd2c58c9f52c006 SHA512 b18c7ccd63592c303081500055ada6e08c408002e0ed52e4a14fd6b799d0c70566104380eeaf1422fab424a9a68176fd37dcb2f99d614efb72587711476cd738
-MISC metadata.xml 1423 BLAKE2B b5f4d4202cc8178d0ddb4ace19592e15c5bdd68cd0239a219b866d3b6f7e404110858eadb81a7bbd456bc1db237754edfcf7bd9966a76755a81e4b5742712d7c SHA512 b62797738fd47a23fd83c31a027b1636374183488075e9c2073419ca6c08960c60d0bc6108c7148a144852dd45cad5ddd457879249331426f9594fac43cef306
+EBUILD lcdproc-0.5.9.ebuild 6437 BLAKE2B 803505496345bf5fd2fd39ee27442f534e901ce49c1e79698bea44afb82e0ab886171cd397a7bb1379e87521bd3e63467a91ce5303187fbedd8f53f91376488f SHA512 e7e4b02d4693df9a6e0f7b7f16bda22d6b00298458c35f68ac6f60f845c314a24313b32e44f5688ef05049de2bcdcec628b7d7fb4b081faeee2568a5ebf58160
+MISC metadata.xml 2261 BLAKE2B 71a100c5a9e9ff1810f925b027a09337634e6191bc38b828e779e99a92d942979a412d7b13eaf83aecb186dc6f7f55a1a9b743592292814d95225758e28df977 SHA512 e263460ac19220cc16d08a4199d5f623d7018b8c04655d9494db05524cf2e0e9437db2c0d87f22e21e827d4c4185ef0f11e775c515992395ae47a0d835bc739c
diff --git a/app-misc/lcdproc/files/LCDd.initd b/app-misc/lcdproc/files/LCDd.initd
new file mode 100644
index 000000000000..792ae9201796
--- /dev/null
+++ b/app-misc/lcdproc/files/LCDd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+instance="${SVCNAME}"
+name="LCDProc (${instance})"
+pidfile="/run/${instance}.pid"
+
+command="/usr/sbin/LCDd"
+command_args="-c /etc/${instance}.conf"
+
+depend() {
+	use g15daemon
+	use net
+}
diff --git a/app-misc/lcdproc/files/LCDd.service b/app-misc/lcdproc/files/LCDd.service
new file mode 100644
index 000000000000..bd53c8cae3cb
--- /dev/null
+++ b/app-misc/lcdproc/files/LCDd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCDProc (LCDd)
+After=network-online.target
+
+[Service]
+ExecStart=/usr/sbin/LCDd -c /etc/LCDd.conf
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/lcdproc/files/lcdexec.initd b/app-misc/lcdproc/files/lcdexec.initd
new file mode 100644
index 000000000000..b349ae972d83
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdexec.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+instance="${SVCNAME}"
+name="LCDProc (${instance})"
+pidfile="/run/${instance}.pid"
+
+command="/usr/bin/lcdexec"
+command_args="-c /etc/${instance}.conf"
+
+depend() {
+	after ntp-client
+	use LCDd
+	use net
+}
diff --git a/app-misc/lcdproc/files/lcdexec.service b/app-misc/lcdproc/files/lcdexec.service
new file mode 100644
index 000000000000..56ec3dd64cb1
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdexec.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCDProc (LCDd)
+After=network-online.target
+
+[Service]
+ExecStart=/usr/bin/lcdexec -c /etc/lcdexec.conf
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch
new file mode 100644
index 000000000000..763038d14ab5
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch
@@ -0,0 +1,16 @@
+--- a/server/drivers/Makefile.am	2017-01-22 23:18:54.000000000 +0100
++++ b/server/drivers/Makefile.am	2018-10-04 22:48:50.302344274 +0200
+@@ -47,11 +47,11 @@
+ futaba_LDADD =       @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a
+ g15_LDADD =          @LIBG15@
+ glcd_LDADD =         libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@
+-glcd_DEPENDENCIES =  @GLCD_DRIVERS@ glcd-glcd-render.o
++glcd_DEPENDENCIES =  @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a
+ glcdlib_LDADD =      @LIBGLCD@
+ glk_LDADD =          libbignum.a
+ hd44780_LDADD =      libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a
+-hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@
++hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a
+ i2500vfd_LDADD =     @LIBFTDI_LIBS@
+ imon_LDADD =         libLCD.a libbignum.a
+ imonlcd_LDADD =      libLCD.a
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch
new file mode 100644
index 000000000000..9149bf784276
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.5.9-use-freetype2-pkg-config.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac	2017-06-18 22:33:56.000000000 +0200
++++ b/configure.ac	2018-10-04 22:30:22.668770478 +0200
+@@ -389,11 +389,7 @@
+ AC_MSG_RESULT($enable_freetype)
+ 
+ if test "$enable_freetype" = "yes"; then
+-	ifdef([AC_CHECK_FT2],
+-		[AC_CHECK_FT2([],
+-			[AC_DEFINE(HAVE_FT2, [1], [Define to 1 if you have freetype])],
+-			[enable_freetype=no])],
+-		[AC_MSG_WARN([freetype does not seem to be installed])])
++	PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [enable_freetype="yes"],[enable_freetype="no"])
+ fi
+ AC_SUBST([FT2_CFLAGS])
+ AC_SUBST([FT2_LIBS])
diff --git a/app-misc/lcdproc/files/lcdproc.initd b/app-misc/lcdproc/files/lcdproc.initd
new file mode 100644
index 000000000000..bbeba4033c02
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+instance="${SVCNAME}"
+name="LCDProc (${instance})"
+pidfile="/run/${instance}.pid"
+
+command="/usr/bin/lcdproc"
+command_args="-c /etc/${instance}.conf"
+
+depend() {
+	after ntp-client
+	use LCDd
+	use net
+}
diff --git a/app-misc/lcdproc/files/lcdproc.service b/app-misc/lcdproc/files/lcdproc.service
new file mode 100644
index 000000000000..f2ee435a169b
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCDProc (LCDd)
+After=network-online.target
+
+[Service]
+ExecStart=/usr/bin/lcdproc -c /etc/lcdproc.conf
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-misc/lcdproc/lcdproc-0.5.9.ebuild b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
new file mode 100644
index 000000000000..a8eb7fee247f
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a LCD"
+HOMEPAGE="http://www.lcdproc.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+	https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
+REQUIRED_USE="ethlcd? ( lcd_devices_hd44780 )
+	freetype? ( lcd_devices_glcd )
+	png? ( lcd_devices_glcd )"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - svga: It needs media-libs/svgalib, which is masked and obsolete.
+IUSE_LCD_DEVICES=( bayrad CFontz CFontzPacket curses CwLnx ea65
+	EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd
+	icp_a106 imon imonlcd IOWarrior irman irtrans
+	joy lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a
+	ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD
+	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
+	sdeclcd sed1330 sed1520 serialPOS serialVFD
+	shuttleVFD sli stv5730 SureElec t6963 text
+	tyan ula200 vlsys_m428 xosd yard2LCD )
+
+# 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
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="lcd_devices_cfontz? ( dev-libs/libhid:= )
+	lcd_devices_cfontzpacket? ( dev-libs/libhid:= )
+	lcd_devices_cwlnx? ( dev-libs/libhid:= )
+	lcd_devices_futaba? ( virtual/libusb:1= )
+	lcd_devices_g15? ( app-misc/g15daemon
+		dev-libs/libg15render:=
+		virtual/libusb:0= )
+	lcd_devices_glcd? ( app-misc/glcdprocdriver:=
+		dev-embedded/libftdi:1=
+		dev-libs/libhid:=
+		dev-libs/serdisplib:=
+		virtual/libusb:0=
+		x11-libs/libX11:= )
+	lcd_devices_hd44780? ( dev-embedded/libftdi:1=
+		dev-libs/libugpio:=
+		virtual/libusb:0= )
+	lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
+	lcd_devices_irman? ( media-libs/libirman:= )
+	lcd_devices_iowarrior? ( virtual/libusb:0= )
+	lcd_devices_lirc? ( app-misc/lirc )
+	lcd_devices_lis? ( dev-embedded/libftdi:1= )
+	lcd_devices_lb216? ( dev-libs/libhid:= )
+	lcd_devices_mdm166a? ( dev-libs/libhid:= )
+	lcd_devices_mtc_s16209x? ( dev-libs/libhid:= )
+	lcd_devices_mx5000? ( app-misc/mx5000tools )
+	lcd_devices_noritakevfd? ( dev-libs/libhid:= )
+	lcd_devices_picolcd? ( virtual/libusb:1= )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_ula200? ( dev-embedded/libftdi:1= )
+	lcd_devices_xosd? ( x11-libs/libX11:=
+		x11-libs/xosd:= )"
+
+RDEPEND="${DEPEND_LCD_DEVICES}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot]
+		app-text/xmlto )
+	freetype? ( media-libs/freetype:2= )
+	nfs? ( net-fs/nfs-utils )
+	png? ( media-libs/libpng:0= )
+	samba? ( net-fs/samba )"
+
+DOCS=( "CREDITS.md" "TODO" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-parallel-make.patch"
+	"${FILESDIR}/${P}-use-freetype2-pkg-config.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# Copy missing docbook or the buildung of the lcdproc-user docbook will fail
+	cp "${DISTDIR}"/linux_input.docbook "${S}"/docs/lcdproc-user/drivers/linux_input.docbook || die
+}
+
+src_prepare() {
+	default
+
+	# Fix path for modules
+	sed -e "37s:server/drivers:/usr/$(get_libdir)/lcdproc:" -i LCDd.conf || die
+
+	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
+
+	local enable_ftdi="--disable-libftdi"
+	if use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_i2500vfd || use lcd_devices_lis || use lcd_devices_ula200; then
+		enable_ftdi="--enable-libftdi"
+	fi
+
+	local enable_hid="--disable-libhid"
+	if use lcd_devices_cfontz || use lcd_devices_cfontzpacket || use lcd_devices_cwlnx || use lcd_devices_glcd || use lcd_devices_lb216 || use lcd_devices_mdm166a || use lcd_devices_mtc_s16209x || use lcd_devices_noritakevfd; then
+		enable_hid="--enable-libhid"
+	fi
+
+	local enable_png="--disable-libpng"
+	use lcd_devices_glcd && enable_png=""
+
+	local enable_usb0="--disable-libusb"
+	if use lcd_devices_futaba || use lcd_devices_g15 || use lcd_devices_glcd || use lcd_devices_hd44780 || use lcd_devices_iowarrior || use lcd_devices_picolcd || use lcd_devices_shuttlevfd; then
+		enable_usb0="--enable-libusb"
+	fi
+
+	local enable_usb1="--disable-libusb-1-0"
+	if use lcd_devices_futaba || use lcd_devices_picolcd; then
+		enable_usb1="--enable-libusb-1-0"
+	fi
+
+	local enable_x11="--disable-libX11"
+	use lcd_devices_glcd && enable_x11="--enable-libX11"
+
+	local myeconfargs=(
+		--enable-drivers="${myeconfargs_lcd_devices#,}"
+		$(use_enable debug)
+		$(use_enable doc doxygen)
+		$(use_enable doc dot)
+		$(use_enable doc html-dox)
+		$(use_enable doc latex-dox)
+		$(use_enable ethlcd)
+		$(use_enable extra-charmaps)
+		$(use_enable freetype)
+		$(use_enable menu lcdproc-menus)
+		$(use_enable nfs stat-nfs)
+		$(use_enable samba stat-smbfs)
+		$(use_enable test-menu testmenus)
+		${enable_ftdi}
+		${enable_hid}
+		${enable_png}
+		${enable_usb0}
+		${enable_usb1}
+		${enable_x11}
+		--with-lcdport="13666"
+		--with-pidfile-dir="/run"
+		--without-included-getopt
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake dox
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			cd "${S}"/docs/"${docbook}" || die
+			xmlto html "${docbook}".docbook || die
+		done
+	fi
+}
+
+src_install() {
+	default
+
+	# Move example clients from '/usr/bin' into '/usr/share/lcdproc/clients'
+	rm -f "${ED%/}"/usr/bin/{fortune,lcdident,lcdmetar,iosock,tail,x11amp}.pl || die
+	insinto /usr/share/lcdproc/clients
+	doins clients/examples/*.pl clients/metar/*.pl
+
+	newinitd "${FILESDIR}"/LCDd.initd LCDd
+	newinitd "${FILESDIR}"/lcdexec.initd lcdexec
+	newinitd "${FILESDIR}"/lcdproc.initd lcdproc
+
+	systemd_dounit "${FILESDIR}"/LCDd.service
+	systemd_dounit "${FILESDIR}"/lcdexec.service
+	systemd_dounit "${FILESDIR}"/lcdproc.service
+
+	if use doc; then
+		dodoc -r docs/html
+
+		local docbook
+		for docbook in lcdproc-user lcdproc-dev; do
+			docinto "${docbook}"
+			dodoc docs/"${docbook}"/*.html
+		done
+	fi
+}
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index 863d531d0995..ab8591e847e6 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -5,25 +5,38 @@
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
-	<longdescription lang="en">
-		LCDproc is a piece of software that displays real-time system information
-		from your Linux/*BSD box on a LCD. The server supports several serial
-		devices: Matrix Orbital, CrystalFontz, Bayrad, LB216, LCDM001
-		(kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some
-		devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and
-		SED1330. Various clients are available that display things like CPU load,
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		LCDproc is a piece of open source software that displays real-time system information
+		from your Linux/*BSD box on a LCD. The server supports several serial and USB devices
+		from Matrix Orbital and CrystalFontz as well as
+		some devices connected to the LPT port:	HD44780, T6963, SED1520 and SED1330.
+		Various clients are available that display things like CPU load,
 		system load, memory usage, uptime, and a lot more.
 	</longdescription>
 	<use>
-		<flag name="hid">Enable HID support using libhid</flag>
-		<flag name="irman">Enable support for IRMan (<pkg>media-libs/libirman</pkg>)</flag>
-		<flag name="nfs">Adds support for NFS file system</flag>
-		<flag name="seamless-hbars">Try to avoid gaps in horizontal bars</flag>
-		<flag name="ftdi">Enable support for FTDI connections in some selected LCD_DEVICES (currently hd44780)</flag>
-		<flag name="lcd_devices_sdeclcd">Enable support for VLSYS M428 display</flag>
-		<flag name="lcd_devices_vlsys_m428">Enable support for VLSYS M428 display</flag>
+		<flag name="ethlcd">Enable support for ethlcd in the hd44780 driver.</flag>
+		<flag name="extra-charmaps">Enable extra language specific charmaps.</flag>
+		<flag name="freetype">Enable support for <pkg>media-libs/freetype</pkg> in the glcd driver.</flag>
+		<flag name="ftdi">Enable support for <pkg>dev-embedded/libftdi</pkg> in the glcd,hd44780,i2500vfd,lis and ula200 driver.</flag>
+		<flag name="hid">Enable support for <pkg>dev-libs/libhid</pkg> in the cfontz,cfontzpacket,cwlnx,glcd,lb216,mdm166a,mtc_s16209x and noritakevfd driver.</flag>
+		<flag name="irman">Enable support for <pkg>media-libs/libirman</pkg> in the irman driver.</flag>
+		<flag name="menu">Enable menu support in the lcdproc client.</flag>
+		<flag name="nfs">Display NFS filesystem stats in the lcdproc client.</flag>
+		<flag name="png">Enable support for <pkg>media-libs/libpng</pkg> in the glcd driver.</flag>
+		<flag name="samba">Display SMBFS filesystem stats in the lcdproc client.</flag>
+		<flag name="seamless-hbars">Don't produce any gaps in horizontal bar graphs, if hardware supports it.</flag>
+		<flag name="test-menu">Enable test menu support for the lcdproc server.</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">lcdproc</remote-id>
+		<bugs-to>https://www.github.com/lcdproc/lcdproc/issues</bugs-to>
+		<remote-id type="github">lcdproc/lcdproc</remote-id>
 	</upstream>
 </pkgmetadata>