summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2012-09-30 15:26:22 +0000
committerSebastian Pipping <sping@gentoo.org>2012-09-30 15:26:22 +0000
commit167a00ad04652cf9a7d692691e1b498979794cde (patch)
treee56305448508b130f26e2f02ff5e31c380a75f59 /media-video
parentRemove old versions. (diff)
downloadgentoo-2-167a00ad04652cf9a7d692691e1b498979794cde.tar.gz
gentoo-2-167a00ad04652cf9a7d692691e1b498979794cde.tar.bz2
gentoo-2-167a00ad04652cf9a7d692691e1b498979794cde.zip
media-video/mplayer2: QA (bug #434356)
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer2/ChangeLog7
-rw-r--r--media-video/mplayer2/mplayer2-2.0_p20120828.ebuild11
2 files changed, 15 insertions, 3 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 247c8f25b456..39661628d1a5 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.69 2012/09/27 23:02:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.70 2012/09/30 15:26:22 sping Exp $
+
+ 30 Sep 2012; Sebastian Pipping <sping@gentoo.org>
+ mplayer2-2.0_p20120828.ebuild:
+ Produce more helpful errors when compiling with Python 2.6 active (bug
+ #434356, concept by Mike Gilbert)
27 Sep 2012; Sebastian Pipping <sping@gentoo.org>
mplayer2-2.0_p20120828.ebuild, mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
index 3fe2f1205420..bcac147ca3ae 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.3 2012/09/27 23:02:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.4 2012/09/30 15:26:22 sping Exp $
EAPI=4
[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
-inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
+inherit python toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
NAMESUF="${PN/mplayer/}"
DESCRIPTION="Media Player for Linux"
@@ -198,6 +198,13 @@ pkg_setup() {
einfo "For various format support you need to enable the support on your ffmpeg package:"
einfo " media-video/libav or media-video/ffmpeg"
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
+ python_pkg_setup
+ major=$(python_get_version --major)
+ minor=$(python_get_version --minor)
+ [[ ( ${major} -eq 2 && ${minor} -ge 7 ) || ${major} -ge 3 ]] \
+ || die "Please eselect Python 2.7 or later"
}
src_prepare() {