Use Python 2.x in scripts/sync-palm-jppy.py for now.

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

3 files changed, 23 insertions, 4 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 5a7a66907f44..47da2f8f14d1 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.110 2012/06/20 08:18:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.111 2012/08/02 13:41:53 ssuominen Exp $
+
+  02 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> gtkpod-2.1.2.ebuild:
+  Use Python 2.x in scripts/sync-palm-jppy.py for now.
 
   20 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> -gtkpod-2.0.2.ebuild,
   -gtkpod-2.1.2_beta2.ebuild:
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index c9ae76d74592..85722e37bbbf 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtkpod-2.1.1-segfault_with_directory_creation.patch 1477 SHA256 f6154d9c2516b018712d9ff3b2fc2a2a1cd6855f48307834ec9ace3a66219883 SHA512 9d195212d0abb37da7604e16dcb1382473e96449f4c496e84109301a71422b3f447c6f8e6e6e55bba5f40995c614f2c438fda09d091ed3193970bf9ac93c66f7 WHIRLPOOL 2b89fc45d8ed320511826f4f33564936cbe890a07114bf223fe0be7d1585844814274859e2f343cbe46458d28516c431df98fa07123d410da597fb81752b65a1
 DIST gtkpod-2.1.1.tar.gz 3120542 SHA256 a474bb44ed42df554b02c2bd592485ee4fbe91cb9d0fe43576a63bb8b174c37a SHA512 761965a862e86ca759ad2d80ed4938c03ac9f75925061b7ff9c6275c2b6bc5c98c2ef75aa00be24f4e63c558d4516d51060a2b67c5289d85bdfa6a9766e0356b WHIRLPOOL 0e01759a79186d47e8c95a4004d8e871e5a135eba8f9ad55329c1258695be0999d081a9bfbc7fa150fc5a38526eb42b3bca9b21ad76cca394cd751cdd4c92525
 DIST gtkpod-2.1.2.tar.gz 3673800 SHA256 c3d054235bae80aa8563a441c902fa32528c2b00ba05a98066671fa3036dc1e6 SHA512 01b5b0c370451c717d7a04b592b2b986a692615d1624a267238268e19dd3baeab2f79604e700573fecce5e3822ee37a1d485965c648e2d7b1cb2ab3602742470 WHIRLPOOL f8b6b4304c07eb3e51b10c15288ba6813b6ea715ffa227fd0909acff5742548a49a2ecc999cabd67c0eca918dc4993339903bce0a8e0767298dd2b5eda48baf7
 EBUILD gtkpod-2.1.1-r3.ebuild 2287 SHA256 21298a9a0828a32217ccf68a38c4827b1b074fde00bd1707f16dc56f9685ba8b SHA512 91ed4d61bd24493efafd556efa3c0c6246c2c9e034f77101eaa64b10b13769ad47a83071398bb32949247ca38a358893b171ec520b6c59f6523a6db7f0099766 WHIRLPOOL 1f8cfe69447e091e52e0e5bf43e87fd3a68067453e8ac9c962a62bc66589dbf9e109be29f1afea15aaca38c66f53dc3a03443a190c16fe33f9e33cc6885b349f
-EBUILD gtkpod-2.1.2.ebuild 2502 SHA256 7fdede21d5b4f9e02a3a71f1e3bcac0c7977147a966a69c2b6462aaa192d9c1c SHA512 28640e04829869e31d146e6ea347d16c3b3f836631419df9290c7bfe244d33a61a7a8d402d5cc6664df7980b5251d0da43c02d5df83c9ad04384ccfe6d51fa1f WHIRLPOOL 1182f7e1705d103c27194d7cdce3e25edc1482f730054cbb573b7ca2eaee1dbc1ce2d4cbe45fa9b9bb7c3b23d5364c88527618640c1b49af9e1a1c3cfb8df060
-MISC ChangeLog 14239 SHA256 3831875c3d73a6beb6023faf9f2011618baab73fc0bde073a7c1cc4ad93e83a6 SHA512 75e4a8b383d24dde29325c7ffacaa23a6995cdea5e4f494fe4b7524d328a2a618a4f0da2f226f5c38da62a28b4413c1e631d8607bece298fe09d5461925fbedd WHIRLPOOL d71e1594481e5b2f26876267c39412e52552976d215b4f126f2f8b1688a7b6de34d8269ecab8ef4a99d118194e5a6a30d96b0a7428d58f28d82e93752209cd1a
+EBUILD gtkpod-2.1.2.ebuild 2567 SHA256 9bea7cd8401d7fb859f28d2d270b3873b58969d2bc9a9e9de8a88ce098bd40fc SHA512 632bf1516a3b24f00c2630fab525c6f7c700b0e8732570c2a83bce65996b39334f0d9cd1523616a88994548e2a7bdc729514ec409c1fe26af19b627bc61e9925 WHIRLPOOL d26ae29761acf0f5301cf052f1b24971f8a36a21d904d9d3c09a322e8c4ebc5b75367eb0f6e4badc5ea8efcff2d27a7110b129ba102efd1a15d80e2502b65bf9
+MISC ChangeLog 14370 SHA256 fc8154596fbeb404e68dd117881843c07c1056becf5da8469b4a6c36874ff782 SHA512 142e42d65f5b8a30926c4fdd103d8a9340d45c2c6be0008c3a9b040d349f5a311258a3dac03dc9a6a9bf69a4bea8fb0cbc6f07065bef7f9ba0554b32cda18e5e WHIRLPOOL bf0b22e8bce7bb2d88291a33665bed92a9ea543f355d1b1933a192361540ad60723047132f11224a163bf64596e13b3db582142dd0f91747c808a3c76c9eb92a
 MISC metadata.xml 328 SHA256 0288ef4f77dee4547f748900456ff0079dece3ca0dd50e11e6d3d3d1ff9d6bf7 SHA512 5af320980dc3dc9570303c837be3758fb47d0ef3d2faa7358b68e1b9486a23d426bc4f60f323b8273f9538ca2fe3e3e29c6c4079809b413d2654856e5feaea4d WHIRLPOOL 08d7a8491935637bf7d2f510a13b8b1a1fb90700f1e5d326e6e063817652437232f5d6dc01fb29c4b7b5c5c85f4ee55d1ee27ad1b4379fb36798bdb0f59407e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQGoNuAAoJEEdUh39IaPFNyd4IAIvQyA63qnjfMMEvxDGA9Yrc
+kiN70ZD/TFXWCMZNcxfu4O0Z/3Yq6dooGPAJnLlnXwAdKOKl+yg9YAYbPDPDB08z
+DqW/Ipt/6tqgdt9qZ2e/IJgqz48ZLU+T9sAORze2PyKk9ZmkzpolLoIIXZkzJFj8
+K4XMbe8Nv/3rgf7DeUPp8SXZ8cNTe5fOtCzIGZ3F/lBMQUsUiBu54TiybI6cjjTt
+FynypYRZBXXb//j9VuhDqlfBst4fYo2y8p47g+gbs/9hXjK/LUTTEdpj2E4iCuM5
+PeLqVHCChfbS2GtqJRgNsqQ42Nzope7aSAAedaDAauAEHLMDO/FiGw30RYx0QCY=
+=degj
+-----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/gtkpod-2.1.2.ebuild b/app-pda/gtkpod/gtkpod-2.1.2.ebuild
index 3d79720e6c0c..9db163f35ef1 100644
--- a/app-pda/gtkpod/gtkpod-2.1.2.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.1.2.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/app-pda/gtkpod/gtkpod-2.1.2.ebuild,v 1.1 2012/06/20 08:16:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.2.ebuild,v 1.2 2012/08/02 13:41:53 ssuominen Exp $
 
 EAPI=4
 inherit eutils gnome2-utils
@@ -51,6 +51,8 @@ src_prepare() {
 
 	# /path/to/install: '/path/to/app-pda/gtkpod-2.1.2_beta2/image/usr/share/gtkpod/data/rhythmbox.gep’: File exists
 	sed -i -e '/^dist_profiles_DATA/s:=.*:=:' plugins/sjcd/data/Makefile.in || die
+
+	sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die
 }
 
 src_configure() {