[gentoo-commits] repo/gentoo:master commit in: app-laptop/spicctrl/, app-laptop/spicctrl/files/

[David Seifert]

commit:     1eab5fcdc005c843f7e6767bb92085332e0c1650
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 19:52:30 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 19:52:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eab5fcd

app-laptop/spicctrl: Fix makefile

Closes: https://bugs.gentoo.org/742083
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../spicctrl/files/spicctrl-1.9-makefile.patch     | 22 ++++++++++++++++------
 app-laptop/spicctrl/spicctrl-1.9-r1.ebuild         |  7 ++++---
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app-laptop/spicctrl/files/spicctrl-1.9-makefile.patch b/app-laptop/spicctrl/files/spicctrl-1.9-makefile.patch
index edb79ce6d9c..ea2935d0296 100644
--- a/app-laptop/spicctrl/files/spicctrl-1.9-makefile.patch
+++ b/app-laptop/spicctrl/files/spicctrl-1.9-makefile.patch
@@ -1,11 +1,21 @@
---- a/Makefile	2012-11-20 12:38:41.528871594 +0400
-+++ b/Makefile	2012-11-20 12:39:42.630871103 +0400
-@@ -14,7 +14,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,5 @@
+-CC = gcc
+-CFLAGS = -Wall -W -Wshadow -Wstrict-prototypes -Wcast-qual -Wcast-align \
+-         -Wwrite-strings -O2 -pipe
++CFLAGS += -Wall -W -Wshadow -Wstrict-prototypes -Wcast-qual -Wcast-align \
++         -Wwrite-strings
+ SRC = spicctrl.c
+ OBJ = $(SRC:.c=.o)
+ LIBS =
+@@ -13,9 +12,6 @@
+ 
  all: spicctrl
  
- spicctrl: $(OBJ)
+-spicctrl: $(OBJ)
 -	$(CC) -o spicctrl $(OBJ) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o spicctrl $(OBJ) $(LIBS)
- 
+-
  clean:
  	rm -f $(OBJ) spicctrl *~
+ 

diff --git a/app-laptop/spicctrl/spicctrl-1.9-r1.ebuild b/app-laptop/spicctrl/spicctrl-1.9-r1.ebuild
index d08dd3d8160..673144b0e85 100644
--- a/app-laptop/spicctrl/spicctrl-1.9-r1.ebuild
+++ b/app-laptop/spicctrl/spicctrl-1.9-r1.ebuild
@@ -13,12 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 -ppc x86"
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin spicctrl
+	einstalldocs
 }