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

11 files changed, 258 insertions, 53 deletions

diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
new file mode 100644
index 00000000000..3392b5fd439
--- /dev/null
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -0,0 +1 @@
+DIST kdevelop-php-docs-1.5.0.tar.bz2 34157 SHA256 7dfd3b42dab49dff3ab08d31c632ba7ba3637c8edf3845063e834e15cc45a5b1 SHA512 efbed8dab04bda11fc1b278fb7344c6d32b4c0cbc1dddd11da20eee21249b17af0ac9173b71b19827764559ca190d2e1a1cf668e78c8d57aaeb831f6fee5a1c5 WHIRLPOOL 0eb5625dfd511f0ab7fc0adfb0243ddabd2862fd685f5a5d10d48aca28310cf2d08c91bda6312aa6cd0b53d25a5742e11dc4d5187ed7a2087d46cbe3b9586349
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 00000000000..218a1003031
--- /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/Manifest b/dev-util/kdevelop-php/Manifest
new file mode 100644
index 00000000000..3556e0d9dbe
--- /dev/null
+++ b/dev-util/kdevelop-php/Manifest
@@ -0,0 +1 @@
+DIST kdevelop-php-1.5.0.tar.bz2 677011 SHA256 73f3187e70f57ab2817ef1f023620b913d476a6433db98bcd28d58dc1649411d SHA512 c85e9660d21418becf98d71b1eb31c7d4bc2350bc9ddea620c2a3d5907918288524d99cd9fe56913c6da57b6c1ace13db48cb7364b68b652d7f17603c84cac56 WHIRLPOOL d4b2a54fd9b7bf618b27937c3079f525d004322daa827ba4be400152b2b101fd958d76da3f96e55ce6600249c1ada15426fd374fe6552d63c3d6fa272ec14669
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild
new file mode 100644
index 00000000000..8d712b7fb59
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-1.5.0.ebuild
@@ -0,0 +1,32 @@
+# 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 el en_GB es et fi fr gl it nb nds nl pl pt
+pt_BR sv th uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+KMNAME="kdevelop"
+EGIT_REPONAME="kdev-php"
+
+inherit kde4-base
+
+DESCRIPTION="PHP plugin for KDevelop 4"
+LICENSE="GPL-2 LGPL-2"
+IUSE="debug doc"
+
+if [[ $PV == *9999* ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="
+	>=dev-util/kdevelop-pg-qt-1.0.0
+"
+RDEPEND="
+	dev-util/kdevelop
+	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
+"
+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 2d674b39fd5..dc76439cc73 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/Manifest b/dev-util/kdevelop-python/Manifest
new file mode 100644
index 00000000000..d6f53aa11fc
--- /dev/null
+++ b/dev-util/kdevelop-python/Manifest
@@ -0,0 +1 @@
+DIST kdev-python-v1.4.90.tar.bz2 4703580 SHA256 441f675baddbfb9832a49458cc3c9a17daac4db55e7312c7a85d184bc0f4c776 SHA512 61b2b31cb6719ca6c35196563bf7b402ba2d3f4de99274c5d919367f7ebf0c9df6b28dca11dbcea754fc735300badffdf1ae91869da0119f94c10878a6eb65fe WHIRLPOOL 1e2c4c399885a9606df67e3682738be153734339fd4278bea67fb9cef21b0c4bc3619e7013970167044c1898cb97fc4a9ec099cb38e9b63f3c383ca65b89d6da
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 611cea9f0e1..00000000000
--- 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 00000000000..6cc1c04daca
--- /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 00000000000..ef061b4370e
--- /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 00000000000..2477f04505a
--- /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 eb9005449a0..4a243fba367 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
 }