From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1480705-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 6C4FD15800F
	for <garchives@archives.gentoo.org>; Thu, 26 Jan 2023 06:29:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 9BAF9E07C7;
	Thu, 26 Jan 2023 06:29:09 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 801FAE07C7
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jan 2023 06:29: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) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 86579341000
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jan 2023 06:29:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A1B1762F
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jan 2023 06:29:06 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1674714510.d652f91037cdf41a6e573dced77031d31ff21377.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/xine-lib/Manifest media-libs/xine-lib/xine-lib-1.2.13.ebuild media-libs/xine-lib/xine-lib-1.2.9999.ebuild
X-VCS-Directories: media-libs/xine-lib/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d652f91037cdf41a6e573dced77031d31ff21377
X-VCS-Branch: master
Date: Thu, 26 Jan 2023 06:29:06 +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: 03724595-c586-4a72-8907-9fb9bcb9dc55
X-Archives-Hash: 7f85608f6df48e94c3b715a561510902

commit:     d652f91037cdf41a6e573dced77031d31ff21377
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 06:28:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 06:28:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d652f910

media-libs/xine-lib: add 1.2.13

Closes: https://bugs.gentoo.org/537350
Closes: https://bugs.gentoo.org/830554
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/xine-lib/Manifest                       |  1 +
 ...-lib-1.2.9999.ebuild => xine-lib-1.2.13.ebuild} | 36 ++++++++++++----------
 media-libs/xine-lib/xine-lib-1.2.9999.ebuild       | 36 ++++++++++++----------
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 64ab76b858d6..8d57c36528f1 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1 +1,2 @@
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
+DIST xine-lib-1.2.13.tar.xz 5007364 BLAKE2B 8c39328b4135035e7b4070c670591e61a92443bb389af3b7da053fd68101fcb2f18cd258840e96a5f3e02d4cf979b028947a10fddd1bfc3b92ed7f18d3f58942 SHA512 269275f0e324acc559695d268fb93e0e0ca4b17d22c4a57d482365ac058ae2aed125b9e1b522c1fc501cf4b2c186ac05d921d7c82a98e094cb0c70489e61c924

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
similarity index 94%
copy from media-libs/xine-lib/xine-lib-1.2.9999.ebuild
copy to media-libs/xine-lib/xine-lib-1.2.13.ebuild
index b8b6b6b69e5d..a7cce97ce1ac 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,25 +12,28 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
 	NLS_RDEPEND="nls? ( virtual/libintl )"
 fi
 
 DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
+HOMEPAGE="https://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
 IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
-
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/libtool-2.2.6b
-	virtual/pkgconfig
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
+	wayland? ( opengl )
+	xv? ( X )
+	xinerama? ( X )
 "
+
 RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
@@ -61,7 +64,7 @@ RDEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh2 )
 	sdl? ( media-libs/libsdl )
@@ -78,7 +81,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[X] )
+	vaapi? ( media-libs/libva:=[opengl,X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
@@ -100,7 +103,8 @@ RDEPEND="
 	xv? ( x11-libs/libXv )
 	xvmc? ( x11-libs/libXvMC )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -111,10 +115,10 @@ DEPEND="${RDEPEND}
 	xvmc? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 "
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -214,7 +218,7 @@ src_configure() {
 	)
 	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
 
-	econf "${myconf[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
 }
 
 src_compile() {

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index b8b6b6b69e5d..a7cce97ce1ac 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,25 +12,28 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
 	NLS_RDEPEND="nls? ( virtual/libintl )"
 fi
 
 DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
+HOMEPAGE="https://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
 IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
-
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/libtool-2.2.6b
-	virtual/pkgconfig
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
+	wayland? ( opengl )
+	xv? ( X )
+	xinerama? ( X )
 "
+
 RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
@@ -61,7 +64,7 @@ RDEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh2 )
 	sdl? ( media-libs/libsdl )
@@ -78,7 +81,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[X] )
+	vaapi? ( media-libs/libva:=[opengl,X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
@@ -100,7 +103,8 @@ RDEPEND="
 	xv? ( x11-libs/libXv )
 	xvmc? ( x11-libs/libXvMC )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -111,10 +115,10 @@ DEPEND="${RDEPEND}
 	xvmc? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 "
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -214,7 +218,7 @@ src_configure() {
 	)
 	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
 
-	econf "${myconf[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
 }
 
 src_compile() {