| 1 |
sping 12/09/30 15:26:22 |
| 2 |
|
| 3 |
Modified: ChangeLog mplayer2-2.0_p20120828.ebuild |
| 4 |
Log: |
| 5 |
media-video/mplayer2: QA (bug #434356) |
| 6 |
|
| 7 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.70 media-video/mplayer2/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.70&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.70&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.69&r2=1.70 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v |
| 19 |
retrieving revision 1.69 |
| 20 |
retrieving revision 1.70 |
| 21 |
diff -u -r1.69 -r1.70 |
| 22 |
--- ChangeLog 27 Sep 2012 23:02:48 -0000 1.69 |
| 23 |
+++ ChangeLog 30 Sep 2012 15:26:22 -0000 1.70 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for media-video/mplayer2 |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.69 2012/09/27 23:02:48 sping Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.70 2012/09/30 15:26:22 sping Exp $ |
| 29 |
+ |
| 30 |
+ 30 Sep 2012; Sebastian Pipping <sping@g.o> |
| 31 |
+ mplayer2-2.0_p20120828.ebuild: |
| 32 |
+ Produce more helpful errors when compiling with Python 2.6 active (bug |
| 33 |
+ #434356, concept by Mike Gilbert) |
| 34 |
|
| 35 |
27 Sep 2012; Sebastian Pipping <sping@g.o> |
| 36 |
mplayer2-2.0_p20120828.ebuild, mplayer2-9999.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 media-video/mplayer2/mplayer2-2.0_p20120828.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: mplayer2-2.0_p20120828.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- mplayer2-2.0_p20120828.ebuild 27 Sep 2012 23:02:48 -0000 1.3 |
| 53 |
+++ mplayer2-2.0_p20120828.ebuild 30 Sep 2012 15:26:22 -0000 1.4 |
| 54 |
@@ -1,12 +1,12 @@ |
| 55 |
# Copyright 1999-2012 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.3 2012/09/27 23:02:48 sping Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120828.ebuild,v 1.4 2012/09/30 15:26:22 sping Exp $ |
| 59 |
|
| 60 |
EAPI=4 |
| 61 |
|
| 62 |
[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS="" |
| 63 |
|
| 64 |
-inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS} |
| 65 |
+inherit python toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS} |
| 66 |
|
| 67 |
NAMESUF="${PN/mplayer/}" |
| 68 |
DESCRIPTION="Media Player for Linux" |
| 69 |
@@ -198,6 +198,13 @@ |
| 70 |
|
| 71 |
einfo "For various format support you need to enable the support on your ffmpeg package:" |
| 72 |
einfo " media-video/libav or media-video/ffmpeg" |
| 73 |
+ |
| 74 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=434356#c4 |
| 75 |
+ python_pkg_setup |
| 76 |
+ major=$(python_get_version --major) |
| 77 |
+ minor=$(python_get_version --minor) |
| 78 |
+ [[ ( ${major} -eq 2 && ${minor} -ge 7 ) || ${major} -ge 3 ]] \ |
| 79 |
+ || die "Please eselect Python 2.7 or later" |
| 80 |
} |
| 81 |
|
| 82 |
src_prepare() { |
Archives