gentoo resync : 15.01.2020

3 files changed, 35 insertions, 17 deletions

diff --git a/x11-misc/i855crt/Manifest b/x11-misc/i855crt/Manifest
index 668a2e70c16c..247d69747a01 100644
--- a/x11-misc/i855crt/Manifest
+++ b/x11-misc/i855crt/Manifest
@@ -1,4 +1,5 @@
+AUX i855crt-0.4-makefile.patch 351 BLAKE2B ef060908432899a333a29fe12d393d3d2d99d76d0619b071c0457b592c17edc0bf9af6f6994bfbcd73fdfd4bacd580387be1483e7a851ec88a38df532babb3b2 SHA512 41a96234b1864d04089c64a7859ec25f1388af519e107c5760954366d497a13dc6d623c5d26e870d52bcc8748e23b760662101a4205b2489aa002f25306155ac
 AUX i855crt-i915support.diff 2128 BLAKE2B 1fc795cafb494e084d2233bdebe74cb1881a9d14e2c78662a6ec4d7e24554734938a8f58cc723e2bbd4f70b5e2aa7080b13b7a2806291f9b5e934fbb5e3d9ea5 SHA512 96049b926a2007915bdaf71ba2252bb6556711d66b45eac69ee3223557e892ba8d742b520406a6f7fd20f3091f194015aec59613624abc1efaee5caad090caf4
 DIST i855crt-0.4.tar.gz 65209 BLAKE2B a7c8e041cb66cd711e1cdf7ac1ee0d6d218377b5c1183c11c658d3345de814a21b9eab0c4579c56db316a3b5fb3e430774174100f989c921e86650bc59adc1ee SHA512 8bd6d05334bcbe75f85c128ffe1179368fcf94bb0ba07c2ea7ce9b6ed38252ffc5dcd7a3208f6524be064bea595abda5a29f6a2960ad9f2f7b6f6ba528c36290
-EBUILD i855crt-0.4-r1.ebuild 788 BLAKE2B 5694078bf6622ddc2869feeb536152f9beb18679cef296997ef6f1609e017c8eec96ccdd942f9a6869e248f4c7ebce4cad76e2838f5e46b3a493cfaa36433c2c SHA512 b2991656fa107019087e67ec6619b6c32900d602ef0a281785f44f2364b789cdb6927a2f2f9e99e8663ab78280c06bf1bd923d532b42b56a63033aed849eacc8
+EBUILD i855crt-0.4-r1.ebuild 719 BLAKE2B 47c38eb6e2af17e18d18c0c8432632abc63af1667f0dc86c9fe0c91d49adfa9936a92515465454baade689e8860611c5d1d56d9129ca631a4353ababfc03f34d SHA512 69dd89bc2b25da213a1fb33d0e19d99cf4b2e6ca28d64de321bce4dafdfd1fd77359e067211aca9fdd0c13458bda6be00ddc0a6cf668d0090e3c1d72607ee3bc
 MISC metadata.xml 522 BLAKE2B 8fa6ae297d63f47e01804550dc1868c715638989f87eedd2e0d49b07c00e2cd96657ae533724ab07a21e451cb3d9c83a1a6574273e3f063fd6c66f820d8dd1c4 SHA512 9d25abeb609fb82b751a8efd9f386ffd877bf959705436c28c0caf772838124afe37c6a4f6fbb10ac827de01de33748583283cc5c0518a842a2feb1040d7f36b
diff --git a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
new file mode 100644
index 000000000000..e7deffb4d30a
--- /dev/null
+++ b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,6 @@
+-i855crt: i855crt.o vmodes.o
+-	gcc $(LDFLAGS) -o i855crt i855crt.o vmodes.o -L /usr/X11R6/lib -lXext -lXv
++LDLIBS = -lXv -lX11
+ 
+-i855crt.o: i855crt.c i855crt.h vmodes.h hw.h
+-	gcc $(CFLAGS) -c i855crt.c
+-
+-vmodes.o: vmodes.c vmodes.h
+-	gcc $(CFLAGS) -c vmodes.c
++i855crt: vmodes.o
+ 
+ clean:
+ 	rm *.o -f
diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
index 1b8581227cd6..25df8327c91c 100644
--- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild
+++ b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
 HOMEPAGE="http://i855crt.sourceforge.net/"
@@ -12,30 +12,31 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
-DEPEND="
+RDEPEND="
 	x11-libs/libX11
-	x11-libs/libXv
-"
-RDEPEND="${DEPEND}"
+	x11-libs/libXv"
+DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-i915support.diff
+PATCHES=(
+	"${FILESDIR}"/${PN}-i915support.diff
+	"${FILESDIR}"/${PN}-0.4-makefile.patch
+)
 
-	# respect CC, fix underlinking
-	sed -i Makefile \
-		-e 's|gcc|$(CC)|g;/LDFLAGS/{s|$| -lX11|g};s|-lXext||g' \
-		|| die
-	export LIBS="-lX11"
-	tc-export CC
+src_prepare() {
+	default
 
 	# upstream ships it with the binary, we want to make sure we compile it
 	emake clean
 }
 
+src_configure() {
+	tc-export CC
+}
+
 src_install() {
 	dobin i855crt
 	insinto /etc
 	doins i855crt.conf
+	einstalldocs
 }