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 C41E5138247 for ; Mon, 6 Jan 2014 02:30:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30459E0BD5; Mon, 6 Jan 2014 02:30:21 +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 A20E1E0BD5 for ; Mon, 6 Jan 2014 02:30:20 +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 8941733F689 for ; Mon, 6 Jan 2014 02:30:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CB3CCE54C1 for ; Mon, 6 Jan 2014 02:30:17 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1388975356.d942fffa250075400ccb4f28491f6a558b8def65.creffett@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/marble/marble-4.11.49.9999.ebuild kde-base/marble/marble-4.11.5.ebuild kde-base/marble/marble-4.12.49.9999.ebuild kde-base/marble/marble-9999.ebuild X-VCS-Directories: kde-base/marble/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: d942fffa250075400ccb4f28491f6a558b8def65 X-VCS-Branch: master Date: Mon, 6 Jan 2014 02:30:17 +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: 35ffab8e-9db1-4fa9-83d4-68212c58a73d X-Archives-Hash: 5fd173870d4f98c5ef1edd00a5f3084d commit: d942fffa250075400ccb4f28491f6a558b8def65 Author: Chris Reffett gentoo org> AuthorDate: Mon Jan 6 02:29:16 2014 +0000 Commit: Chris Reffett gentoo org> CommitDate: Mon Jan 6 02:29:16 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d942fffa [kde-base/marble] Convert to python-r1.eclass Package-Manager: portage-2.2.7 --- kde-base/marble/marble-4.11.49.9999.ebuild | 17 ++++++----------- kde-base/marble/marble-4.11.5.ebuild | 17 ++++++----------- kde-base/marble/marble-4.12.49.9999.ebuild | 17 ++++++----------- kde-base/marble/marble-9999.ebuild | 17 ++++++----------- 4 files changed, 24 insertions(+), 44 deletions(-) diff --git a/kde-base/marble/marble-4.11.49.9999.ebuild b/kde-base/marble/marble-4.11.49.9999.ebuild index 69d003c..ddd7499 100644 --- a/kde-base/marble/marble-4.11.49.9999.ebuild +++ b/kde-base/marble/marble-4.11.49.9999.ebuild @@ -7,8 +7,8 @@ EAPI=5 KDE_HANDBOOK="optional" KDE_REQUIRED="optional" CPPUNIT_REQUIRED="optional" -PYTHON_DEPEND="python? 2" -inherit kde4-base python +PYTHON_COMPAT=( python{2_6,2_7} ) +inherit kde4-base python-r1 DESCRIPTION="Generic geographical map widget" HOMEPAGE="http://marble.kde.org/" @@ -29,8 +29,9 @@ RDEPEND=" dev-qt/qtwebkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( - >=dev-python/PyQt4-4.4.4-r1 - kde? ( $(add_kdebase_dep pykde4) ) + ${PYTHON_DEPS} + >=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}] + kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) ) ) shapefile? ( sci-libs/shapelib ) zip? ( dev-libs/quazip ) @@ -48,14 +49,8 @@ REQUIRED_USE=" " pkg_setup() { - python_set_active_version 2 kde4-base_pkg_setup - python_pkg_setup -} - -src_prepare() { - kde4-base_src_prepare - python_convert_shebangs -r $(python_get_version) . + python_setup } src_configure() { diff --git a/kde-base/marble/marble-4.11.5.ebuild b/kde-base/marble/marble-4.11.5.ebuild index adc21b3..a24a36e 100644 --- a/kde-base/marble/marble-4.11.5.ebuild +++ b/kde-base/marble/marble-4.11.5.ebuild @@ -7,8 +7,8 @@ EAPI=5 KDE_HANDBOOK="optional" KDE_REQUIRED="optional" CPPUNIT_REQUIRED="optional" -PYTHON_DEPEND="python? 2" -inherit kde4-base python +PYTHON_COMPAT=( python{2_6,2_7} ) +inherit kde4-base python-r1 DESCRIPTION="Generic geographical map widget" HOMEPAGE="http://marble.kde.org/" @@ -29,8 +29,9 @@ RDEPEND=" dev-qt/qtwebkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( - >=dev-python/PyQt4-4.4.4-r1 - kde? ( $(add_kdebase_dep pykde4) ) + ${PYTHON_DEPS} + >=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}] + kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) ) ) shapefile? ( sci-libs/shapelib ) zip? ( dev-libs/quazip ) @@ -48,14 +49,8 @@ REQUIRED_USE=" " pkg_setup() { - python_set_active_version 2 kde4-base_pkg_setup - python_pkg_setup -} - -src_prepare() { - kde4-base_src_prepare - python_convert_shebangs -r $(python_get_version) . + python_setup } src_configure() { diff --git a/kde-base/marble/marble-4.12.49.9999.ebuild b/kde-base/marble/marble-4.12.49.9999.ebuild index 69d003c..ddd7499 100644 --- a/kde-base/marble/marble-4.12.49.9999.ebuild +++ b/kde-base/marble/marble-4.12.49.9999.ebuild @@ -7,8 +7,8 @@ EAPI=5 KDE_HANDBOOK="optional" KDE_REQUIRED="optional" CPPUNIT_REQUIRED="optional" -PYTHON_DEPEND="python? 2" -inherit kde4-base python +PYTHON_COMPAT=( python{2_6,2_7} ) +inherit kde4-base python-r1 DESCRIPTION="Generic geographical map widget" HOMEPAGE="http://marble.kde.org/" @@ -29,8 +29,9 @@ RDEPEND=" dev-qt/qtwebkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( - >=dev-python/PyQt4-4.4.4-r1 - kde? ( $(add_kdebase_dep pykde4) ) + ${PYTHON_DEPS} + >=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}] + kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) ) ) shapefile? ( sci-libs/shapelib ) zip? ( dev-libs/quazip ) @@ -48,14 +49,8 @@ REQUIRED_USE=" " pkg_setup() { - python_set_active_version 2 kde4-base_pkg_setup - python_pkg_setup -} - -src_prepare() { - kde4-base_src_prepare - python_convert_shebangs -r $(python_get_version) . + python_setup } src_configure() { diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild index 69d003c..ddd7499 100644 --- a/kde-base/marble/marble-9999.ebuild +++ b/kde-base/marble/marble-9999.ebuild @@ -7,8 +7,8 @@ EAPI=5 KDE_HANDBOOK="optional" KDE_REQUIRED="optional" CPPUNIT_REQUIRED="optional" -PYTHON_DEPEND="python? 2" -inherit kde4-base python +PYTHON_COMPAT=( python{2_6,2_7} ) +inherit kde4-base python-r1 DESCRIPTION="Generic geographical map widget" HOMEPAGE="http://marble.kde.org/" @@ -29,8 +29,9 @@ RDEPEND=" dev-qt/qtwebkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( - >=dev-python/PyQt4-4.4.4-r1 - kde? ( $(add_kdebase_dep pykde4) ) + ${PYTHON_DEPS} + >=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}] + kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) ) ) shapefile? ( sci-libs/shapelib ) zip? ( dev-libs/quazip ) @@ -48,14 +49,8 @@ REQUIRED_USE=" " pkg_setup() { - python_set_active_version 2 kde4-base_pkg_setup - python_pkg_setup -} - -src_prepare() { - kde4-base_src_prepare - python_convert_shebangs -r $(python_get_version) . + python_setup } src_configure() {