From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-863452-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 32D15138010
for <garchives@archives.gentoo.org>; Mon, 15 Feb 2016 10:38:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 01BC921C002;
Mon, 15 Feb 2016 10:38:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A268221C002
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Feb 2016 10:38:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6FA06340F05
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Feb 2016 10:38:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 653EF10AF
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Feb 2016 10:38:00 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@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, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1455532676.8a5a04f960dd7419988fd17ee5faa9fa82e275e1.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/ffmpeg/ffmpeg-9999.ebuild
X-VCS-Directories: media-video/ffmpeg/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 8a5a04f960dd7419988fd17ee5faa9fa82e275e1
X-VCS-Branch: master
Date: Mon, 15 Feb 2016 10:38:00 +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: 9bd874f9-95de-4849-98de-943043366a08
X-Archives-Hash: 3f67d4ebaac809dd1f00d27303b82dd1
commit: 8a5a04f960dd7419988fd17ee5faa9fa82e275e1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 10:37:40 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 10:37:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5a04f9
media-video/ffmpeg: Converted live ebuild to EAPI-6.
That also requires to use git-r3.eclass from now on.
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-video/ffmpeg/ffmpeg-9999.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 32720de..c6c909c 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI=6
# Subslot: libavutil major.libavcodec major.libavformat major
# Since FFmpeg ships several libraries, subslot is kind of limited here.
@@ -17,7 +17,7 @@ FFMPEG_SUBSLOT=55.57.57
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-2"
+ SCM="git-r3"
EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
fi
@@ -301,7 +301,7 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
- epatch_user
+ default
}
multilib_src_configure() {
@@ -414,6 +414,7 @@ multilib_src_configure() {
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/$(get_libdir)" \
--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
--mandir="${EPREFIX}/usr/share/man" \
--enable-shared \
--cc="$(tc-getCC)" \
@@ -453,7 +454,6 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
- use doc && dohtml -r doc/*
if use examples ; then
dodoc -r doc/examples
docompress -x /usr/share/doc/${PF}/examples