From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-988751-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A9CD4139084 for <garchives@archives.gentoo.org>; Thu, 7 Dec 2017 00:02:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D178EE1069; Thu, 7 Dec 2017 00:02:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E224E1063 for <gentoo-commits@lists.gentoo.org>; Thu, 7 Dec 2017 00:02:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 288E333BF51 for <gentoo-commits@lists.gentoo.org>; Thu, 7 Dec 2017 00:02:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA101AE76 for <gentoo-commits@lists.gentoo.org>; Thu, 7 Dec 2017 00:02:14 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1512604914.d567503605cadea3cc351cc0b36638ffacf3b5dc.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d567503605cadea3cc351cc0b36638ffacf3b5dc X-VCS-Branch: master Date: Thu, 7 Dec 2017 00:02:14 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 282e4d32-0110-4a9a-994f-cb97dbc76116 X-Archives-Hash: 2a94d74f131b303da9105d2f35b42303 commit: d567503605cadea3cc351cc0b36638ffacf3b5dc Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Dec 6 23:41:53 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 7 00:01:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5675036 media-video/vlc: DEPEND: Readability Package-Manager: Portage-2.3.16, Repoman-2.3.6 media-video/vlc/vlc-9999.ebuild | 115 +++++++++++++++++++++++++++++----------- 1 file changed, 83 insertions(+), 32 deletions(-) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index ca35ad64f38..100252dca4c 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -82,27 +82,47 @@ RDEPEND=" chromaprint? ( >=media-libs/chromaprint-0.6:0 ) chromecast? ( >=dev-libs/protobuf-2.5.0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) - dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) + dc1394? ( + >=media-libs/libdc1394-2.1:2 + >=sys-libs/libraw1394-2.0.1:0 + ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) - dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) + dvd? ( + >=media-libs/libdvdnav-4.9:0 + >=media-libs/libdvdread-4.9:0 + ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) - flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) + flac? ( + >=media-libs/flac-1.1.2:0 + >=media-libs/libogg-1:0 + ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnutls? ( net-libs/gnutls:0 ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) + ieee1394? ( + >=sys-libs/libavc1394-0.5.3:0 + >=sys-libs/libraw1394-2.0.1:0 + ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) - libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) + libass? ( + media-libs/fontconfig:1.0 + >=media-libs/libass-0.9.8:0= + ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) - libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libnotify:0 + ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) @@ -110,8 +130,11 @@ RDEPEND=" lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) - matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) - modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) + matroska? ( + >=dev-libs/libebml-1:0= + >=media-libs/libmatroska-1:0= + ) + modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) @@ -120,38 +143,70 @@ RDEPEND=" nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0= ) - opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) + opengl? ( + virtual/opengl:0 + >=x11-libs/libX11-1.3.99.901:0 + ) opus? ( >=media-libs/opus-1.0.3:0 ) - png? ( media-libs/libpng:0= sys-libs/zlib:0 ) + png? ( + media-libs/libpng:0= + sys-libs/zlib:0 + ) postproc? ( !libav? ( >=media-video/ffmpeg-3.1.3:0= ) libav? ( media-libs/libpostproc:0= ) ) - projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) + projectm? ( + media-fonts/dejavu:0 + media-libs/libprojectm:0 + ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) - qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - X? ( dev-qt/qtx11extras:5 ) ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( dev-qt/qtx11extras:5 ) + ) rdp? ( =net-misc/freerdp-1*:0=[client] ) - samba? ( >=net-fs/samba-4.0.0_alpha1:0[client] ) + samba? ( >=net-fs/samba-4.0.0:0[client] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) - sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) + sdl-image? ( + >=media-libs/sdl-image-1.2.10:0 + sys-libs/zlib:0 + ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) - skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) - speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) - svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) + skins? ( + x11-libs/libXext:0 + x11-libs/libXinerama:0 + x11-libs/libXpm:0 + ) + speex? ( + >=media-libs/speex-1.2.0:0 + media-libs/speexdsp:0 + ) + svg? ( + >=gnome-base/librsvg-2.9:2 + >=x11-libs/cairo-1.13.1:0 + ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) - taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) - theora? ( >=media-libs/libtheora-1.0_beta3:0 ) + taglib? ( + >=media-libs/taglib-1.9:0 + sys-libs/zlib:0 + ) + theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) - truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 - !fontconfig? ( media-fonts/dejavu:0 ) ) + truetype? ( + media-libs/freetype:2 virtual/ttf-fonts:0 + !fontconfig? ( media-fonts/dejavu:0 ) + ) twolame? ( media-sound/twolame:0 ) - udev? ( >=virtual/udev-142:0 ) + udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( @@ -171,7 +226,11 @@ RDEPEND=" X? ( x11-libs/libX11:0 ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) - xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) + xcb? ( + x11-libs/libxcb:0 + x11-libs/xcb-util:0 + x11-libs/xcb-util-keysyms:0 + ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) @@ -200,14 +259,6 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) S="${WORKDIR}/${MY_P}" -src_unpack() { - if [[ ${PV} = *9999 ]] ; then - git-r3_src_unpack - else - unpack ${A} - fi -} - src_prepare() { default