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

4 files changed, 7 insertions, 163 deletions

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 5fa914dbff11..665cb1012d3c 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,9 +1,7 @@
 AUX gpac-1.0.0-zlib-compile.patch 1498 BLAKE2B 84c5b0e8bf35e6c6a0b1655e2995e0a71a7b707dc922a4bf011c3b0ce00b64a6eba976dd7c1a45a5e8e208b608762e9bef6a38be9937714b573c7c907614d8d9 SHA512 8a066d2c2fbf185ed131792c48bbc5fe5414bcdbb77df6377a98a58f9bdd017b3260ea0d6e9130791589e64e351369f25f3849d4b635196e1c022ce6720ced1c
 AUX gpac-1.0.1-configure.patch 3414 BLAKE2B 30ab11d0e215429ea5fae9664817b3a0bac242c5e31248d26cc59f646bddb78670f5370ffd65db3bdd2025aa1d17e554f6479e9aab5e6d68c3b73c081bd2a230 SHA512 1b141de1b6bdb58970e4e3361e70ec1ff7675935f2039cd28e80deb4c21c118c56f1dca5bd6539b12332cbc2a1c13298568cc90c981e84fecea23914185d2ca8
 AUX gpac-2.0.0-configure.patch 3674 BLAKE2B 423016315ac7e7ac6959813dada7cfa97a415c62200fb6e9dce74a89b28124a042f5e9736ac815827ee30001cf7c973495dd3577b8963e1bcab3b8d54a50f41f SHA512 b1f620a9c5be2a889805976a985e7ecf89e736f2b11a5a4c07f6d5fe39e511a603f048760cb6b0d6e9cb0e217acad2897839ef5289c2b4de088b95f75577c4f0
-DIST gpac-1.0.1.tar.gz 10352926 BLAKE2B 80bdbd568551f9028a44acfa0cfeba585b69f24392393c1fb1bfe16f4b614eb79cda5f641f0b61854734f0dd85eb17520c2012040d3c47d68f66e5beb66fb2db SHA512 533371d59e72250bef315be03ec3437cd66782d0fb6bdb6486a6f4d57d06a6a7deff1b31fe8bfd360be1d1c848b33b5d25e7268f56f27f8e92cbcb7da1aba82b
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086 SHA512 e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
-EBUILD gpac-1.0.1.ebuild 3272 BLAKE2B dd25a6ae478b1993f31122e6b5ac26da97f8c84a15f5acdcf90ecd4a87d9bfe1e7ca5d2c83634d1821f4e5b2ae1586924df9090ea4a5fdea6f2e9e9e72247193 SHA512 59c07e5515c14a1866ea7d8f95fc9718d29ec5be3d792e88b625e1935a709f6521e521ea9749e54f7803c888f4974e5fb5d8885cd8b21c03827ad95851318a53
-EBUILD gpac-2.0.0.ebuild 3272 BLAKE2B 86064f01cb4541a51415d5f7a818f118b38bd181731a6bcec0cfb5c68e882a409ca984029154fdcfd9d13a80eb45baf387610d0f0d40bc5297da3db21c3e8b77 SHA512 1bda641ebc132cd9ff761403d177c1a2c64a6d85b7788fc32e61d4b59a65468097a89ef5c66cb59a719502c23b00b54aeb89f6f995a9726d6f884ea6bb625bb3
-EBUILD gpac-9999.ebuild 3277 BLAKE2B caca78a5cd1f007de1021bfdf31877f86b799a5c81e192e3133cc9755f19f6eff88f313bad0d2984d5658c055e00a6a93956f68209a5aba00848c25af11de012 SHA512 e8cf1efefc0d8ce7905764c06253c5a629ba8e9d7984b684e5460dc9de59b59a329ef2d6ea03f9d4532a1f70f7b04dc1eff02d423c814833b3efbaf6b035cf7b
+EBUILD gpac-2.0.0.ebuild 3259 BLAKE2B 6abca7a4e0f0ef384e5b81fc24a511effc6925610ddf079f8934e20ea4b227831aad72b11deb5cf547d87eca5c57c4cea84dac2403ed4e0d9394d5298bd6b3a1 SHA512 930f88012e50dba329040c7ccce94eadeb4e63b7ae9dd6c6797c894c052d0f28944b7d65f7fea42bd1889f46bfa3c0b061eecfc59019155d674ccdb958aece3e
+EBUILD gpac-9999.ebuild 3267 BLAKE2B 55e60cb52475cc931e6f08123ada4e21df385efa8db15bc87e391679cbd29c4e174561ff43019664db4ba16a3cf78932e35249caa4546061bccacfd0deb8aa1e SHA512 5dba3c1418c2cfd267442a0a25bff00674522ddeda456842b288fcaa00445cb16dd10029ab37dadc68f2d689f435de549a0f9a79112d3d9ea75bab34e73dee0c
 MISC metadata.xml 357 BLAKE2B d08714f001a00d250eaffef3818ed1cf0ea1dfd907799ac7f87c13d32f34106a3dc3982c24729d09c9eaec20143b68b2e966db97a061ee8a4592a8a5d20b8ab2 SHA512 7417738d0c891a1544fa25a9fe4785025e83ed7e5d498335215f70e61b3b599b17cbd9114e660fc5db4315dfeddee99a351b76ff0b801657f990827187f416c5
diff --git a/media-video/gpac/gpac-1.0.1.ebuild b/media-video/gpac/gpac-1.0.1.ebuild
deleted file mode 100644
index 65ed5f65e282..000000000000
--- a/media-video/gpac/gpac-1.0.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/gpac/gpac"
-else
-	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-fi
-
-inherit flag-o-matic toolchain-funcs ${SCM} xdg
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="https://gpac.wp.imt.fr/"
-
-LICENSE="GPL-2"
-# subslot == libgpac major
-SLOT="0/10"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
-	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	media-libs/libogg
-	sys-libs/zlib
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2 )
-	mad? ( media-libs/libmad )
-	opengl? (
-		media-libs/freeglut
-		virtual/glu
-		virtual/opengl
-	)
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	theora? ( media-libs/libtheora )
-	truetype? ( media-libs/freetype:2 )
-	sdl? ( media-libs/libsdl )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libXext
-	)
-	xml? ( dev-libs/libxml2:2= )
-	xvid? ( media-libs/xvid )
-"
-DEPEND="
-	${RDEPEND}
-	dvb? ( sys-kernel/linux-headers )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.1-configure.patch"
-	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
-)
-
-DOCS=(
-	share/doc/CODING_STYLE
-	share/doc/GPAC\ UPnP.doc
-	share/doc/ISO\ 639-2\ codes.txt
-	share/doc/SceneGenerators
-	share/doc/ipmpx_syntax.bt
-	Changelog
-	README.md
-)
-
-HTML_DOCS="share/doc/*.html"
-
-my_use() {
-	local flag="$1" pflag="${2:-$1}"
-	if use ${flag}; then
-		echo "--use-${pflag}=system"
-	else
-		echo "--use-${pflag}=no"
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
-	tc-export CC CXX AR RANLIB
-
-	local myeconfargs=(
-		--cc="$(tc-getCC)"
-		--libdir="$(get_libdir)"
-		--verbose
-		--enable-pic
-		--enable-svg
-		--disable-amr
-		--use-js=no
-		--use-ogg=system
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable dvb dvb4linux)
-		$(use_enable ipv6)
-		$(use_enable jack jack yes)
-		$(use_enable opengl 3d)
-		$(use_enable oss oss-audio)
-		$(use_enable pulseaudio pulseaudio yes)
-		$(use_enable sdl)
-		$(use_enable ssl)
-		$(use_enable static-libs static-lib)
-		$(use_enable X x11)
-		$(use_enable X x11-shm)
-		$(use_enable X x11-xv)
-		$(my_use a52)
-		$(my_use aac faad)
-		$(my_use dvb dvbx)
-		$(my_use ffmpeg)
-		$(my_use jpeg)
-		$(my_use jpeg2k openjpeg)
-		$(my_use mad)
-		$(my_use png)
-		$(my_use theora)
-		$(my_use truetype ft)
-		$(my_use vorbis)
-		$(my_use xvid)
-	)
-
-	if use amd64 || use x86 ; then
-		# Don't pass -mno-sse2 on non amd64/x86
-		myeconfargs+=(
-			--extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')"
-		)
-	else
-		myeconfargs+=(
-			--extra-cflags="${CFLAGS}"
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	einstalldocs
-	emake STRIP="true" DESTDIR="${ED}" install
-	emake STRIP="true" DESTDIR="${ED}" install-lib
-}
diff --git a/media-video/gpac/gpac-2.0.0.ebuild b/media-video/gpac/gpac-2.0.0.ebuild
index 3a6ccfbdc055..34e01f0cc807 100644
--- a/media-video/gpac/gpac-2.0.0.ebuild
+++ b/media-video/gpac/gpac-2.0.0.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 fi
 
-inherit flag-o-matic toolchain-funcs ${SCM} xdg
+inherit toolchain-funcs ${SCM} xdg
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/"
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index 1c87f44bd3fe..777f20e6208b 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit flag-o-matic toolchain-funcs ${SCM} xdg
+inherit toolchain-funcs ${SCM} xdg
 
 DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
 HOMEPAGE="https://gpac.wp.imt.fr/"
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/11"
-IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
+IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg jack jpeg jpeg2k mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 BDEPEND="virtual/pkgconfig"
@@ -31,7 +31,7 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	ffmpeg? ( media-video/ffmpeg:0= )
 	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	jpeg2k? ( media-libs/openjpeg:2 )
 	mad? ( media-libs/libmad )
 	opengl? (
@@ -100,6 +100,7 @@ src_configure() {
 		--cc="$(tc-getCC)"
 		--libdir="$(get_libdir)"
 		--verbose
+		--enable-ipv6
 		--enable-pic
 		--enable-svg
 		--disable-amr
@@ -108,7 +109,6 @@ src_configure() {
 		$(use_enable alsa)
 		$(use_enable debug)
 		$(use_enable dvb dvb4linux)
-		$(use_enable ipv6)
 		$(use_enable jack jack yes)
 		$(use_enable opengl 3d)
 		$(use_enable oss oss-audio)