[gentoo-commits] proj/musl:master commit in: media-libs/zvbi/, media-libs/zvbi/files/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     76b049ae8d3d5e1ff37fdb4d6d0166638d30d013
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 00:36:58 2022 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 00:36:58 2022 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=76b049ae

media-libs/zvbi: sync eapi changes

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 media-libs/zvbi/Manifest                           |  2 +-
 media-libs/zvbi/files/tests-gcc7.patch             | 22 +++++++++++++
 ...zvbi-0.2.35-r1.ebuild => zvbi-0.2.35-r2.ebuild} | 36 ++++++++++++++--------
 3 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index 8b65f92c..8a4f4a33 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1 +1 @@
-DIST zvbi-0.2.35.tar.bz2 1047761 SHA256 fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d WHIRLPOOL e365d28db9834a5e9f8780d45f9fcb04c7b98e5a3122fe81336a42bb2de54505583a535908cabc0851b6753f589b758bf1d6e2831c88cfbeba9fe8d0633a42f0
+DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d

diff --git a/media-libs/zvbi/files/tests-gcc7.patch b/media-libs/zvbi/files/tests-gcc7.patch
new file mode 100644
index 00000000..181285cf
--- /dev/null
+++ b/media-libs/zvbi/files/tests-gcc7.patch
@@ -0,0 +1,22 @@
+Index: zvbi-0.2.35/test/test-dvb_mux.cc
+===================================================================
+--- zvbi-0.2.35.orig/test/test-dvb_mux.cc
++++ zvbi-0.2.35/test/test-dvb_mux.cc
+@@ -137,7 +137,7 @@ is_good_service			(vbi_service_set	servi
+ static const vbi_service_set
+ all_services [] = {
+ 	0,
+-	-1,
++	(vbi_service_set)-1,
+ 	VBI_SLICED_2xCAPTION_525,
+ 	VBI_SLICED_CAPTION_525,
+ 	VBI_SLICED_CAPTION_525_F1,
+@@ -3237,7 +3237,7 @@ static void
+ test_dvb_mux_cor_pts (void)
+ {
+ 	static const int64_t ptss [] = {
+-		0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll,
++		(int64_t)0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll,
+ 	};
+ 	DVBPESMuxTest mx;
+ 	unsigned int i;

diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
similarity index 58%
rename from media-libs/zvbi/zvbi-0.2.35-r1.ebuild
rename to media-libs/zvbi/zvbi-0.2.35-r2.ebuild
index f6c1bcc0..bd055b2e 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils libtool multilib-minimal
+EAPI=8
+
+inherit libtool multilib-minimal
 
 DESCRIPTION="VBI Decoding Library for Zapping"
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
 HOMEPAGE="http://zapping.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/zapping/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-IUSE="doc dvb nls static-libs v4l X"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+IUSE="doc dvb nls v4l X"
 
 RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -19,18 +20,22 @@ RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
 	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/os-headers
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
 	X? ( x11-libs/libXt )"
+BDEPEND="doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/tests-gcc7.patch
+	"${FILESDIR}"/${PN}-va_copy.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-va_copy.patch"
+	default
 	elibtoolize
 }
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
 		$(use_enable v4l) \
 		$(use_enable dvb) \
 		$(use_enable nls) \
@@ -41,11 +46,18 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake DESTDIR="${D}" install
 
-	multilib_is_native_abi && use doc && dohtml -a png,gif,html,css doc/html/*
+	if multilib_is_native_abi; then
+		if use doc; then
+			docinto html
+			dodoc doc/html/*.{png,gif,html,css}
+		fi
+	fi
 }
 
 multilib_src_install_all() {
+	# This may have been left pointing to "html"
+	docinto
 	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete
 }