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 1F61A138216 for ; Mon, 2 May 2016 07:52:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7EF6E0867; Mon, 2 May 2016 07:52:00 +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 D4C19E086A for ; Mon, 2 May 2016 07:51:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 94B36340B27 for ; Mon, 2 May 2016 07:51:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92E7133F for ; Mon, 2 May 2016 07:51:55 +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: <1462175509.e03d4f7e0da37d663654b26e386652c3d96e27cc.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild media-libs/xine-lib/xine-lib-1.2.9999.ebuild X-VCS-Directories: media-libs/xine-lib/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e03d4f7e0da37d663654b26e386652c3d96e27cc X-VCS-Branch: master Date: Mon, 2 May 2016 07:51:55 +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: 8edcdced-4b35-4b42-878a-54412d928d14 X-Archives-Hash: cbc4f206efe2c2415655d6e424b27644 commit: e03d4f7e0da37d663654b26e386652c3d96e27cc Author: Lars Wendler gentoo org> AuthorDate: Mon May 2 07:49:06 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon May 2 07:51:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03d4f7e media-libs/xine-lib: Added slotdep for imagemagick. Bumped to EAPI-6. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 10 ++++++---- media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild index 543d87f..0d16682 100644 --- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.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 inherit flag-o-matic libtool multilib eutils @@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND} flac? ( media-libs/flac ) fusion? ( media-libs/FusionSound ) gtk? ( x11-libs/gdk-pixbuf:2 ) - imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) + imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) @@ -117,6 +117,8 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) ) xinerama? ( X )" src_prepare() { + default + sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die if [[ ${PV} == *9999* ]]; then @@ -130,7 +132,7 @@ src_prepare() { for x in 0 1 2 3; do sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die done - has_version '>=media-video/ffmpeg-2.9' && epatch "${FILESDIR}/ffmpeg29.patch" + has_version '>=media-video/ffmpeg-2.9' && eapply "${FILESDIR}/ffmpeg29.patch" } src_configure() { diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild index eb4ee3b..79fdaae 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.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 inherit flag-o-matic libtool multilib @@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND} flac? ( media-libs/flac ) fusion? ( media-libs/FusionSound ) gtk? ( x11-libs/gdk-pixbuf:2 ) - imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) + imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) @@ -117,6 +117,8 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) ) xinerama? ( X )" src_prepare() { + default + sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die if [[ ${PV} == *9999* ]]; then