[gentoo-commits] repo/gentoo:master commit in: media-video/setpwc/files/, media-video/setpwc/

[gentoo-commits] repo/gentoo:master commit in: media-video/setpwc/files/, media-video/setpwc/

[David Seifert]

commit:     9f02ba239f76ce5edb2725027b86442c1c6ef253
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 13:20:55 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 13:20:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f02ba23

media-video/setpwc: Port to EAPI 7

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../setpwc/files/setpwc-1.3-fix-build-system.patch | 23 ++++++++++++++++++++++
 media-video/setpwc/setpwc-1.3.ebuild               | 14 +++++--------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/media-video/setpwc/files/setpwc-1.3-fix-build-system.patch b/media-video/setpwc/files/setpwc-1.3-fix-build-system.patch
new file mode 100644
index 00000000000..88152cf6366
--- /dev/null
+++ b/media-video/setpwc/files/setpwc-1.3-fix-build-system.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,18 +13,13 @@
+ # files in the program, then also delete it here.
+ 
+ VERSION=1.3
+-CFLAGS+=-Wall -O2 -DVERSION=\"$(VERSION)\"
+-LDFLAGS=
++CFLAGS+=-Wall
++CPPFLAGS+=-DVERSION=\"$(VERSION)\"
+ 
+ OBJS=setpwc.o
+ 
+ all: setpwc
+ 
+-setpwc: $(OBJS)
+-	$(CC) -Wall -W $(OBJS) $(LDFLAGS) -o setpwc
+-	#
+-	# Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
+-
+ install: setpwc
+ 	cp setpwc /usr/bin
+ 

diff --git a/media-video/setpwc/setpwc-1.3.ebuild b/media-video/setpwc/setpwc-1.3.ebuild
index 562a6b7419a..cbc20cad717 100644
--- a/media-video/setpwc/setpwc-1.3.ebuild
+++ b/media-video/setpwc/setpwc-1.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Control various aspects of Philips (and compatible) webcams"
@@ -11,18 +12,13 @@ SRC_URI="http://www.vanheusden.com/setpwc/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86"
-IUSE=""
 
-RDEPEND=""
 DEPEND="sys-kernel/linux-headers"
 
-src_prepare() {
-	sed -i -e '/CFLAGS/s: -O2::' Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {