[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-python/, dev-util/kdevelop-php/, dev-util/kdevelop-php-docs/

[David Heidelberger]

commit:     e3c4b6be1673a4da0353c4fb3efd2f659e2ae949
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Mon Apr 29 17:08:37 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Mon Apr 29 17:08:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e3c4b6be

[dev-util/kdev*] clean up of kdevelop modules and new versions of php, php-docs and python

---
 .../kdevelop-php-docs-1.5.0.ebuild                 |   26 +++++++++
 ...p-php-9999.ebuild => kdevelop-php-1.5.0.ebuild} |    7 +--
 dev-util/kdevelop-php/kdevelop-php-9999.ebuild     |    3 -
 .../kdevelop-python-1.3.9999.ebuild                |   40 --------------
 .../kdevelop-python/kdevelop-python-1.4.90.ebuild  |   56 +++++++++++++++++++
 .../kdevelop-python-1.4.9999.ebuild                |   57 ++++++++++++++++++++
 .../kdevelop-python-1.5.9999.ebuild                |   57 ++++++++++++++++++++
 .../kdevelop-python/kdevelop-python-9999.ebuild    |   37 +++++++++----
 8 files changed, 225 insertions(+), 58 deletions(-)

diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.0.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.0.ebuild
new file mode 100644
index 0000000..218a100
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_LINGUAS="ca ca@valencia da de en_GB es et fi fr gl hu it nb nds nl pl pt
+pt_BR ru sk sv uk zh_CN zh_TW"
+KMNAME="kdevelop"
+EGIT_REPONAME="kdev-php-docs"
+
+inherit kde4-base
+
+DESCRIPTION="PHP documentation plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug"
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	!=dev-util/kdevelop-plugins-1.0.0
+"

diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild
similarity index 85%
copy from dev-util/kdevelop-php/kdevelop-php-9999.ebuild
copy to dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild
index 2d674b3..8d712b7 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 KDE_LINGUAS="ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
 pt_BR sv th uk zh_CN zh_TW"
@@ -29,7 +29,4 @@ RDEPEND="
 	dev-util/kdevelop
 	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
 "
-# Bug 330051
-# RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.2.0-{dbustests,parmake}.patch )
+PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )

diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 2d674b3..dc76439 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -29,7 +29,4 @@ RDEPEND="
 	dev-util/kdevelop
 	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
 "
-# Bug 330051
-# RESTRICT="test"
-
 PATCHES=( "${FILESDIR}/${PN}"-1.2.0-{dbustests,parmake}.patch )

diff --git a/dev-util/kdevelop-python/kdevelop-python-1.3.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.3.9999.ebuild
deleted file mode 100644
index 611cea9..0000000
--- a/dev-util/kdevelop-python/kdevelop-python-1.3.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-python"
-EGIT_BRANCH="1.3"
-KDEVPLATFORM_VERSION="1.2.82"
-inherit kde4-base python
-
-DESCRIPTION="Python plugin for KDevelop 4"
-SLOT="4"
-KEYWORDS=""
-LICENSE="GPL-2"
-IUSE="debug"
-
-DEPEND="
-	>=dev-util/kdevelop-pg-qt-0.9.0
-	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 > /dev/null
-	emake parser
-	popd > /dev/null
-
-	kde4-base_src_compile
-}

diff --git a/dev-util/kdevelop-python/kdevelop-python-1.4.90.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.4.90.ebuild
new file mode 100644
index 0000000..6cc1c04
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-1.4.90.ebuild
@@ -0,0 +1,56 @@
+# 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"
+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/unstable/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.4.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.4.9999.ebuild
new file mode 100644
index 0000000..ef061b4
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-1.4.9999.ebuild
@@ -0,0 +1,57 @@
+# 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
new file mode 100644
index 0000000..2477f04
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-1.5.9999.ebuild
@@ -0,0 +1,57 @@
+# 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 eb90054..4a243fb 100644
--- a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
@@ -1,23 +1,39 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $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=4
+EAPI=5
 
+KDE_SCM="git"
+KMNAME="kdev-python"
+KDEVPLATFORM_VERSION="1.5.60"
 PYTHON_DEPEND="2"
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-python"
-KDEVPLATFORM_VERSION="1.2.82"
+
 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"
-SLOT="4"
-KEYWORDS=""
+HOMEPAGE="http://www.kdevelop.org"
+
 LICENSE="GPL-2"
+SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=dev-util/kdevelop-pg-qt-0.9.0
+	>=dev-util/kdevelop-pg-qt-1.0.0
+	>=dev-util/kdevplatform-1.5.60
 	dev-util/kdevelop
 "
 RDEPEND="${DEPEND}"
@@ -27,13 +43,14 @@ RESTRICT="test"
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
+
 	kde4-base_pkg_setup
 }
 
 src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null
+	pushd "${WORKDIR}"/${P}_build
 	emake parser
-	popd > /dev/null
+	popd
 
 	kde4-base_src_compile
 }