Fix Bug #311171 - Take two.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/app-editors/bluefish/ChangeLog b/app-editors/bluefish/ChangeLog
index 200b5e257cbac2731d0e73f1041f6c8c908a409b..8666e427f211c7b064dd607bb521b8e1602bb79d 100644 (file)
--- a/app-editors/bluefish/ChangeLog
+++ b/app-editors/bluefish/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/bluefish
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.71 2010/07/15 17:22:49 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.72 2010/07/15 20:22:16 billie Exp $
+
+  15 Jul 2010; Daniel Pielmeier <billie@gentoo.org> bluefish-2.0.1.ebuild:
+  Fix Bug #311171 - Take two.
 
 *bluefish-2.0.1 (15 Jul 2010)
 

diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 81e1af99f1702373f2a9b0f16052a47f7ab487e3..fe6af093fe21649cc3aec24b82118ebee7518589 100644 (file)
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -5,6 +5,6 @@ DIST bluefish-2.0.0.tar.bz2 3287346 RMD160 6ec7ea007784fedd53cd5c604aa2c8e397717
 DIST bluefish-2.0.1.tar.bz2 3282350 RMD160 86d0aa91faf0dbeef2d15d258005513defd746c2 SHA1 5e00afd98cc65b41140188525031bba39c196e91 SHA256 0036ea859a510950cec2601c7fa21b2acbeba3f6086c41e162f2e1b15ae7a503
 EBUILD bluefish-1.0.7.ebuild 1080 RMD160 0e179f1289cf5696c01bbf7d94b5969c4682faa2 SHA1 d76f1e627afdea06f5a9ad8106cfa1695d6d5a6d SHA256 de9198b983f79e77e065ad6375807b0c8858266a1264d916c5c117e2b109d3b7
 EBUILD bluefish-2.0.0.ebuild 2211 RMD160 bf2e0bafc214e9213e169368a1d17ca23ecaa199 SHA1 87317c7854280b02a77c05fb59e130f6923305d8 SHA256 979380a32b4d75c50570c53582c04ae2ec775a07f5bc6b4e517f726d3cf4b495
-EBUILD bluefish-2.0.1.ebuild 2232 RMD160 78c179c212e13f0351cd785c80acca50e03252b7 SHA1 50b7b029421042d7e5dc5df2adb9bbb8d9fe87c1 SHA256 1c1651a2c2ba8b71ec9ffae340af22492c3909a35e0077591956855dd6f41e1f
-MISC ChangeLog 9409 RMD160 113cb527e14d7d21f03668de7f46c47815b82d21 SHA1 09608684849a173795b6528ad0b70ee941a73f49 SHA256 5d85ff129087dbeed166b3ffe59e6deaafb0b86c6d69f20d11ef470bf80ad272
+EBUILD bluefish-2.0.1.ebuild 2334 RMD160 e842ae8a2b2cad74a8be19207fdfde774fc27ef6 SHA1 518cfb19f9029d5a24e777488fd5a69cdce05d27 SHA256 3cf7db9545cc465b1defd7287acd9151925f35d43ef9620e7439f6b34e59ff04
+MISC ChangeLog 9515 RMD160 60922bfbcb72c4fd24f9711c95dd92f0630972e2 SHA1 4aa2dec1bdc5f5f7970706966d359a355d4db8e4 SHA256 3fc4d91af1444cd312538b923467e4ab924af03b9c3728de4480fcae2421bdb4
 MISC metadata.xml 301 RMD160 010d22a5d88b8d2cd8a9c369fb92fb2a49658fa9 SHA1 1bcc1537dc4b498e06b02ff51e46ec9b8d34292d SHA256 051132afb420b1381f42d67a58b894696124a93bf88dbf9023459a3a6be4d84d

diff --git a/app-editors/bluefish/bluefish-2.0.1.ebuild b/app-editors/bluefish/bluefish-2.0.1.ebuild
index b58b760d9758271069cca2d8fce83777e9b4921a..374df28007cb38d54eecf2d8b6ac96f682cf8ea4 100644 (file)
--- a/app-editors/bluefish/bluefish-2.0.1.ebuild
+++ b/app-editors/bluefish/bluefish-2.0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.0.1.ebuild,v 1.1 2010/07/15 17:22:49 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.0.1.ebuild,v 1.2 2010/07/15 20:22:16 billie Exp $
 
 EAPI=2
 
-PYTHON_DEPEND=2
+PYTHON_DEPEND="python? 2"
 
 inherit autotools eutils fdo-mime python
 
@@ -33,6 +33,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+       if use python ; then
+               python_set_active_version 2
+               python_pkg_setup
+       fi
+}
+
 src_prepare () {
        # Fixes automagic installation of charmap plugin
        # Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=570990