gentoo auto-resync : 12:11:2022 - 21:32:47

4 files changed, 7 insertions, 236 deletions

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 58772cc7e1c8..f509c530bad2 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,8 +1,6 @@
 AUX xine-lib-1.2.12-dav1d-1.0.0.patch 805 BLAKE2B 83b97835c46ff547636c9a39836ee4ace2213f3d75dc258071bf2be040f37dd6c53c4201f13201d511c1df9651d9c381bfe7c10d51a437ad424e184f9acedfd6 SHA512 3182d082b028b664abd1899c19a689213a02214cce13f7f3c9a7dc95deb2ec7c8f13438ec812b2151476d638b170be8e1d832b303b73eb962c2389d2ecb161b4
 AUX xine-lib-1.2.12-fix-mmap-crash.patch 535 BLAKE2B 6b6782a7923754c29daf8263bc267f57124de6b80705214537c9d788bafb3f80bcec35915ca50fb50935ffcbc612187dc1f0e0d71e80279d4d9e3fcbe54a4ebd SHA512 f642612419abd03b765f8dbf787aa675a1e5a031878db9b51c7f2a829caa19c153f9cabe733dbd21cbbbe55ce1ce5d5793b75e9b32c229e3fb57b548d39a6aa5
-DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
-EBUILD xine-lib-1.2.11-r2.ebuild 5281 BLAKE2B afa42f71427c1d9458d1b2b4fabd3ba68d0cf9c82dc69ae4daa17bfcf7ea5ea7699f7fe6956f4ed7885fa857b3c39b63079405f917a03ea9b1f0527595295e5c SHA512 f6fe20473016ff9643e67f67d511bd11f225c59d3f3aeb6bc345bc6d168fc1992010d834f56c3c61cc4e4003e2b4ebed66f6f1beb0548595b991ccbe2623ecb1
-EBUILD xine-lib-1.2.12-r4.ebuild 5482 BLAKE2B 10a1849a047646b23fa62af7b95442c78fad0c65dbaf27a58212d25648485d3e6452353ef33f132374d15bd9b78137ffa401f9789f7799e50fe88df8478d3dfa SHA512 015585840acc62f016217bd31517f4fc6462ca8d2eefa246d69ab03f6379ea7c107b3446533c33d0250e819a998e826aeac2860cfccdc13eedd0e2c4b18e1d4d
-EBUILD xine-lib-1.2.9999.ebuild 5377 BLAKE2B b5af78172db530d865874fb2fb90b51a9a850e980ecda40a4b6f6d8d358bc923d3ec7e320be888cf0e86d92d247408400994c2bdeca4a3fffed8e9ced5f98b9b SHA512 15e1a316b38c5876b2f7a7426927201e79537ee338bf7e055989d95709f2406160e1f00923fcbc5abe703c5186aab52de69f2f01a643e074742e0902c42b98fd
+EBUILD xine-lib-1.2.12-r4.ebuild 5489 BLAKE2B 21151c6f8f4d714a770b1add99a02e30ad258abbce0b34148dd81e1a193bdfb4f59addbbd01423dfe0c53935fd085a0246b79ffdf558cba128b1c3a5fcaeafa1 SHA512 bd34e9a9a9b894d3ff7529a53c4ed2e2adbc3190e9572ec02e7ef5048cbd5edf83bd4ed536cf88a33ccc993d6094e0965e38283dbe48e8724f99dc48eb9eba94
+EBUILD xine-lib-1.2.9999.ebuild 5376 BLAKE2B cc4f65f60c48750baef54eaf25fdd79794195b0986697b0c1006f4a72931620d98a35e4ed634c03e0794a79a9b7dbfcfedbad9e81bd568c2567a62be82ab74ff SHA512 ea2ed69072de70d02c8f80942a7b7894dd1e320f9e0a617361303d1a68abccf40dc28441abba6c205d5e56231ed28f274eccee418a11dd3b132ba9513cc93fa6
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild
deleted file mode 100644
index fac5052b2803..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.11-r2.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
-	inherit autotools mercurial
-	unset NLS_IUSE
-	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"
-	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/"
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dts dvb dxr3 fbcon flac gtk imagemagick ipv6 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
-"
-RDEPEND="${NLS_RDEPEND}
-	dev-libs/libxdg-basedir
-	media-libs/libdvdnav
-	media-video/ffmpeg:=
-	sys-libs/zlib:=
-	virtual/libiconv
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	css? ( >=media-libs/libdvdcss-1.2.10 )
-	dts? ( media-libs/libdca )
-	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac:= )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( virtual/jack )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	libcaca? ( media-libs/libcaca )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	nfs? ( net-fs/libnfs:= )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-	)
-	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[X,opengl] )
-	vcd? (
-		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:=[-minimal]
-	)
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	vpx? ( media-libs/libvpx:= )
-	wavpack? ( media-sound/wavpack )
-	wayland? ( dev-libs/wayland )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libxcb:=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-DEPEND="${RDEPEND}
-	${NLS_DEPEND}
-	oss? ( virtual/os-headers )
-	v4l? ( virtual/os-headers )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)
-	xv? ( x11-base/xorg-proto )
-	xvmc? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )
-"
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
-
-	if [[ "${PV}" = *9999* ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	local x
-	for x in 0 1 2 3; do
-		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
-	done
-}
-
-src_configure() {
-	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
-
-	local win32dir #197236
-	if has_multilib_profile; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	local myconf=(
-		--disable-directfb
-		--disable-gnomevfs
-		--disable-optimizations
-		--disable-real-codecs
-		--disable-v4l
-		--disable-w32dll
-		--enable-avformat
-		--with-external-dvdnav
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs
-		--with-w32-path=${win32dir}
-		--with-xv-path=/usr/$(get_libdir)
-		--without-dav1d
-		--without-esound
-		--without-fusionsound
-		$(use_enable a52 a52dec)
-		$(use_enable aac faad)
-		$(use_enable aalib)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable bluray)
-		$(use_enable dts)
-		$(use_enable dvb)
-		$(use_enable dxr3)
-		$(use_enable fbcon fb)
-		$(use_enable gtk gdkpixbuf)
-		$(use_enable ipv6)
-		$(use_enable jpeg libjpeg)
-		$(use_enable mad)
-		$(use_enable mmap)
-		$(use_enable mng)
-		$(use_enable modplug)
-		$(use_enable musepack)
-		$(use_enable nfs)
-		$(use_enable opengl)
-		$(use_enable opengl glu)
-		$(use_enable oss)
-		$(use_enable samba)
-		$(use_enable sftp)
-		$(use_enable v4l libv4l)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable vis)
-		$(use_enable vidix)
-		$(use_enable xinerama)
-		$(use_enable xvmc)
-		$(use_enable vcd)
-		$(use_enable vdr)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with alsa)
-		$(use_with flac libflac)
-		$(use_with imagemagick)
-		$(use_with jack)
-		$(use_with libcaca caca)
-		$(use_with pulseaudio)
-		$(use_with sdl)
-		$(use_with speex)
-		$(use_with theora)
-		$(use_with truetype fontconfig)
-		$(use_with truetype freetype)
-		$(use_with vorbis)
-		$(use_with wavpack)
-		$(use_with X x)
-		$(use_with X xcb)
-	)
-	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# enable verbose building, bug #448140
-	emake V=1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
index 9269a240c709..2f42d1c56c87 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool
+inherit flag-o-matic libtool multilib
 
 if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
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 2935680fc418..b8b6b6b69e5d 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool
+inherit flag-o-matic libtool multilib
 
 if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
@@ -24,7 +24,7 @@ HOMEPAGE="http://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 ipv6 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}"
+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
@@ -152,6 +152,7 @@ src_configure() {
 		--disable-v4l
 		--disable-w32dll
 		--enable-avformat
+		--enable-ipv6
 		--with-external-dvdnav
 		--with-real-codecs-path=/usr/$(get_libdir)/codecs
 		--with-w32-path=${win32dir}
@@ -170,7 +171,6 @@ src_configure() {
 		$(use_enable dxr3)
 		$(use_enable fbcon fb)
 		$(use_enable gtk gdkpixbuf)
-		$(use_enable ipv6)
 		$(use_enable jpeg libjpeg)
 		$(use_enable mad)
 		$(use_enable mmap)