gentoo resync : 14.05.2020

3 files changed, 68 insertions, 21 deletions

diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index c31db18d5771..4a239ec92480 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -4,10 +4,11 @@ AUX lcdexec.initd 325 BLAKE2B 7a7b48e2e24c763533934bca78debd36a1fb6146f6e7220477
 AUX lcdexec.service 171 BLAKE2B cad9c32ce67365158a210fbc65c794881cf84ddcba870019e2772eb6b0913fcbcba99f82f803621930b867d72c63f16bc61710174c35da0ba923e9f68dc119dd SHA512 5372cf10ee750122d2312ecb595a827aa3c5f14bf34049f90950b36b7a77a7c36bcf2d72a30dc6ebf8830251c901c9703c05a6c92fdc580940b6ffe1e421cb2f
 AUX lcdproc-0.5.9-fix-fno-common-build.patch 1751 BLAKE2B 4132254e240ec6e2268174c977332bf8ce31b4da28f6e09279d3afa7774051dab5c87b368366f1050da23337152384e1a2d1a116940b4d45cde61fed6083ffd7 SHA512 2a230cf311699f5d30a36d73784e9539c6a018b281282f341a167a0f946212a9d156b23efdf7f921f5ed8941f7dc6f68878ec2d87247727bec78230eb04eda0f
 AUX lcdproc-0.5.9-fix-parallel-make.patch 910 BLAKE2B 5a9daa1871e64b4bfcc7ea2fbc06f0e4ec6493fe61d678d5b0cc252764ecbc1906c102f2347e18a10432bd390b19d990a270423e8054690283b17174a8297a08 SHA512 75c42f716175751c07b5385f87c2d378229c59cb7ef5adb517b23d3c032373627f9d6173987251c5d3c259764dbaa2ad167d8769bdcb2afa1b1387ff1926a316
+AUX lcdproc-0.5.9-respect-users-ldflags.patch 646 BLAKE2B 6b0bbf237fe3f3e8a4392f35d8ae9299d53697268b0964aa9db9b40463c39c5f23f850d654332f07612aad6a644d7088293b393d8978ca2304327f197be340d4 SHA512 2169f4a7ce56a0a1da847fcb7a55c068d97d985969e0e96e25711ff6bf7e6617e917e29706882e2485cf7be71452713e0577ea2e0435da61a7ec9d26bf3fed52
 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.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
 DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
-EBUILD lcdproc-0.5.9.ebuild 6487 BLAKE2B 916b6d67e988f59d64f661dda297a92b2188c2e9e4f4d1252b8f6609f222b77fbaa5f04dd7948bd6560992fd4222423e317ed39ab40fadb05cdb2a65ecdfd533 SHA512 be81a184f0cc244123bf2a63c93d418d8ad5c4643f75aef1a3b8c687fd25e9d038ec6803e97eb44bb2fb6025647adad272c0aba1aee5228b460f28f0fc7be78e
+EBUILD lcdproc-0.5.9-r1.ebuild 6563 BLAKE2B c583192d2e154aa3dfe75e022214bf514f46eb531b3173a91a7749b252ec3de3bae65a26c12057e7e615eed4f33580c2b11d433c8d83beb971cab21b46df1a1c SHA512 1a9917a1179d9fb5713e299ab17dcf0caeb89d823e06d3ec7718fffd83f9297927452ae8dc91b521edf5bba00767998a216b43a1814e8afc5857343da060d3f2
 MISC metadata.xml 1538 BLAKE2B 33c2755d4bae3208e9fb175f57b8e241d62cde6c63ac509d6443722bc8617cd48f566ec6300fbad08bb0b3ab04c5aee652e1b67340f5d82e61423c02ae948aab SHA512 52c3e7e8e0dbfdd2b06cbda0e6bd7b538a4f0a2ddb396940cb3345920ed2e7917f22e2620ac9de1e0a4acb3e9144848f13916ce91f54252632eccdc8974dbfd3
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch
new file mode 100644
index 000000000000..8b48d0044108
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch
@@ -0,0 +1,25 @@
+From 28cca1d998fc9a74f16ea00e61c3eaa34017db7c Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Mon, 11 May 2020 23:43:57 +0200
+Subject: [PATCH] Include AM_PROG_AR to use systems AR
+
+If AM_PROG_AR is not included,
+the 'ar' command is directly called.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 98a2fb1c..53f7bf50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,6 +73,7 @@ AC_PROG_CC_STDC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AM_PROG_CC_C_O
+ AC_PATH_PROG([XMLTO], [xmlto], [no])
+ 
diff --git a/app-misc/lcdproc/lcdproc-0.5.9.ebuild b/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
index 2fc2ad8d6a88..e3149731d121 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.9-r1.ebuild
@@ -7,21 +7,26 @@ 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"
+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 ppc64 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 )
+REQUIRED_USE="
+	ethlcd? ( lcd_devices_hd44780 )
 	freetype? ( lcd_devices_glcd )
-	png? ( 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
+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
@@ -29,7 +34,8 @@ IUSE_LCD_DEVICES=( bayrad CFontz CFontzPacket curses CwLnx ea65
 	Olimex_MOD_LCD1x9 picolcd pyramid rawserial
 	sdeclcd sed1330 sed1520 serialPOS serialVFD
 	shuttleVFD sli stv5730 SureElec t6963 text
-	tyan ula200 vlsys_m428 xosd yard2LCD )
+	tyan ula200 vlsys_m428 xosd yard2LCD
+)
 
 # Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
 REQUIRED_USE+=" || ( "
@@ -42,22 +48,29 @@ REQUIRED_USE+=" ) "
 unset LCD_DEVICE
 
 # Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
-DEPEND_LCD_DEVICES="lcd_devices_cfontz? ( dev-libs/libhid:= )
+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
+	lcd_devices_g15? (
+		app-misc/g15daemon
 		dev-libs/libg15render:=
-		virtual/libusb:0= )
-	lcd_devices_glcd? ( app-misc/glcdprocdriver:=
+		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=
+		x11-libs/libX11:=
+	)
+	lcd_devices_hd44780? (
+		dev-embedded/libftdi:1=
 		dev-libs/libugpio:=
-		virtual/libusb:0= )
+		virtual/libusb:0=
+	)
 	lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= )
 	lcd_devices_irman? ( media-libs/libirman:= )
 	lcd_devices_iowarrior? ( virtual/libusb:0= )
@@ -71,24 +84,32 @@ DEPEND_LCD_DEVICES="lcd_devices_cfontz? ( 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:= )"
+	lcd_devices_xosd? (
+		x11-libs/libX11:=
+		x11-libs/xosd:=
+	)
+"
 
 RDEPEND="${DEPEND_LCD_DEVICES}"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot]
-		app-text/xmlto )
+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 )"
+	samba? ( net-fs/samba )
+"
 
 DOCS=( "CREDITS.md" "TODO" )
 
 PATCHES=(
+	"${FILESDIR}/${P}-fix-fno-common-build.patch"
 	"${FILESDIR}/${P}-fix-parallel-make.patch"
+	"${FILESDIR}/${P}-respect-users-ldflags.patch"
 	"${FILESDIR}/${P}-use-freetype2-pkg-config.patch"
-	"${FILESDIR}/${P}-fix-fno-common-build.patch"
 )
 
 src_unpack() {