Sed out python2.4 hardcoding in mmkeys/Makefile for bug 167595, thanks to Ahmed Ammar.

Package-Manager: portage-2.1.2-r9

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index f3812264272b1999f712a45471c606f6896578e9..36a40f66685164c5a133e89e6a9bf3edf7543b8a 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -13,18 +13,18 @@ EBUILD amarok-1.4.4-r3.ebuild 2243 RMD160 6b3856d91f5fa823761ef330472a138d62453c
 MD5 88d6fae4f34648898b448df3b67108e9 amarok-1.4.4-r3.ebuild 2243
 RMD160 6b3856d91f5fa823761ef330472a138d62453c65 amarok-1.4.4-r3.ebuild 2243
 SHA256 8572bda6a3a8221652b2c4bb88499a8d04ef5d37a870c94953351a78ef0be0c3 amarok-1.4.4-r3.ebuild 2243
-EBUILD amarok-1.4.5-r1.ebuild 2638 RMD160 49e49ae182002f0a21d994559e5bef19c3ee8f99 SHA1 a891d14def1cb5b3e4cd9860e89992a168a47903 SHA256 72232617facfa8ed4d15bf9d688e5f91576c0854caa69fcde981168b3368c65a
-MD5 49655c6dd9d609c4ce0fa6ab3e26137c amarok-1.4.5-r1.ebuild 2638
-RMD160 49e49ae182002f0a21d994559e5bef19c3ee8f99 amarok-1.4.5-r1.ebuild 2638
-SHA256 72232617facfa8ed4d15bf9d688e5f91576c0854caa69fcde981168b3368c65a amarok-1.4.5-r1.ebuild 2638
+EBUILD amarok-1.4.5-r1.ebuild 2634 RMD160 c66f86b512ccad7e88a6b5bf26f0fa25102b662c SHA1 637f7f4ecb49d9bfd901bff661a91ede52261166 SHA256 9c21fd4a2dc5bc47fdac5ac1881bdd090589bc09e9d04afa15beff129886e2d1
+MD5 f263b61f582e70adbf599924422a1ffa amarok-1.4.5-r1.ebuild 2634
+RMD160 c66f86b512ccad7e88a6b5bf26f0fa25102b662c amarok-1.4.5-r1.ebuild 2634
+SHA256 9c21fd4a2dc5bc47fdac5ac1881bdd090589bc09e9d04afa15beff129886e2d1 amarok-1.4.5-r1.ebuild 2634
 EBUILD amarok-9999-r1.ebuild 2753 RMD160 eeb8c4016feb305a447c7757e292a0ef21ae2c9b SHA1 89e35931ee077d1557618993d5c9f18cbed98a9b SHA256 e9876a6ba0782965217a86820b8536bd6537673d2dc36b27e4515b5e6d303f7e
 MD5 c116c2eb572ee0f17dc0028e1f26598e amarok-9999-r1.ebuild 2753
 RMD160 eeb8c4016feb305a447c7757e292a0ef21ae2c9b amarok-9999-r1.ebuild 2753
 SHA256 e9876a6ba0782965217a86820b8536bd6537673d2dc36b27e4515b5e6d303f7e amarok-9999-r1.ebuild 2753
-MISC ChangeLog 34735 RMD160 2651efb0cb8f847940d06e4182a2ab6e5fc91ccd SHA1 4f2d0e782739e447913ad54fd43d8b1ec70b2bab SHA256 4e5ddb8cafe9f8308dd0cfce9abe65f9a27626bf678763f5d246be7dc065a2f0
-MD5 d5b71a4c7f22859587465a7c16e5e6ae ChangeLog 34735
-RMD160 2651efb0cb8f847940d06e4182a2ab6e5fc91ccd ChangeLog 34735
-SHA256 4e5ddb8cafe9f8308dd0cfce9abe65f9a27626bf678763f5d246be7dc065a2f0 ChangeLog 34735
+MISC ChangeLog 34833 RMD160 babe65e00bf958f92af15e9d10674439e80ea4ed SHA1 4839d6d57a3ef4a399bb5f5e418d7e7f014a8264 SHA256 611aec683ff78adc8035145c1c5590e35b4f9f13b83e6596f723a493cbdc87e4
+MD5 3b56d97609b170109b8468c82bb6676c ChangeLog 34833
+RMD160 babe65e00bf958f92af15e9d10674439e80ea4ed ChangeLog 34833
+SHA256 611aec683ff78adc8035145c1c5590e35b4f9f13b83e6596f723a493cbdc87e4 ChangeLog 34833
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266

diff --git a/media-sound/exaile/ChangeLog b/media-sound/exaile/ChangeLog
index b9baa0a4edbf211221551e74a5553f8a8e65baaa..1a94a8df3d42657ef60bc91bf58d582d9fd2f1f8 100644 (file)
--- a/media-sound/exaile/ChangeLog
+++ b/media-sound/exaile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/exaile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.5 2007/02/14 22:17:39 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.6 2007/02/19 22:43:16 drac Exp $
+
+  19 Feb 2007; Samuli Suominen <drac@gentoo.org> exaile-0.2.8.ebuild:
+  Sed out python2.4 hardcoding in mmkeys/Makefile for bug 167595, thanks to
+  Ahmed Ammar.
 
   14 Feb 2007; Peter Weller <welp@gentoo.org> exaile-0.2.8.ebuild:
   Added ~amd64 keyword per request from drac

diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 0d40b98fdd9042a84c150cb7d8314ab3494a6fd3..6b72f7bb277ebe3597e98c7b3792e0082cbc744f 100644 (file)
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -3,14 +3,14 @@ MD5 db41796431d7aca5b429db3ef3465a72 files/exaile-0.2.8-strip.patch 386
 RMD160 5e8190e703de0d59386a932394fcce6d4a479886 files/exaile-0.2.8-strip.patch 386
 SHA256 842b3d627b9fe528f540a0b6a46b52a8db32cd578b1f2e1430a4b6b364bbf097 files/exaile-0.2.8-strip.patch 386
 DIST exaile_0.2.8.tar.gz 371231 RMD160 414cf041cad28ad2f301d6c7ece1f2dcac21fef8 SHA1 12f9773796331c06792a95e7af700275bfa6b3de SHA256 917cec0b34c7f42466d9d58dbfac3ce4f3791f5066e7c4b5f727e5c7f8bec53e
-EBUILD exaile-0.2.8.ebuild 2162 RMD160 c9826e4b2683be25dd092eb0b7eee643ddb32ae6 SHA1 ad8f771aa82e0649fb34de47c0d565ce8074f7db SHA256 c6e12b18b8f407dc8738893656027266770beb0b853151575f74cb8db877f79f
-MD5 8673aa7dcf6001a0a9982be7c9297e45 exaile-0.2.8.ebuild 2162
-RMD160 c9826e4b2683be25dd092eb0b7eee643ddb32ae6 exaile-0.2.8.ebuild 2162
-SHA256 c6e12b18b8f407dc8738893656027266770beb0b853151575f74cb8db877f79f exaile-0.2.8.ebuild 2162
-MISC ChangeLog 886 RMD160 a0fca622bec5b487012dc0ad0cb6705ebd6316f7 SHA1 e216255132b732b5b27f4175b88ccf8bf8f4480b SHA256 ab20673013c6273e36ec58b148383d0935162e3b4137546eb1dc2f09f7c3755f
-MD5 737e248d90121df15e099c809bd186db ChangeLog 886
-RMD160 a0fca622bec5b487012dc0ad0cb6705ebd6316f7 ChangeLog 886
-SHA256 ab20673013c6273e36ec58b148383d0935162e3b4137546eb1dc2f09f7c3755f ChangeLog 886
+EBUILD exaile-0.2.8.ebuild 2242 RMD160 5d02f9bcb212785565d994b04ced0fabe57a248c SHA1 db9c8d7240435106e4d31c1f8a755e90a303d689 SHA256 82874003aede2f9a860366b42fbcc5caa580e46b4e2110d26b516ad8ed8b4fdd
+MD5 76e61fbf2d8be1b30b0a0431b33d8fae exaile-0.2.8.ebuild 2242
+RMD160 5d02f9bcb212785565d994b04ced0fabe57a248c exaile-0.2.8.ebuild 2242
+SHA256 82874003aede2f9a860366b42fbcc5caa580e46b4e2110d26b516ad8ed8b4fdd exaile-0.2.8.ebuild 2242
+MISC ChangeLog 1048 RMD160 0ad9124b7ce0ac5ba95325aa5e639db7c73b30f3 SHA1 6f28fbf3e3b276ca6d5bbbe40a4e922edb839631 SHA256 39e06a637404375f7b2cc7e3197bfe8b4c884dfd296c3fb148ecb33172b020c0
+MD5 862e526c4c824e2aea9ee736b30f82c4 ChangeLog 1048
+RMD160 0ad9124b7ce0ac5ba95325aa5e639db7c73b30f3 ChangeLog 1048
+SHA256 39e06a637404375f7b2cc7e3197bfe8b4c884dfd296c3fb148ecb33172b020c0 ChangeLog 1048
 MISC metadata.xml 214 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f SHA1 ec7c7723b21b430e43c31acc7176045413af0225 SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba
 MD5 97f43390489104c86df538d5759098f0 metadata.xml 214
 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f metadata.xml 214

diff --git a/media-sound/exaile/exaile-0.2.8.ebuild b/media-sound/exaile/exaile-0.2.8.ebuild
index a68757a98f1fe441c100da5e07972de104f65928..aa2b2a6aec6c35cbc7b3ac2d02628f1f5c81fbd7 100644 (file)
--- a/media-sound/exaile/exaile-0.2.8.ebuild
+++ b/media-sound/exaile/exaile-0.2.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.8.ebuild,v 1.5 2007/02/14 22:17:39 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.8.ebuild,v 1.6 2007/02/19 22:43:16 drac Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils python toolchain-funcs
 
 MY_P=${PN}_${PV}
 
@@ -57,9 +57,11 @@ pkg_setup() {
 }
 
 src_unpack() {
-       cd "${S}"
        unpack ${A}
+       cd "${S}"
        epatch "${FILESDIR}"/${P}-strip.patch
+       python_version
+       sed -i -e "s:python2.4:python${PYVER}:" mmkeys/Makefile
 }
 
 src_compile() {