From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1583475-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 2C187158016
	for <garchives@archives.gentoo.org>; Sun, 24 Dec 2023 23:07:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 026BA2BC054;
	Sun, 24 Dec 2023 23:07:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id BD9182BC054
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Dec 2023 23:07:09 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 68C6633CEF2
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Dec 2023 23:07:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id DD89E14C6
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Dec 2023 23:07:04 +0000 (UTC)
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" <conikost@gentoo.org>
Message-ID: <1703459167.e96682a05e747f4442d9e896981d5cde11c8e7f6.conikost@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/sonic-snap/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
X-VCS-Directories: media-video/sonic-snap/
X-VCS-Committer: conikost
X-VCS-Committer-Name: Conrad Kostecki
X-VCS-Revision: e96682a05e747f4442d9e896981d5cde11c8e7f6
X-VCS-Branch: master
Date: Sun, 24 Dec 2023 23:07:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: df8f3912-2bec-47b3-934e-8af88927c80a
X-Archives-Hash: 2520fd7c6fa58df6c5856dc9ecdbadd5

commit:     e96682a05e747f4442d9e896981d5cde11c8e7f6
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Dec 22 17:54:54 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 23:06:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96682a0

media-video/sonic-snap: EAPI8, fix #453456,#740520

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>

Closes: https://bugs.gentoo.org/453456
Closes: https://bugs.gentoo.org/740520
Closes: https://github.com/gentoo/gentoo/pull/34425
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-video/sonic-snap/sonic-snap-1.7-r1.ebuild | 28 +++++++++++--------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
index aa33db7cb88a..0d703945f44d 100644
--- a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
+++ b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit linux-info toolchain-funcs
 
 DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)"
-HOMEPAGE="http://www.stolk.org/sonic-snap/"
-SRC_URI="http://www.stolk.org/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="https://www.stolk.org/sonic-snap/"
+SRC_URI="https://www.stolk.org/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
@@ -14,15 +15,15 @@ KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="mpeg"
 
 DEPEND="
-	x11-libs/fltk:1
-	mpeg? ( >=media-libs/libfame-0.9.1 )
 	sys-libs/zlib
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libXrender
+	x11-libs/fltk:1
 	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
 	x11-libs/libXext
 	x11-libs/libXft
+	x11-libs/libXrender
+	mpeg? ( >=media-libs/libfame-0.9.1 )
 "
 RDEPEND="${DEPEND}"
 
@@ -37,6 +38,7 @@ src_prepare() {
 		-e "s|\$(HOME)/lib|/usr/$(get_libdir)|" \
 		-e "s|CFLAGS=|CFLAGS= ${CXXFLAGS} |" \
 		-e "s|LFLAGS=|LFLAGS= ${LDFLAGS} |" \
+		-e "s|g++-4.0 -O3 -o|$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o|" \
 		-e "s/g++-4.0 -O3/$(tc-getCXX)/" \
 		Makefile || die
 
@@ -45,15 +47,9 @@ src_prepare() {
 	default
 }
 
-src_compile() {
-	make || die '"make" failed.'
-}
-
 src_install() {
 	dodir /usr/bin
-	make DESTDIR="${D}" install || die '"make install" failed.'
-
-	dodoc ChangeLog README
+	default
 	doman debian/sonic-snap.1
 }