[dev-util/kdevelop-python] Bumped in tree + sync

Package-Manager: portage-2.2.8-r1

3 files changed, 6 insertions, 65 deletions

diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
deleted file mode 100644
index 651bdd16152..00000000000
--- a/dev-util/kdevelop-python/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdev-python-1.6.0.tar.xz 3655648 SHA256 92d383ea821a6b8e09f699b085357048eb30323a9fd58660f963865822f9327c SHA512 e0e477549e107dbd7f4b60771a940c2d1e5ab0316060b1d194495b973330936e547bd9cb827bcc7e42cac2ed08d9eaf49e64ad70da2a73706393fc3510aa6a85 WHIRLPOOL 682aa3059101a6f229b038c409dea5c14cdeb7b316de270f3fbcd8b5fde35b0d02f58a0b5103ee4c721f543b124faa73ccda3205a6acdc8a2a8cd0072566e411
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild
deleted file mode 100644
index 028173508b9..00000000000
--- a/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-KDE_LINGUAS="bs ca ca@valencia cs da de en_GB eo es et fi fr ga gl hu it ja lt
-mai mr nds nl pl pt pt_BR ro ru sk sl sv th tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-MY_PN="${KMNAME}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ $PV != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz"
-	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"
-IUSE="debug"
-
-COMMON_DEPEND="
-	>=dev-util/kdevplatform-1.4.60
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/kdevelop-pg-qt-1.0.0
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-util/kdevelop
-"
-
-RESTRICT="test"
-
-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-9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
index 0345fb38254..0382e744978 100644
--- a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
@@ -6,24 +6,15 @@ EAPI=5
 
 KDEBASE="kdevelop"
 KMNAME="kdev-python"
-
-if [[ $PV == *.9999* ]]; then
-	EGIT_BRANCH="${PV/\.9999/}"
-	KDEVPLATFORM_VERSION="${EGIT_BRANCH}"
-fi
-
+KDE_LINGUAS="bs ca ca@valencia da de es fi fr gl it kk nl pt pt_BR sk sl sv uk
+zh_TW"
 inherit kde4-base
 
 MY_PN="${KMNAME}"
-MY_PV="v${PV}"
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="${MY_PN}-${PV}"
 
 if [[ $PV != *9999* ]]; then
-	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
+	SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 else
@@ -38,7 +29,8 @@ LICENSE="GPL-2"
 IUSE="debug"
 
 DEPEND="
-	>=dev-util/kdevplatform-1.4.60
+	>=dev-util/kdevelop-pg-qt-1.0.0
+	>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
 "
 RDEPEND="
 	${DEPEND}