Version bump. Drop old.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 34 insertions, 83 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index f00d3238b39f..5ae1fce7305f 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.188 2009/11/12 15:57:56 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.189 2009/12/28 12:38:34 scarabeus Exp $
+
+*kdevelop-3.9.97 (28 Dec 2009)
+
+  28 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdevelop-3.9.95.ebuild, -kdevelop-3.9.96.ebuild, +kdevelop-3.9.97.ebuild,
+  metadata.xml:
+  Version bump. Drop old.
 
 *kdevelop-3.9.96 (12 Nov 2009)
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index e0212dfb91b0..fbc9bc17b6c5 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,6 +1,4 @@
-DIST kdevelop-3.9.95.tar.bz2 2568351 RMD160 ab6544374b578bf52d78c9dfefe0d8539f8b57bb SHA1 232509c76cbb4ec13747a238911455cfd0408d46 SHA256 cca5558fe817c0efb3aac4ed9d4bdcd31b09ffdec4bae242d553820c0fd207f3
-DIST kdevelop-3.9.96.tar.bz2 2412895 RMD160 a171473b3f4df517ea7a37879bc97b6d35e7e32a SHA1 ab0882fa204659154fd4825fe9e61680423cf954 SHA256 c11c83b197b6504b6b782240eceb496f3f4798e0c0a5ce113857bdd436f43389
-EBUILD kdevelop-3.9.95.ebuild 1882 RMD160 479c9052ce92edd093ef45540d67d910284bb2e0 SHA1 736a7c25879778af0ff47f1fe7e44ddff6c048ca SHA256 3b7e8f95628a5309f522d314ecb4d1616b5754078e40ffe1c3c5763950b8983a
-EBUILD kdevelop-3.9.96.ebuild 1904 RMD160 4bf892bfc228773d20ff86cb20d03a98b202e676 SHA1 d8edf5f281d487933dcda24a32e7cb8b39a8f253 SHA256 664085cf4fd9f4bc8c9c98af5bf02c2a7307b355852958a475893b19e56e1d17
-MISC ChangeLog 28864 RMD160 252442c4373e0085f2411ed6f9421ec3da27ce91 SHA1 ea596ef7843de8a799f985009db6beff2c857842 SHA256 9720a5feb8f534d9f271bade9b56539d02fe41f8b02e8ec98e1af180eeb01d4b
-MISC metadata.xml 307 RMD160 1be64f9ad7ea0e6deee8e993086ce49d101fcc59 SHA1 59397923300b900da6d4c0270d4a6e12f7e20b3f SHA256 ff78e2ea359a00921dc5ce9bd6d358a6267076bbff9fd947736cadbb5bfcab3e
+DIST kdevelop-3.9.97.tar.bz2 2415397 RMD160 88c1d655fb3e54235dfa3a3d9de8f53183cd1913 SHA1 79141abbc2fd98e5bb23c5262cff16321ba72b3e SHA256 9d53ab9656ffa2cdb8388424cc02143b0bfb8e68a9cea00335a658d41de95be4
+EBUILD kdevelop-3.9.97.ebuild 2068 RMD160 7e108e60a3173db46f754cee64389bff418e9afe SHA1 1600cef99a9d30554d3c0ee38c614236b4d3d396 SHA256 aeb2ef49213405f1db8f5e29842f6a875091d401dfcdb344f2f4caa334a7d22b
+MISC ChangeLog 29073 RMD160 ba5480b18f460a1f610b3ac00a683493f00345f1 SHA1 75710e4c97ad57a2383ae49c02e88c4a729750ad SHA256 ec73a9847f6eb8693c91db80c9ecf8fa2e1177a43f5594cb5ac10631937be359
+MISC metadata.xml 376 RMD160 93e6c292048eaf4c9a6510b167b6565f7a6ded38 SHA1 fc7c31107627f479cfedf13d0b89514e36840549 SHA256 6a5c6a78d5091e2045348ccb90057b68d3b6a25a17972779c4df81264650a602
diff --git a/dev-util/kdevelop/kdevelop-3.9.95.ebuild b/dev-util/kdevelop/kdevelop-3.9.95.ebuild
deleted file mode 100644
index 3f2414f50ce4..000000000000
--- a/dev-util/kdevelop/kdevelop-3.9.95.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.9.95.ebuild,v 1.1 2009/08/29 18:48:35 tampakrap Exp $
-
-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"
-
-DEPEND="
-	>=dev-util/kdevplatform-${KDEVPLATFORM_PV}
-	>=kde-base/ksysguard-${KDE_MINIMAL}
-	>=kde-base/libkworkspace-${KDE_MINIMAL}
-	>=x11-libs/qt-assistant-4.4:4
-"
-RDEPEND="${DEPEND}
-	>=kde-base/kapptemplate-${KDE_MINIMAL}
-"
-
-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="${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)"
-
-	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-6.8.50     (RECOMMENDED) required by debugger frontend."
-	echo
-}
diff --git a/dev-util/kdevelop/kdevelop-3.9.96.ebuild b/dev-util/kdevelop/kdevelop-3.9.97.ebuild
index a148cbb7e99c..d82f53fa5b6a 100644
--- a/dev-util/kdevelop/kdevelop-3.9.96.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.9.97.ebuild
@@ -1,26 +1,32 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.9.96.ebuild,v 1.1 2009/11/12 15:57:56 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.9.97.ebuild,v 1.1 2009/12/28 12:38:34 scarabeus Exp $
 
 EAPI="2"
 
-inherit kde4-base versionator
+KMNAME="extragear/sdk"
+inherit kde4-base
 
-KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)"
+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/"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+[[ ${PV} != *9999* ]] && 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"
+IUSE="+cmake +cxx debug +qmake qthelp"
 
 DEPEND="
 	>=dev-util/kdevplatform-${KDEVPLATFORM_PV}
 	>=kde-base/ksysguard-${KDE_MINIMAL}
 	>=kde-base/libkworkspace-${KDE_MINIMAL}
-	>=x11-libs/qt-assistant-4.4:4
+	qthelp? ( >=x11-libs/qt-assistant-4.4:4 )
 "
 RDEPEND="${DEPEND}
 	>=kde-base/kapptemplate-${KDE_MINIMAL}
@@ -36,13 +42,15 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
+	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 cxx cpp)
+		$(cmake-utils_use_build qthelp)
+	)
 
 	kde4-base_src_configure
 }
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 9a1fc8af6b4d..a534cc9a8865 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <use>
-    <flag name="cmake">Support for the CMake Build System.</flag>
-    <flag name="qmake">Support for the QMake Build System.</flag>
-  </use>
+<herd>kde</herd>
+<use>
+	<flag name="cmake">Enable support for CMAKE build system</flag>
+	<flag name="qmake">Enable support for Qmake build system</flag>
+	<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
+</use>
 </pkgmetadata>