Merge branch 'master' of git://git.overlays.gentoo.org/proj/kde

3 files changed, 9 insertions, 71 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 784b6c4c5d2..53048ab2d21 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,4 +1,2 @@
-DIST kdevelop-3.9.97.tar.bz2 2415397 RMD160 88c1d655fb3e54235dfa3a3d9de8f53183cd1913 SHA1 79141abbc2fd98e5bb23c5262cff16321ba72b3e SHA256 9d53ab9656ffa2cdb8388424cc02143b0bfb8e68a9cea00335a658d41de95be4
-EBUILD kdevelop-3.9.97.ebuild 1842 RMD160 b5397c184ae73d8338399fc3d817ae46f3899b86 SHA1 14d1c67584a8650b7a2e322968507d373c121893 SHA256 34c11863e91ff285e5374921aee22874d0c1a506294bba297634d21b56182f37
-EBUILD kdevelop-9999.ebuild 1688 RMD160 cd23e67540a36c1d98cf86cf559548ce37fd88ca SHA1 14d78f75a34f17dc68c63b50043a35f7b67a1dd1 SHA256 452649aa12546bade4810234e89ba82c42a8010a45501e996cc79fd3c0a720a3
+EBUILD kdevelop-9999.ebuild 1946 RMD160 2bdb1e620666ef463dcdb3a6ae4268cad2c21097 SHA1 98ca48963aa66eedde09d1a590ccfd68029371b6 SHA256 55dca284169988265219c6b7f028219b4f269216dc2dd84ad134147d35f289b3
 MISC metadata.xml 376 RMD160 93e6c292048eaf4c9a6510b167b6565f7a6ded38 SHA1 fc7c31107627f479cfedf13d0b89514e36840549 SHA256 6a5c6a78d5091e2045348ccb90057b68d3b6a25a17972779c4df81264650a602
diff --git a/dev-util/kdevelop/kdevelop-3.9.97.ebuild b/dev-util/kdevelop/kdevelop-3.9.97.ebuild
deleted file mode 100644
index bf50d9e2cfe..00000000000
--- a/dev-util/kdevelop/kdevelop-3.9.97.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit kde4-base versionator
-
-KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)"
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-HOMEPAGE="http://www.kdevelop.org/"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~hppa ~x86"
-SLOT="4"
-IUSE="+cmake +cxx debug +qmake qthelp"
-
-DEPEND="
-	>=dev-util/kdevplatform-${KDEVPLATFORM_PV}
-	>=kde-base/ksysguard-${KDE_MINIMAL}
-	>=kde-base/libkworkspace-${KDE_MINIMAL}
-	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
-"
-RDEPEND="${DEPEND}
-	>=kde-base/kapptemplate-${KDE_MINIMAL}
-"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Remove this and the ksysguard dep after libprocessui moved into kdelibs
-	sed -i -e 's/${KDE4WORKSPACE_PROCESSUI_LIBS}/processui/g' \
-		debuggers/gdb/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build qmake)
-		$(cmake-utils_use_build qmake qmakebuilder)
-		$(cmake-utils_use_build qmake qmake_parser)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	rm "${D}/${PREFIX}"/share/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2
-	rm "${D}/${PREFIX}"/share/icons/hicolor/22x22/actions/output_win.png
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	echo
-	elog "For extra functionality you shuold look at following packages:"
-	elog "dev-util/valgrind          allows you to do memory leak check."
-	elog ">=sys-devel/gdb-7.0        (RECOMMENDED) required by debugger frontend."
-	echo
-}
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 0edb6d730c3..d01348e010b 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -7,8 +7,15 @@ EAPI="2"
 KMNAME="extragear/sdk"
 inherit kde4-base
 
+if [[ ${PV} == *9999* ]]; then
+	KDEVPLATFORM_PV="9999"
+else
+	inherit versionator
+	KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)"
+fi
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
 HOMEPAGE="http://www.kdevelop.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
@@ -16,7 +23,7 @@ SLOT="4"
 IUSE="+cmake +cxx debug +qmake qthelp"
 
 DEPEND="
-	>=dev-util/kdevplatform-9999
+	>=dev-util/kdevplatform-${KDEVPLATFORM_PV}
 	>=kde-base/ksysguard-${KDE_MINIMAL}
 	>=kde-base/libkworkspace-${KDE_MINIMAL}
 	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )