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 97826198005 for ; Mon, 11 Mar 2013 12:21:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 232A2E058A; Mon, 11 Mar 2013 12:21:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A045EE058A for ; Mon, 11 Mar 2013 12:21:37 +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 C36E733D841 for ; Mon, 11 Mar 2013 12:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 53B92E4079 for ; Mon, 11 Mar 2013 12:21:35 +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: <1363004434.25818aa78d2ed3b036e3d3c0be22f5b1a66c40ef.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/lokalize/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/lokalize/lokalize-4.10.49.9999.ebuild kde-base/lokalize/lokalize-9999.ebuild X-VCS-Directories: kde-base/lokalize/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 25818aa78d2ed3b036e3d3c0be22f5b1a66c40ef X-VCS-Branch: master Date: Mon, 11 Mar 2013 12:21:35 +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: 0b2e62c6-7860-4288-a211-afa200e9bb0d X-Archives-Hash: 5c9e46f62e4ec554c738dd4783f1a964 commit: 25818aa78d2ed3b036e3d3c0be22f5b1a66c40ef Author: Michael Palimaka gentoo org> AuthorDate: Mon Mar 11 12:20:34 2013 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Mar 11 12:20:34 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=25818aa7 [kde-base/lokalize] Migrate to python-single-r1. Package-Manager: portage-2.1.11.55 --- kde-base/lokalize/lokalize-4.10.49.9999.ebuild | 13 ++++++------- kde-base/lokalize/lokalize-9999.ebuild | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/kde-base/lokalize/lokalize-4.10.49.9999.ebuild b/kde-base/lokalize/lokalize-4.10.49.9999.ebuild index d99b3b6..139eae3 100644 --- a/kde-base/lokalize/lokalize-4.10.49.9999.ebuild +++ b/kde-base/lokalize/lokalize-4.10.49.9999.ebuild @@ -11,8 +11,8 @@ else eclass="kde4-meta" KMNAME="kdesdk" fi -PYTHON_DEPEND="2" -inherit python ${eclass} +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) +inherit python-single-r1 ${eclass} DESCRIPTION="KDE4 translation tool" KEYWORDS="" @@ -25,19 +25,18 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_kdebase_dep kdesdk-strigi-analyzer) - $(add_kdebase_dep krosspython) - $(add_kdebase_dep pykde4) + $(add_kdebase_dep krosspython "${PYTHON_USEDEP}") + $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}") " pkg_setup() { - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup ${eclass}_pkg_setup } src_install() { ${eclass}_src_install - python_convert_shebangs -q -r $(python_get_version) "${ED}/usr/share/apps/${PN}" + python_fix_shebang "${ED}/usr/share/apps/${PN}" } pkg_postinst() { diff --git a/kde-base/lokalize/lokalize-9999.ebuild b/kde-base/lokalize/lokalize-9999.ebuild index 0717993..609e90d 100644 --- a/kde-base/lokalize/lokalize-9999.ebuild +++ b/kde-base/lokalize/lokalize-9999.ebuild @@ -5,8 +5,8 @@ EAPI=5 KDE_HANDBOOK="optional" -PYTHON_DEPEND="2" -inherit python kde4-base +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) +inherit python-single-r1 kde4-base DESCRIPTION="KDE4 translation tool" KEYWORDS="" @@ -19,19 +19,18 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_kdebase_dep kdesdk-strigi-analyzers) - $(add_kdebase_dep krosspython) - $(add_kdebase_dep pykde4) + $(add_kdebase_dep krosspython "${PYTHON_USEDEP}") + $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}") " pkg_setup() { - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup kde4-base_pkg_setup } src_install() { kde4-base_src_install - python_convert_shebangs -q -r $(python_get_version) "${ED}/usr/share/apps/${PN}" + python_fix_shebang "${ED}/usr/share/apps/${PN}" } pkg_postinst() {