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 9099D1381F3 for ; Mon, 29 Apr 2013 21:12:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11BEDE0925; Mon, 29 Apr 2013 21:12:33 +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 741F8E0925 for ; Mon, 29 Apr 2013 21:12:32 +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 4BB5C33E009 for ; Mon, 29 Apr 2013 21:12:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DA5D8E4504 for ; Mon, 29 Apr 2013 21:12:29 +0000 (UTC) From: "David Heidelberger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Heidelberger" Message-ID: <1367269831.86b697d37634aad9544ab9cdd7fe59b21e1dba40.okias@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-python/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop-python/kdevelop-python-1.4.90.ebuild dev-util/kdevelop-python/kdevelop-python-1.4.9999.ebuild dev-util/kdevelop-python/kdevelop-python-1.5.9999.ebuild dev-util/kdevelop-python/kdevelop-python-9999.ebuild X-VCS-Directories: dev-util/kdevelop-python/ X-VCS-Committer: okias X-VCS-Committer-Name: David Heidelberger X-VCS-Revision: 86b697d37634aad9544ab9cdd7fe59b21e1dba40 X-VCS-Branch: master Date: Mon, 29 Apr 2013 21:12:29 +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: a76d3a81-8d59-473e-9658-b3a4c45fd850 X-Archives-Hash: 1224ceb6967ccd4392c28d3de9e0c4ca commit: 86b697d37634aad9544ab9cdd7fe59b21e1dba40 Author: David Heidelberger ixit cz> AuthorDate: Mon Apr 29 21:10:31 2013 +0000 Commit: David Heidelberger gmail com> CommitDate: Mon Apr 29 21:10:31 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=86b697d3 [dev-util/kdevelop-python] ebuilds fix and rewrite --- .../kdevelop-python/kdevelop-python-1.4.90.ebuild | 36 +++++++------ .../kdevelop-python-1.4.9999.ebuild | 57 -------------------- .../kdevelop-python-1.5.9999.ebuild | 57 -------------------- .../kdevelop-python/kdevelop-python-9999.ebuild | 36 +++++++------ 4 files changed, 38 insertions(+), 148 deletions(-) diff --git a/dev-util/kdevelop-python/kdevelop-python-1.4.90.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.4.90.ebuild index 6cc1c04..57bc998 100644 --- a/dev-util/kdevelop-python/kdevelop-python-1.4.90.ebuild +++ b/dev-util/kdevelop-python/kdevelop-python-1.4.90.ebuild @@ -1,22 +1,30 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild,v 1.2 2012/12/12 12:26:18 dastergon Exp $ +# $Header: $ EAPI=5 -KDE_SCM="git" +KDEBASE="kdevelop" KMNAME="kdev-python" -KDEVPLATFORM_VERSION="1.3.60" -PYTHON_DEPEND="2" +PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} ) -inherit kde4-base python +if [[ $PV == *.9999* ]]; then + EGIT_BRANCH="${PV/\.9999/}" + KDEVPLATFORM_VERSION="${EGIT_BRANCH}" +fi + +inherit kde4-base python-r1 -MY_PN="kdev-python" +MY_PN="${KMNAME}" MY_PV="v${PV}" MY_P="${MY_PN}-${MY_PV}" if [[ $PV != *9999* ]]; then - SRC_URI="mirror://kde/unstable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" + if [[ $PV == *[6-9][0-9]* ]]; then + SRC_URI="mirror://kde/unstable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" + else + SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" + fi KEYWORDS="~amd64 ~x86" S=${WORKDIR}/${MY_P} else @@ -28,25 +36,19 @@ DESCRIPTION="Python plugin for KDevelop 4" HOMEPAGE="http://www.kdevelop.org" LICENSE="GPL-2" -SLOT="4" IUSE="debug" DEPEND=" + ${PYTHON_DEPS} >=dev-util/kdevelop-pg-qt-1.0.0 - >=dev-util/kdevplatform-1.3.60 +" +RDEPEND=" + ${PYTHON_DEPS} dev-util/kdevelop " -RDEPEND="${DEPEND}" RESTRICT="test" -pkg_setup() { - python_set_active_version 2 - python_pkg_setup - - kde4-base_pkg_setup -} - src_compile() { pushd "${WORKDIR}"/${P}_build emake parser diff --git a/dev-util/kdevelop-python/kdevelop-python-1.4.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.4.9999.ebuild deleted file mode 100644 index ef061b4..0000000 --- a/dev-util/kdevelop-python/kdevelop-python-1.4.9999.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild,v 1.2 2012/12/12 12:26:18 dastergon Exp $ - -EAPI=5 - -KDE_SCM="git" -EGIT_BRANCH="1.4" -KMNAME="kdev-python" -KDEVPLATFORM_VERSION="1.3.60" -PYTHON_DEPEND="2" - -inherit kde4-base python - -MY_PN="kdev-python" -MY_PV="v${PV}" -MY_P="${MY_PN}-${MY_PV}" - -if [[ $PV != *9999* ]]; then - SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~x86" - S=${WORKDIR}/${MY_P} -else - EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git" - KEYWORDS="" -fi - -DESCRIPTION="Python plugin for KDevelop 4" -HOMEPAGE="http://www.kdevelop.org" - -LICENSE="GPL-2" -SLOT="4" -IUSE="debug" - -DEPEND=" - >=dev-util/kdevelop-pg-qt-1.0.0 - >=dev-util/kdevplatform-1.3.60 - dev-util/kdevelop -" -RDEPEND="${DEPEND}" - -RESTRICT="test" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup - - kde4-base_pkg_setup -} - -src_compile() { - pushd "${WORKDIR}"/${P}_build - emake parser - popd - - kde4-base_src_compile -} diff --git a/dev-util/kdevelop-python/kdevelop-python-1.5.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.5.9999.ebuild deleted file mode 100644 index 2477f04..0000000 --- a/dev-util/kdevelop-python/kdevelop-python-1.5.9999.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild,v 1.2 2012/12/12 12:26:18 dastergon Exp $ - -EAPI=5 - -KDE_SCM="git" -EGIT_BRANCH="1.5" -KMNAME="kdev-python" -KDEVPLATFORM_VERSION="1.4.60" -PYTHON_DEPEND="2" - -inherit kde4-base python - -MY_PN="kdev-python" -MY_PV="v${PV}" -MY_P="${MY_PN}-${MY_PV}" - -if [[ $PV != *9999* ]]; then - SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~x86" - S=${WORKDIR}/${MY_P} -else - EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git" - KEYWORDS="" -fi - -DESCRIPTION="Python plugin for KDevelop 4" -HOMEPAGE="http://www.kdevelop.org" - -LICENSE="GPL-2" -SLOT="4" -IUSE="debug" - -DEPEND=" - >=dev-util/kdevelop-pg-qt-1.0.0 - >=dev-util/kdevplatform-1.4.60 - dev-util/kdevelop -" -RDEPEND="${DEPEND}" - -RESTRICT="test" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup - - kde4-base_pkg_setup -} - -src_compile() { - pushd "${WORKDIR}"/${P}_build - emake parser - popd - - kde4-base_src_compile -} diff --git a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild index 4a243fb..57bc998 100644 --- a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild +++ b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild @@ -1,22 +1,30 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild,v 1.2 2012/12/12 12:26:18 dastergon Exp $ +# $Header: $ EAPI=5 -KDE_SCM="git" +KDEBASE="kdevelop" KMNAME="kdev-python" -KDEVPLATFORM_VERSION="1.5.60" -PYTHON_DEPEND="2" +PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} ) -inherit kde4-base python +if [[ $PV == *.9999* ]]; then + EGIT_BRANCH="${PV/\.9999/}" + KDEVPLATFORM_VERSION="${EGIT_BRANCH}" +fi + +inherit kde4-base python-r1 -MY_PN="kdev-python" +MY_PN="${KMNAME}" MY_PV="v${PV}" MY_P="${MY_PN}-${MY_PV}" if [[ $PV != *9999* ]]; then - SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" + if [[ $PV == *[6-9][0-9]* ]]; then + SRC_URI="mirror://kde/unstable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" + else + SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" + fi KEYWORDS="~amd64 ~x86" S=${WORKDIR}/${MY_P} else @@ -28,25 +36,19 @@ DESCRIPTION="Python plugin for KDevelop 4" HOMEPAGE="http://www.kdevelop.org" LICENSE="GPL-2" -SLOT="4" IUSE="debug" DEPEND=" + ${PYTHON_DEPS} >=dev-util/kdevelop-pg-qt-1.0.0 - >=dev-util/kdevplatform-1.5.60 +" +RDEPEND=" + ${PYTHON_DEPS} dev-util/kdevelop " -RDEPEND="${DEPEND}" RESTRICT="test" -pkg_setup() { - python_set_active_version 2 - python_pkg_setup - - kde4-base_pkg_setup -} - src_compile() { pushd "${WORKDIR}"/${P}_build emake parser