Add back support for building with python2. So at least I don't have to install py3.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 90 insertions, 18 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index befff428e0b7..1500dad242e8 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.62 2012/08/13 11:48:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.63 2012/08/13 13:19:20 scarabeus Exp $
+
+  13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/mplayer2-py2compat.patch, mplayer2-9999.ebuild:
+  Add back support for building with python2. So at least I don't have to
+  install py3.
 
   13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
   There needs to be only one dependency on py3.
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 24edde02d60d..5ba47dfe6b7f 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mplayer2-py2compat.patch 2054 SHA256 19fc7ab3d8efa867b1768b687c5c91cd588dc07fd98d196d3982e91a18afd7e1 SHA512 2e480abc231dcb68e5fe071211d8c98bbd6f72617a631a1435de3cb9f6f155c4b4cda539832a96033775f7255fd855428545b3587623c6b8acf4ddfc05df6a4f WHIRLPOOL 01805dbdeb8123fad35488be4c356a792dbc64e6f6c42234dbe7e1b6d88eb6bf33bc1b1a290aef8decb853bafa4ca9ea0cd2c265729e31e350f77f41c5c75365
 DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer2-2.0_p20120309.tar.xz 3328620 SHA256 8a46e0be27dd479c91bde64a35725c6ff668e5a74ab3a56ac3fe29d16f6a0a31
 EBUILD mplayer2-2.0_p20120309.ebuild 16416 SHA256 aaafe58532a1c4e263b1433d962b11fc8b67af3e24e603413c5c9300981f1276 SHA512 dc9b495fa441ecfa517f06e66952565c35aa84d9597a9e936d901a12b61233e5e483f86f04c07bd552f25dc75654c434284f617e8c5c28174e45c71b63713c2a WHIRLPOOL 7a9418dc7a920f00c318a5135788b32397faef62a8b37cea7654e1bb33928e0182eeccce28b90a9fbabde829a174309a76b4c63916d72ef8a47e45262e4b3793
-EBUILD mplayer2-9999.ebuild 14635 SHA256 771d2fb89f900ebdfc29b6e0305a24cec45f2fd36c543301413dc7b1edd91e6c SHA512 bde39eb718029f90fad7e0a4039af1e671af59a1c810d675ef46a397e64e6e35d15ff3d88b18c8cf9c9206e1868ed53f5219ef3fa1e0b20081772f339c7af1be WHIRLPOOL e122a9d99761905efc0e586c7eee12925c07faa9ed9e3f8cbfb494b46bc2769cffa883a33ba8d8c2e8e83e1ba915e9d3f38774d1b0a938560b9271b23fe134ae
-MISC ChangeLog 13042 SHA256 57f59e644335f2261b044b447c2aee897c71740e4209f041caa4ff8871b9b1ab SHA512 b9dccf30a205d3fa7d06b290213e3a8f3224b5003eae1c8def849c3feff9ca871de8d5a380324dd3cc870e3b3bb2f39ac19102a8b6cdf3b2ecc2345d7736f0d9 WHIRLPOOL 6209a4a7dbf7b510e7cd4ee9abac8c00d950ad548316a81ca8d0253ae26690b62c44ef6dada8c05081c48ac8d48e18bdf8db7066cc3b2471e3c16aaa0a1474e8
+EBUILD mplayer2-9999.ebuild 14687 SHA256 919a758190bcab376dc5bb5b2fd5fbfe26403a6da2af5b4c65699b4d53e69902 SHA512 245e35d844633ad3f1cdacf0c61efd72c157a2d1341e537da00f82d233488a72d500384df2483e445d9a28e305826f167441e18e112e72948cf7c8769403875b WHIRLPOOL c640698c4391e6e0e843cfd0093ec1b8c5e437af9c4d7cecdb1be5112b18a3707d69bf4f5e382367ca4298719850eddeca7281c571a746e45a3ee886608fbd0f
+MISC ChangeLog 13244 SHA256 908b99feecafa1708e45c3fcb61c154310c954f6130cbdbaa234c145b978914f SHA512 59bac7ae67451707bd798012fdb1d7bc51a25f2ef1edd37131ec8a41132259f1f33290fc71edc320daf50fc6d608c1b895764fbabfb15a4bf1686c4a54a62c78 WHIRLPOOL 95f8f27d066b674257a753529d7818cff1a7ce057f7bda4a58c5283acbf9c359a5d81b207aa483f9188e59c86c834b791515e1f3328a305db837a43e1e23cddf
 MISC metadata.xml 3304 SHA256 a55a151b22e9f6c45f94422e06603643f445768d747259ed0c8a8cfb10635aad SHA512 10d16a816563586c52ace596889722b4dec99603ddc14f817ee590e018693c71ce30a2feb645922062df648d83e6aa68ec2c215e8e02384d0af1ec51af1188fa WHIRLPOOL 8a44fc1cd6897b3924d703823c701e8b490396bbe90535ec7b72600a6e0cb8afe1b40c8aea7606c150cae12805eb05868008ba9b03591f8f5b92d06ac5556cea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQKOmdAAoJEOSiRoyO7jvoH+EP/3/BFfesf8FhqgFI2rjWoUqn
-RI9Uc5m88459NnBE5Xsv9exGF//zyu0ELAXkO1cqojww/kiuW7Q+8L+IYWHslIyP
-MaKrKHVDVe0Vi/TPOcFnu8frURMkLRA8ix8bw0ekodlv91ao0KvRTSHs+beDD++R
-CooFuH+vNwhJMZc5WZgpO2lMd+cBc97zLWbeXgPXWht4b0i+CTqYg3PtcMcCzG3C
-qonfno95B4PmNcbQpci7M7Dm9pUsgysUjm3xoGzd8i6hVXhE/GnljWwS4r/J5caZ
-m/jScJy7tnJT05azt0vrq1JUO070UCEN6BQpZD/ZCjB/cmlaI42TC3vqc6fThbAQ
-+cy/R5qGxGetvhtMIcB0WMKmLFDccA6NeSQjMLNZIEX9f6K+iI9ArfMdriv203jw
-9Mk0C7OQFkeUwoOIsckLUmaqSTyJFdOldzikUDG63YcwjmT8GoutRjksgeguqqst
-X+MqMYH7BpzpZZBbnvRqHdURXU33FFa9jJ0prvwp3BzxK5sFyTEVJLRU635UTokR
-EIHWUnqhc0q2rz73TbwsWBP4X2rXnH5dqIdyb5OwQZ+qRyHoNuhKoJ9jeN/yxskU
-jVC5PW63k8RxchHCTU7rXUF7yGCP6BAp/wF7HXWmn+DkaL0T+5sQV6f9qPA4Q8zE
-aTf+voOlkF2pjDehWqNX
-=ur9y
+iQIcBAEBCAAGBQJQKP7FAAoJEOSiRoyO7jvoqVAP/1YHr1/6EcGeE2pTB80I+Hny
+V4Oy41ZgvL0434B4m/7kPdCb18//HC7yaUptZGlkS4J9ygdQgpvvWJpCEXhEW8n8
+6LGjIUXQq8fB24iABaMuFOkYYJ9G4GDoz1rBOHfvuOqEIPBRkaXiyP7xkRPmFAx6
+Ul+LC5fqTzZ7ckRB++0E+YZZonessCzpxAy+WuYYrQZWZh/2niucMQuIoVx3wm4z
+DukI2x+M4XDL5uOm7gGSftsSL98l+nGCD0RcMAiJgVPaXpkCg6qTVolEtajjembL
+hY51Fx3yV59U6GA2MI7oWFApU0hGEMWN9QTQWML3Xx4ohjg5eCnGOueX4ZNGL2kQ
+tOQOQ7+/V1paNdeCmkBbkdqYC0rT00VOqmHQgUPalcTrHoRQXDIfWSC5wX7zXe4N
+ObNPoKL7CCrHsVkSKXJuOXStXHvorFrUGMNx3yLwptQh5LWie56sD3Z473AkQ+hr
+MN3ua9FCvwmfJQLGNAF//ZGtuyutZWgovVaNy1Btb6qCqDqVeC/kJxSXFWsCoh3P
+R3XAqlywoLtqyagKrSwx3d5Qk4t4fs1sFqA8NKn0Z8PZTNaaHs2nuxRrqBNI7E8f
+u3Zku86O7olSyXu4UqG/b+DgII9dG9S2p/foWMoHaiOM2Z0P2B8xDp10vvOFcjrP
+el+X5P+MdkvQUdulhm59
+=jTUf
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/files/mplayer2-py2compat.patch b/media-video/mplayer2/files/mplayer2-py2compat.patch
new file mode 100644
index 000000000000..2f0d7d11421d
--- /dev/null
+++ b/media-video/mplayer2/files/mplayer2-py2compat.patch
@@ -0,0 +1,62 @@
+From c2bf465af05a65639557ef7f6e9200f793568ce2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz>
+Date: Mon, 13 Aug 2012 14:12:05 +0200
+Subject: [PATCH] Add py2 compat. Now scripts work under both py3 and py2.
+
+---
+ TOOLS/file2string.py     |    4 ++--
+ TOOLS/matroska.py        |    4 +++-
+ TOOLS/vdpau_functions.py |    2 +-
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py
+index 002ba4a..1627fa2 100755
+--- a/TOOLS/file2string.py
++++ b/TOOLS/file2string.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/env python
+ 
+ # Convert the contents of a file into a C string constant.
+ # Note that the compiler will implicitly add an extra 0 byte at the end
+@@ -16,7 +16,7 @@ def main(infile):
+     for c, esc in ("\nn", "\tt", r"\\", '""'):
+         conv[ord(c)] = '\\' + esc
+     for line in infile:
+-        sys.stdout.write('"' + ''.join(conv[c] for c in line) + '"\n')
++        sys.stdout.write('"' + ''.join(conv[ord(c)] for c in line) + '"\n')
+ 
+ with open(sys.argv[1], 'rb') as infile:
+     sys.stdout.write("// Generated from %s\n\n" % sys.argv[1])
+diff --git a/TOOLS/matroska.py b/TOOLS/matroska.py
+index ffa388e..5b34d7d 100755
+--- a/TOOLS/matroska.py
++++ b/TOOLS/matroska.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/env python
+ """
+ Generate C definitions for parsing Matroska files.
+ Can also be used to directly parse Matroska files and display their contents.
+@@ -22,6 +22,8 @@ Can also be used to directly parse Matroska files and display their contents.
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ 
++# Python2 compat so we don't enforce py3 usage
++from __future__ import print_function
+ 
+ elements_ebml = (
+     'EBML, 1a45dfa3, sub', (
+diff --git a/TOOLS/vdpau_functions.py b/TOOLS/vdpau_functions.py
+index 39e38a8..85e6f1d 100755
+--- a/TOOLS/vdpau_functions.py
++++ b/TOOLS/vdpau_functions.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/env python
+ 
+ # Generate vdpau_template.c
+ 
+-- 
+1.7.8.6
+
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index dffd1ea3eef5..5546019df536 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.41 2012/08/13 11:48:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.42 2012/08/13 13:19:20 scarabeus Exp $
 
 EAPI=4
 
@@ -152,7 +152,7 @@ RDEPEND+="
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	=dev-lang/python-3*
+	>=dev-lang/python-2.6
 	sys-devel/gettext
 	X? (
 		x11-proto/videoproto
@@ -170,6 +170,10 @@ DEPEND="${RDEPEND}
 	x86-fbsd? ( ${ASM_DEP} )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-py2compat.patch"
+)
+
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
 		elog