gentoo resync : 03.11.2018

1 files changed, 40 insertions, 23 deletions

diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index 1853504344e3..0beb2918a9d4 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 if [[ ${PV} == *9999 ]] ; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+inherit flag-o-matic toolchain-funcs ${SCM}
 
-DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
+DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
+HOMEPAGE="https://gpac.wp.imt.fr/"
 
 LICENSE="GPL-2"
-SLOT="0"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png
+# subslot == libgpac major
+SLOT="0/7"
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,32 +27,53 @@ RDEPEND="
 	aac? ( >=media-libs/faad2-2.0 )
 	alsa? ( media-libs/alsa-lib )
 	dvb? ( media-tv/linuxtv-dvb-apps )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:0= )
+		libav? ( media-video/libav:0= ) )
 	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	mad? ( >=media-libs/libmad-0.15.1b )
 	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
 	>=media-libs/libogg-1.1
-	png? ( >=media-libs/libpng-1.4 )
+	png? ( >=media-libs/libpng-1.4:0= )
 	vorbis? ( >=media-libs/libvorbis-1.1 )
 	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1.4 )
-	xml? ( >=dev-libs/libxml2-2.6.0 )
+	truetype? ( >=media-libs/freetype-2.1.4:2 )
+	xml? ( >=dev-libs/libxml2-2.6.0:2 )
 	xvid? ( >=media-libs/xvid-1.0.1 )
 	sdl? ( media-libs/libsdl )
 	jpeg2k? ( media-libs/openjpeg:0 )
-	ssl? ( dev-libs/openssl )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
 	pulseaudio? ( media-sound/pulseaudio )
 	X? (
 		x11-libs/libXt
 		x11-libs/libX11
 		x11-libs/libXv
 		x11-libs/libXext
-	)"
+	)
+"
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
-DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" )
+
+DOCS=(
+	doc/CODING_STYLE
+	doc/GPAC\ UPnP.doc
+	doc/ISO\ 639-2\ codes.txt
+	doc/SceneGenerators
+	doc/ipmpx_syntax.bt
+	Changelog
+	AUTHORS
+	BUGS
+	README.md
+	TODO
+)
+HTML_DOCS="doc/*.html"
 
 my_use() {
 	local flag="$1" pflag="${2:-$1}"
@@ -64,9 +85,7 @@ my_use() {
 }
 
 src_prepare() {
-	epatch	"${FILESDIR}"/110_all_implicitdecls.patch \
-			"${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
-			"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+	default
 	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
 }
 
@@ -83,7 +102,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable ipv6) \
 		$(use_enable jack jack yes) \
-		$(use_enable opengl) \
+		$(use_enable opengl 3d) \
 		$(use_enable oss oss-audio) \
 		$(use_enable pulseaudio pulseaudio yes) \
 		$(use_enable sdl) \
@@ -110,9 +129,7 @@ src_configure() {
 }
 
 src_install() {
+	einstalldocs
 	emake STRIP="true" DESTDIR="${D}" install
 	emake STRIP="true" DESTDIR="${D}" install-lib
-	dodoc AUTHORS BUGS Changelog README.md TODO
-	dodoc doc/*.txt
-	dohtml doc/*.html
 }