From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F099F59CAB for ; Thu, 31 Mar 2016 12:45:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4276B21C020; Thu, 31 Mar 2016 12:45:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C39A421C020 for ; Thu, 31 Mar 2016 12:45:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D79DE340D80 for ; Thu, 31 Mar 2016 12:45:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AFB3A865 for ; Thu, 31 Mar 2016 12:45:15 +0000 (UTC) From: "Lars Wendler" 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" Message-ID: <1459428311.85cc36eb4685f8b8ed374c02020139a7a95ba241.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/handbrake/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/handbrake/handbrake-9999.ebuild X-VCS-Directories: media-video/handbrake/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 85cc36eb4685f8b8ed374c02020139a7a95ba241 X-VCS-Branch: master Date: Thu, 31 Mar 2016 12:45:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4c480893-f0f1-423f-92b6-8c83e8e2a6b8 X-Archives-Hash: 0675d4c85919beca1fc848dfa9022603 commit: 85cc36eb4685f8b8ed374c02020139a7a95ba241 Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 31 12:44:46 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Mar 31 12:45:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cc36eb media-video/handbrake: Bump live ebuild to EAPI-6. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> media-video/handbrake/handbrake-9999.ebuild | 33 ++++++++++++++++------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index adb5fc3..8fb14e6 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-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 PYTHON_COMPAT=( python2_7 ) @@ -13,8 +13,9 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 KEYWORDS="" else - SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/HandBrake-${PV}" + MY_P="HandBrake-${PV}" + SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64 ~x86" fi @@ -73,27 +74,29 @@ DEPEND="${RDEPEND} dev-util/intltool sys-devel/automake" +PATCHES=( + # Remove libdvdnav duplication and call it on the original instead. + # It may work this way; if not, we should try to mimic the duplication. + "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch" + + # Remove faac dependency; TODO: figure out if we need to do this at all. + "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" + + # Fix missing x265 link flag + "${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch" +) + pkg_setup() { python-any-r1_pkg_setup } src_prepare() { - epatch_user - # Get rid of leftover bundled library build definitions, sed -i 's:.*\(/contrib\|contrib/\).*::g' \ "${S}"/make/include/main.defs \ || die "Contrib removal failed." - # Remove libdvdnav duplication and call it on the original instead. - # It may work this way; if not, we should try to mimic the duplication. - epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch - - # Remove faac dependency; TODO: figure out if we need to do this at all. - epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch - - # Fix missing x265 link flag - epatch "${FILESDIR}"/${PN}-9999-fix-missing-x265-link-flag.patch + default cd "${S}/gtk" # Don't run autogen.sh.