--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- a/vlc-9999.ebuild +++ b/vlc-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.191 2013/09/20 23:30:16 scarabeus Exp $ +# $Header: $ -EAPI="5" +EAPI=5 SCM="" if [ "${PV%9999}" != "${PV}" ] ; then @@ -52,7 +52,7 @@ +macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext +macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opengl optimisememory oss png - +postproc projectm pulseaudio +qt4 rtsp run-as-root samba schroedinger + +postproc projectm pulseaudio qt4 +qt5 rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins speex sse svg +swscale taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout wma-fixed +X x264 +xcb xml xv zvbi" @@ -113,7 +113,9 @@ postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) - qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) + qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 + !dev-qt/qtgui:5 !dev-qt/qtcore:5 ) + qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 @@ -164,8 +166,9 @@ libtar? ( skins ) libtiger? ( kate ) qt4? ( X ) + qt5? ( !qt4 ) sdl? ( X ) - skins? ( truetype qt4 X ) + skins? ( truetype X || ( qt4 qt5 ) ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb ) @@ -180,10 +183,13 @@ } src_prepare() { + if use qt5; then + export UIC="/usr/lib64/qt5/bin/uic" + export MOC="/usr/lib64/qt5/bin/moc" + fi # Make it build with libtool 1.5 rm -f m4/lt* m4/libtool.m4 -# EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" eautoreconf } @@ -278,6 +284,7 @@ $(use_enable projectm) \ $(use_enable pulseaudio pulse) \ $(use_enable qt4 qt) \ + $(use_enable qt5 qt) \ $(use_enable rtsp realrtsp) \ $(use_enable run-as-root) \ $(use_enable samba smbclient) \