From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E35721381F3 for ; Tue, 6 Nov 2012 07:51:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D804BE05CF; Tue, 6 Nov 2012 07:50:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4321DE05CF for ; Tue, 6 Nov 2012 07:50:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52F8333D837 for ; Tue, 6 Nov 2012 07:50:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D9DB2E5442 for ; Tue, 6 Nov 2012 07:50:45 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1352188064.4bd51c40d15f10e1b5ef5ef32e342b832e237af0.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/plasma-workspace/plasma-workspace-4.9.3.ebuild kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild kde-base/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-base/plasma-workspace/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 4bd51c40d15f10e1b5ef5ef32e342b832e237af0 X-VCS-Branch: master Date: Tue, 6 Nov 2012 07:50:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 96d312d3-a536-49be-946f-39580ec9832a X-Archives-Hash: aef3d0a81a87ccbadd0975d86a7ac25b commit: 4bd51c40d15f10e1b5ef5ef32e342b832e237af0 Author: Michael Palimaka gentoo org> AuthorDate: Tue Nov 6 07:47:44 2012 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Nov 6 07:47:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4bd51c40 [kde-base/plasma-workspace] Improve python support, thanks to Arfever. Package-Manager: portage-2.1.11.31 --- .../plasma-workspace/plasma-workspace-4.9.3.ebuild | 16 ++++------------ .../plasma-workspace-4.9.49.9999.ebuild | 16 ++++------------ .../plasma-workspace/plasma-workspace-9999.ebuild | 16 ++++------------ 3 files changed, 12 insertions(+), 36 deletions(-) diff --git a/kde-base/plasma-workspace/plasma-workspace-4.9.3.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.9.3.ebuild index 2fc3903..b873b90 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.9.3.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.9.3.ebuild @@ -73,8 +73,8 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" pkg_setup() { if use python ; then python_set_active_version 2 + python_pkg_setup fi - python_pkg_setup kde4-meta_pkg_setup } @@ -102,20 +102,12 @@ src_configure() { kde4-meta_src_configure } -src_install() { - kde4-meta_src_install - - rm -f \ - "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \ - "${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co] -} - pkg_postinst() { kde4-meta_pkg_postinst if use python; then python_mod_optimize \ - PyKDE4 \ + PyKDE4/plasmascript.py \ /usr/share/apps/plasma_scriptengine_python fi } @@ -123,9 +115,9 @@ pkg_postinst() { pkg_postrm() { kde4-meta_pkg_postrm - if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then + if use python; then python_mod_cleanup \ - PyKDE4 \ + PyKDE4/plasmascript.py \ /usr/share/apps/plasma_scriptengine_python fi } diff --git a/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild index be2aa67..ad55073 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.9.49.9999.ebuild @@ -73,8 +73,8 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" pkg_setup() { if use python ; then python_set_active_version 2 + python_pkg_setup fi - python_pkg_setup kde4-meta_pkg_setup } @@ -102,20 +102,12 @@ src_configure() { kde4-meta_src_configure } -src_install() { - kde4-meta_src_install - - rm -f \ - "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \ - "${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co] -} - pkg_postinst() { kde4-meta_pkg_postinst if use python; then python_mod_optimize \ - PyKDE4 \ + PyKDE4/plasmascript.py \ /usr/share/apps/plasma_scriptengine_python fi } @@ -123,9 +115,9 @@ pkg_postinst() { pkg_postrm() { kde4-meta_pkg_postrm - if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then + if use python; then python_mod_cleanup \ - PyKDE4 \ + PyKDE4/plasmascript.py \ /usr/share/apps/plasma_scriptengine_python fi } diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild index be2aa67..ad55073 100644 --- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild @@ -73,8 +73,8 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" pkg_setup() { if use python ; then python_set_active_version 2 + python_pkg_setup fi - python_pkg_setup kde4-meta_pkg_setup } @@ -102,20 +102,12 @@ src_configure() { kde4-meta_src_configure } -src_install() { - kde4-meta_src_install - - rm -f \ - "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \ - "${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co] -} - pkg_postinst() { kde4-meta_pkg_postinst if use python; then python_mod_optimize \ - PyKDE4 \ + PyKDE4/plasmascript.py \ /usr/share/apps/plasma_scriptengine_python fi } @@ -123,9 +115,9 @@ pkg_postinst() { pkg_postrm() { kde4-meta_pkg_postrm - if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then + if use python; then python_mod_cleanup \ - PyKDE4 \ + PyKDE4/plasmascript.py \ /usr/share/apps/plasma_scriptengine_python fi }