fix program start when eselect points to python3

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 52 insertions, 19 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index d7c2899aa443..8574ab8dced0 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/freevo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.83 2014/03/12 18:17:08 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.84 2014/03/12 18:27:33 hasufell Exp $
+
+  12 Mar 2014; Julian Ospald <hasufell@gentoo.org> freevo-1.9.0-r1.ebuild,
+  +files/freevo-1.9.0-distutils-r1.patch:
+  fix program start when eselect points to python3
 
 *freevo-1.9.0-r1 (12 Mar 2014)
 
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index 4519ed4f8e39..91e176b2928e 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX freevo-1.8.2.boot 1632 SHA256 36d047e29c8707d73c7e63538ee0ea2b77f64045954f73e0838f5ef7532982bc SHA512 b8bf95ea34e9c77d8f8df170a3b1455361634265bd1205a03760d51b647efb74635a7776d7c94a92799e9be4cc2aaad3e72b6df87e29c07cf6595e1c1b3b6ec4 WHIRLPOOL 90c5329c5ea1231b0d6eee20befb16e7e96f107fe3c22626465189d4fa16d30b8ce40e9908c075a145940ba084fe3c7ddd6580f284c3f95f0827ff6188b4486f
 AUX freevo-1.9.0-PIL.patch 905 SHA256 208f1ec7d72443548f58dd4491b8b86b9c3a20b529a4c89504c0740178c2afaa SHA512 324ea349ce6c2a860e2f13c445ea3d21631e6400541d48c294a745df1f73e5366e82988dd59712470edbb0228e518e2387ff08f40fbe718e52c2a49eeaa99984 WHIRLPOOL caaa551cdd12975ce38fe19c0554c76b51e34494a5a5d0fecbe19d94fec65f3b6557e99ec380ae15694d5cde9d3fcdb655efc6916c766e1747ff287f5a012dc9
+AUX freevo-1.9.0-distutils-r1.patch 663 SHA256 9f7bf9da4821d1298d23ecfc8ad72e237979844ae48f42b363657be9627736ee SHA512 6cd4ac470896ba2a77a937b3b5539831045972c61e142b0f5fc1c309e5220d5deb59622d81992615a4da2d2d6f41fd778e2997f38c9424e8dbee70f4a97e21a5 WHIRLPOOL 9180ee3db9b8bf404ccfb31adfcaf9b1c65daa30bdbcef6af2d8d7b0f0ca7d5811800a607efeced6e0d8b8ac824111e0b62436407af8c4d506235339c0e6c758
 AUX freevo.boot 1553 SHA256 754c16099054887a178372759aac0bab7104cb6dd0a829f6f534c6523e31002d SHA512 17931938c5079c64290a5fe2f9683f29b2e324e7361a83779c0467912ebc6337f8a0e1504e2a4625fad9d41a30ab50ff2c5abd949f7bcb9ce78ee74ca404f084 WHIRLPOOL 271f9bc7d2ddb1ad4e52bd8f5e2617c075b902fba6dadaf8ceb0da15caeabde56ee869a3ee97a59ac202a515a3a4a6182770407a75d642cdd3433291844a2ece
 AUX freevo.conf 1265 SHA256 c74b609e3b1177cbbbd3ca507e65b5392eed18fcd488e327c63478664fbd6143 SHA512 80b3282408e4343dba1eb45f4c8221c14e7e6b0199fc6283daf470371530563ebfdcef13f88b008c0b8c96f4133282ed75d55d9f9dae3ce3634e518c53d30905 WHIRLPOOL 48f51c010efb8f1ef402241bae2995a994956389a8a4071aec5c3c07d7c6ce0744493ab3ed191b5f905499b832b339e0aaed3754c01eec08e50cf53f0f6b76b8
 AUX freevo.desktop 126 SHA256 9553d646d154710af8d22b300c5a792433fad47efcd75224f416c46cd45e03e4 SHA512 d7f4d4368bf911b6dc2911609a6fa0bc897610347a8846840289ddaa05cd7c3a94f7297eed8d40f57aefeb97cea330413b24aa6d07c63f0980de6859bda0ea4e WHIRLPOOL f9ba175247e985a5fee02a070a87af17b2208aed662fde963e78ec88d55da210f2eaf2a8e63aed6d59b245cc5b9d969b561c0cc88de932f3a5390d170198d63f
@@ -10,26 +11,26 @@ AUX xbox-lircrc 1690 SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187
 DIST freevo-1.7.6.1.tar.gz 20856412 SHA256 1a0392a858ef428b3a511107322921eb9f45ad0ed02f7f05543486aafba0221e SHA512 f8562990ac4137042bfd9657bffb3b5f38bc02c3809a528cb798de67fbfa0c6fe2ba87b3cc0a6a2f65fbc11bc456ebba4dd27b4975202859835858893414f9b8 WHIRLPOOL 44019711a03a8736ff05518f1bbd3f0173facbe3ebf2f104e4f1b3820ccdca6e8be6785bc3d6b18569e334b2512fcaf00f64225b4dfa04d2b32b6837afc2e0df
 DIST freevo-1.9.0.tar.gz 27182867 SHA256 e3c97e1404bc5a171350d0c0edf8decaa6d4eb3eaa9e42112a903d375aaf8722 SHA512 4dc722efbf81101bda1ab4437516faa6d4471d4106553617d30dd6de860bb7ca5a3c7bfc9865f4a7589d6726c7ef838161213f86c679889e1cd086362921ebac WHIRLPOOL 16abf397c20b9dd18271c5933e343c846746cbbbf5bef8a126a364ce945c820e8e0f164e66fb56a61d86f256e6d7b98ba110a39395d8d26c278c6e54ede8a543
 EBUILD freevo-1.7.6.1.ebuild 5409 SHA256 f363bd407c7c7cdf016586c6e95ecd12ffa7bdb1553126e91fd165ba9ff6e300 SHA512 6168a8d2c8a496557c1601409b5270a16ed3ac4f6be33d215111679931a1c4d392966ff1e9d6c7ea132cfeca16d3632aeaa95b88ab54179097f764e9d98c5c06 WHIRLPOOL cb8691fe0fa5d8bb80cf41861a42bfeaddc3e37e99cbeb0e3b5cbfd6e8d7583dbd4bf3668bf703768dd0e4e3e6ab3c17d8b53b8075292890c0a160f47a3ab05c
-EBUILD freevo-1.9.0-r1.ebuild 5958 SHA256 b9a9daea76420b2a26677fc35b1fc84c7b2a6f09be9cd4b5dd80f83c5e6dcd9e SHA512 3f6c0799bd9f4ddb088da726b3aa62a5004761a6f54b2ea3a6c8acb7e0736225dff3f63d4b784ea9ee9c726cbf980d16f4da9d3b04be0b0bea9290f62762ce67 WHIRLPOOL 9a1ee65322614dc65f654011f4567ce443b87e37598074e5f69655ae5124a0d2f2417c7dcc2bb161d5b0a9d30c841872a885d212bd97eeb352005e6c38c420d7
+EBUILD freevo-1.9.0-r1.ebuild 6078 SHA256 769e5ff4b69b0aca5d368f695b2c83e386eaaee2d889f78503421a26bf9d52ac SHA512 c072fb506ba37390e54c9d7427c71592f5f9f469033cec7e6b8610ec5ee3dd404f36887d9d8519327138ca1037049ada36cba35ad92c9189dc08cb166a7e919e WHIRLPOOL 9521e56645f5de155b61e1ec8ad2581c1a8d6f6315e928fdedfa0647cac282c92b265baa739db3223151931030e1461ef34705b09a8b30dbbf7ecb35e952e7bd
 EBUILD freevo-1.9.0.ebuild 5816 SHA256 13875f730854aaabdebf3a4a753c3042528777e3694b4155ea7b7235f2cf1b51 SHA512 fcc5b7fb2dbd0bb540edbbe735a37f0956c0ce216bb94c3cc93eaaf06a3ce9cac43e6689f5fd5477deb96d21b59ebcabc65be96473483f13bef9a888ecb04ada WHIRLPOOL e5fc232ff018f83b18f11afedebedaa2eede524f309ae740f5495c612613dfb925ce0763ff58765eece3a8cb68d1bd80b7994a27983921161c513ca4c476fe12
-MISC ChangeLog 13031 SHA256 dd492008f038d23cd3a20fa7d20126364512cfe89f5d0ffc2c65eebdee3ffa66 SHA512 4a95a8f006ef82eaae945e4e4d972204d08365be60a3081127d6dc985a68f54cf4eaa04039b1db11c393120e67ef7a42b58650411f156f9044f1466e35e7f498 WHIRLPOOL bac369e73357ca168508b1b3fed89f8d4f467e7223a49711b178636bd0c2dc090065fd22be00cdd803915a2046eafaaec29f9be021cff51e07a5e8f48659b996
+MISC ChangeLog 13200 SHA256 ed4574987fd76898cc5f0c5b3ab4a4ced6e5da5cfe6478b2373f4b0c4f1437d8 SHA512 219ce88d49b2cedf83e81a354cf8d4d515da766ffb37a749506e3ceb199c2283612daf45b1a61a3a6703ef7c5c6ebc14a9db7be98ba293daaefb177ed7ce1618 WHIRLPOOL 972da1aeb2e3fd8da201002efebea8457d57efac07334f6e3845c49be369ec0e0e2c0cb50e15ab1cd54992d563f93aab5ad625c2d7a1984fda235ae0d6dcd657
 MISC metadata.xml 798 SHA256 b7ebe5b40248cb8bd1aad4533cec8430c73a0734a378b679d5a1c5f0fd799674 SHA512 be9be1db80da67a6e6284fd314eaaab92c03335454a663dc8a4664194b52ff06bcced552556e8ac9ce78c05b8dd64100eeb4dc9f7d93b3fec6c2906e4de083c0 WHIRLPOOL 5eb59bf2c9b7014672e83991c6629849a16df97a7a7cad79a949d254b41f5afb808c619c34ce56665af176f0bc8e57edb90e9f80a378405dc5ff15203a070779
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTIKSoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTIKcaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg9O8QALoYRNaiyYSC+bDxQmzpxLCI
-5PY0F5IDv5q0efVlzA+zaNPCV7aTMIvvG296Z5cpmDLklSHU2XbYV1eqOe0QM5Ra
-hN3GTuB09a85ZBNe7beOzwTPqD5myZB3YVPLr/se6EASYPFl77uq4AsdS6zxiy24
-RDGpY4Mo7ZnLdV0vgYBhg+5QOgRTZ5SCmTuq9GEHZO8OBhNLZRLsrf7asgc+dUXU
-szNwz9UwqBrbZ+DvQ0efZUouHO0OvYnGo5OdqDtTlEyFI4YUjySH87CaaRylBYil
-mAaWG+TmUATxVMitvdEuf9mwM6kQTpzk2RWZwamS4eGjVq9rQ+VdlpTG60S0Og+Y
-f3HHZHClYRFNLo033urQaYHN2ZlwpvpvQLko7lnUQOGShyj5ehSK2AKgz+5R93gQ
-j2E8hbyYrOukynp5SX4Y8WDDtEHvM6qNFY2H4KHYq47kVyunhC1Or4G6+MOMzwRV
-Q8jx0RVHVQ+R3Z5m21R37ZJ6F23NwJ1+7QQl3ioI7Qn7dR+VFtyaF18/QmxXvQxt
-E5bdCP1O/ahgoiwHiDRY6JrPuScgy8i1wwJB7ETfg/qtXLh9jUELW0SIwP3HxyiS
-K+rfYYhSSDG0+thtf1SMfOYyHU5QvfkUoBONUMALkSvbmQ6K4cSC8viUhMzz04mN
-x2o3cqgvP3wJYOKALDe8
-=MjnH
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgKb0QAJ3lMQOOpfIjf4HsjyEIw35n
++Tbkw4aaebyR+AUtOpz9CwODCI7ilreblB9O7Ru+w3PWc/swnEUHPx704LX6u1yy
+o2u5tV5oKz7cKH8mGH35xVdNH0J0fXIP5+evLusT6EsHCBZ8bpZrREaU+E+vRqDp
+64I28IzkEKCXVWe5BvO6JxoqACpmgdOdmaHN+PatFbXdmTnVTBL7eaEFvS7quufj
+vZ2aHAWzI+zXvnLj1e4s1h3oc34vAnbk5Rk1MoGP3/sFX6onFbJKfCMFXiAQ4XHL
+PKIchIGj5riamOmvl6GrEjs9r4COcIxhxY475LsUqQYDC6lhUCgxwZtVEOeR3+qN
++L2Jt6Y8AP84k/giPafmoW9JLsdDwOFGKeRnHyWr9TWdtYQ2OEINfJhNGRDE12ZL
+B/SFmmcFykbN/pSgFMqAXEtOMCAlQ36JZZEnAcYp8bhSUNL+aahDbbO4rn5jq9tg
+W2WoNI5LxxQqJnL+GVCKtbS5HrNm5YDN3Ujj9GMPbbISs+tVzoiKpp5ur540F8JK
+3efXY2BPruuJPpNcaQwpkcIWXDYOtuJYuqpMyAXIgiGaSboK8Yrm3AydQgj4nQLC
+33QDwUKr8FMjvQQL+r2dSglawayhrsPbu9U+gO/W6JHp/SAWeA3sdCA6Vw9wjT8W
+2E6vNlc49ZNSMLz7FswC
+=BAPT
 -----END PGP SIGNATURE-----
diff --git a/media-tv/freevo/files/freevo-1.9.0-distutils-r1.patch b/media-tv/freevo/files/freevo-1.9.0-distutils-r1.patch
new file mode 100644
index 000000000000..1494d2f2080b
--- /dev/null
+++ b/media-tv/freevo/files/freevo-1.9.0-distutils-r1.patch
@@ -0,0 +1,20 @@
+--- a/freevo-1.9.0/freevo
++++ b/freevo-1.9.0/freevo
+@@ -178,15 +178,8 @@
+     get the newest version of python [ with freevo installed ]
+     """
+     _debug_('version=%r' % (sys.version))
+-    if sys.hexversion >= 0x02040000:
+-        # python seems to be ok
+-        search = ('python', 'python2')
+-    elif sys.hexversion >= 0x02030000:
+-        # try python2.4, else take python
+-        search = ('python2.4', 'python')
+-    else:
+-        # python is too old, try to find python2.4 or python2
+-        search = ('python2.4', 'python2')
++
++    search = ('@EPYTHON@', 'python')
+ 
+     for python in search:
+         for path in os.environ['PATH'].split(':'):
diff --git a/media-tv/freevo/freevo-1.9.0-r1.ebuild b/media-tv/freevo/freevo-1.9.0-r1.ebuild
index c2fbe7950a8e..b50c084eebb7 100644
--- a/media-tv/freevo/freevo-1.9.0-r1.ebuild
+++ b/media-tv/freevo/freevo-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0-r1.ebuild,v 1.1 2014/03/12 18:17:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0-r1.ebuild,v 1.2 2014/03/12 18:27:33 hasufell Exp $
 
 EAPI=5
 
@@ -53,7 +53,7 @@ RDEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
 	xine? ( media-video/xine-ui )
 	vorbis? ( media-sound/vorbis-tools )"
 
-PATCHES=( "${FILESDIR}"/${P}-PIL.patch )
+PATCHES=( "${FILESDIR}"/${P}-{PIL,distutils-r1}.patch )
 
 pkg_setup() {
 	if ! { use X || use directfb || use fbcon || use matrox ; } ; then
@@ -67,6 +67,14 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -i \
+		-e "s/@EPYTHON@/${EPYTHON}/" \
+		freevo || die
+}
+
 src_install() {
 	distutils-r1_src_install