From 4970356695a1c7ae8a10b5b1fabeb804ebced166 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Thu, 29 Apr 2010 04:21:22 +0000 Subject: [PATCH] Fix bug 312661 - restrict python version to 2, thanks for Locke Shinseiko Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- kde-base/plasma-workspace/ChangeLog | 6 +++++- kde-base/plasma-workspace/Manifest | 4 ++-- kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild | 8 +++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog index 3a5a0d59d7fa..2172b199f996 100644 --- a/kde-base/plasma-workspace/ChangeLog +++ b/kde-base/plasma-workspace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/plasma-workspace # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.62 2010/03/31 23:30:05 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.63 2010/04/29 04:21:22 reavertm Exp $ + + 29 Apr 2010; Maciej Mrozowski + plasma-workspace-4.4.2.ebuild: + Fix bug 312661 - restrict python version to 2, thanks for Locke Shinseiko 31 Mar 2010; Dror Levin -plasma-workspace-4.3.4.ebuild, -plasma-workspace-4.4.0.ebuild: diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest index 9d26bbd34cfe..f3d3068d4ebf 100644 --- a/kde-base/plasma-workspace/Manifest +++ b/kde-base/plasma-workspace/Manifest @@ -6,6 +6,6 @@ DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69 EBUILD plasma-workspace-4.3.3-r1.ebuild 2858 RMD160 abd90d2e839b6d72b272b5ad4978987f3720a5e6 SHA1 64d378807b36a656f9f8a37c391a6b64ca5a5910 SHA256 53b83e1fb463a7dabadbd47dfa2f48ad1fea63e61cb04bc6e477a09da8d874bf EBUILD plasma-workspace-4.3.5.ebuild 2563 RMD160 ddb8bec7d2cf766cec3e47a45bd143f6316830b0 SHA1 8aeeaf5bbacdb9685f7657bebc0a05cfc4a7bc4d SHA256 fdcbbbeeb4761330a4a8d40f50e1df3ecdff5e60b863e01b6a9b0d512039f6c1 EBUILD plasma-workspace-4.4.1.ebuild 2519 RMD160 9695bd3399061caffb36311b369e006f7c9a3cbf SHA1 629b15fc6c55c350c7aa3e88b0a7fdeafbc16fe9 SHA256 674ddc1f5558292604bf47446008896b75de998abc3bd4617832199b20da0fad -EBUILD plasma-workspace-4.4.2.ebuild 2616 RMD160 0ef1247d6971885258c1092a56a5679c61d000e3 SHA1 b32fef1348b2f0e3fe3bc913362931a0df7f77c6 SHA256 0ed19cbd8efed84336f23c4673d6f3e442fe617f037fc5eff4572a6bceaee053 -MISC ChangeLog 8942 RMD160 9be5b1aa17740e8eb053f9b9f805303fedcfa656 SHA1 1883ebc9852b6f24db64ce7e198ca2018e4ca5a1 SHA256 936d186ef096ef81b1d435630b4d6f351eb0e033fd246cf852a3f2577c612bb8 +EBUILD plasma-workspace-4.4.2.ebuild 2712 RMD160 baca244fc43647ab0faac9cef1c5fb612d792d16 SHA1 f27b48c84fc0c89c79ffd2abdf54efcf70e7599e SHA256 8d6f7e0ecd9596ed698f99af50855b5f1f635840d04fae5daae39ed0740e9966 +MISC ChangeLog 9109 RMD160 c268a76f1584715d1362060e29c4e334c46679a5 SHA1 30a3239c678ecb145f974915e5ec9409f538e7a9 SHA256 16d99040d3cebf83803a5fe5825f5c3bb7df036b5ee15fc5382731761cc5299e MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8 diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild index 47a6ca2264b1..151d154fdd97 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild,v 1.1 2010/03/30 22:02:12 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild,v 1.2 2010/04/29 04:21:21 reavertm Exp $ EAPI="3" KMNAME="kdebase-workspace" KMMODULE="plasma" +PYTHON_DEPEND="python? 2" inherit python kde4-meta DESCRIPTION="Plasma: KDE desktop framework" @@ -56,6 +57,11 @@ KMEXTRACTONLY=" KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" +pkg_setup() { + python_set_active_version 2 + kde4-meta_pkg_setup +} + src_unpack() { if use handbook; then KMEXTRA+=" doc/plasma-desktop" -- 2.26.2