Added doc-pdf USE flag and removed aqua USE flag, proxied commit for Nikoli.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 16 insertions, 9 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index 1cbcfaf5abc5..ffbede8ae622 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.25 2013/09/15 12:56:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.26 2013/09/21 13:19:47 tomwij Exp $
+
+  21 Sep 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml, mpv-9999.ebuild:
+  Added doc-pdf USE flag and removed aqua USE flag, proxied commit for Nikoli.
 
 *mpv-0.1.6 (15 Sep 2013)
 
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 527d303c2de5..aa540ee95bc6 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -10,6 +10,7 @@
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
 	<flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
+	<flag name='doc-pdf'>Build documentation in pdf format</flag>
 	<flag name="enca">Enables support for charset discovery and conversion using <pkg>app-i18n/enca</pkg></flag>
 	<flag name="libguess">Enables support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag>
 	<flag name="mng">MNG input support</flag>
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 1308de1e42bd..b0fc0d620a4c 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.17 2013/09/02 08:10:12 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.18 2013/09/21 13:19:47 tomwij Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa aqua bluray bs2b +cdio dvb +dvd +enca encode +iconv jack joystick
+IUSE="+alsa bluray bs2b +cdio doc-pdf dvb +dvd +enca encode +iconv jack joystick
 jpeg ladspa lcms +libass libcaca libguess lirc mng +mp3 -openal +opengl oss
 portaudio +postproc pulseaudio pvr +quvi radio samba +shm +threads v4l vaapi
 vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv"
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	enca? ( iconv )
 	lcms? ( opengl )
 	libguess? ( iconv )
-	opengl? ( || ( aqua wayland X ) )
+	opengl? ( || ( wayland X ) )
 	portaudio? ( threads )
 	pvr? ( v4l )
 	radio? ( v4l || ( alsa oss ) )
@@ -105,6 +105,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-lang/perl-5.8
 	dev-python/docutils
+	doc-pdf? (
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-tex/xcolor
+	)
 	X? (
 		x11-proto/videoproto
 		x11-proto/xf86vidmodeproto
@@ -174,6 +180,7 @@ src_configure() {
 	use quvi || myconf+=" --disable-libquvi4 --disable-libquvi9"
 	use samba || myconf+=" --disable-smb"
 	use lirc || myconf+=" --disable-lirc --disable-lircc"
+	use doc-pdf || myconf+=" --disable-pdf"
 
 	########
 	# CDDA #
@@ -262,11 +269,6 @@ src_configure() {
 	use lcms || myconf+=" --disable-lcms2"
 	use xscreensaver || myconf+=" --disable-xss"
 
-	############################
-	# OSX (aqua) configuration #
-	############################
-	use aqua && myconf+=" --enable-macosx-bundle"
-
 	CFLAGS= LDFLAGS= ./configure \
 		--cc="$(tc-getCC)" \
 		--extra-cflags="${CFLAGS}" \
@@ -276,6 +278,7 @@ src_configure() {
 		--bindir="${EPREFIX}"/usr/bin \
 		--confdir="${EPREFIX}"/etc/${PN} \
 		--mandir="${EPREFIX}"/usr/share/man \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localedir="${EPREFIX}"/usr/share/locale \
 		${myconf} || die