Version bump. Drop older.

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

3 files changed, 35 insertions, 28 deletions

diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog
index 4d9e9c042f44..8366db7f88d8 100644
--- a/dev-util/kdevplatform/ChangeLog
+++ b/dev-util/kdevplatform/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/kdevplatform
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.15 2009/12/10 18:25:05 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/ChangeLog,v 1.16 2009/12/28 12:33:07 scarabeus Exp $
+
+*kdevplatform-0.9.97 (28 Dec 2009)
+
+  28 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdevplatform-0.9.96.ebuild, +kdevplatform-0.9.97.ebuild:
+  Version bump. Drop older.
 
   10 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
   kdevplatform-0.9.95.ebuild:
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index f2912a704fff..6f692a89fb74 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdevplatform-0.9.95.tar.bz2 1057385 RMD160 837b0c288084e8e4566e36e260e117042fa434b4 SHA1 d3a235a7c4a6a216a74a9c0dedeb9bd195b79432 SHA256 3149fcd763f74ad6b9956864615d486db28253fc8a47c4868593ee0bc9604c06
-DIST kdevplatform-0.9.96.tar.bz2 1017341 RMD160 1f1ea10eecd77a65b504139f503ef99ec57a76ab SHA1 9f453db5e7b376233ffd0415e3e9c295af11010a SHA256 a00e5140e7960b594eb035423b09b5037d090b8f42eccc27da93af9824b66d6e
+DIST kdevplatform-0.9.97.tar.bz2 1008807 RMD160 033ff8cb652dba64c61d5317cfb2f28e132ef038 SHA1 93819d3b0201e2648035b5e137aaaf40ef65b8fe SHA256 c378900c6d96014fd48e4939883f2e2c4a29b8fadc5ea22bdf64216720d36401
 EBUILD kdevplatform-0.9.95.ebuild 1229 RMD160 e16bab5247321cbdeeb490709b0cb07b0db599e1 SHA1 7b46d6d3398fbb19b76bc8095297504f1db3d7bf SHA256 767251025e3aaf91357cc7e3f297b3124f77e10c6c7ab5958fecfea8cbfd0d5c
-EBUILD kdevplatform-0.9.96.ebuild 1378 RMD160 08b8a2fc9daac19db52f8c83996660958309284a SHA1 5c3a528d635ef140a963f0150d6958007ee6e73e SHA256 3073106a71f01823dac6cd78331b18995efe742883a18c4f1c8c50e71fedf490
-MISC ChangeLog 2141 RMD160 1237eeeab6387eb3629053722cf116a3bbae45b2 SHA1 e6c57ac3f609f9615542f784425b86c254237e91 SHA256 0e810f2ef0664bbec8041cc48bee705045c0aa6f4e95f84187a721d0b5160740
+EBUILD kdevplatform-0.9.97.ebuild 1618 RMD160 198e5e09c5e1baea48ff3ee48e81eaac11b878d1 SHA1 9ea5dc01e061f35ca44f676fdef0bce7ff731521 SHA256 73ab44c6ffb650e4c566847745b86cbca7037064a8a1b6c8b906b16e467104b8
+MISC ChangeLog 2325 RMD160 13e865cc98234e468ed6d9dcbbaa09a12aaaccac SHA1 cbad96ef57136d5252d1ff4a4c05acacb0834add SHA256 edaee73ad6325de5020c50b302b9384d1c1f7a9714fda158cfaecd61141810ec
 MISC metadata.xml 277 RMD160 2df3f37e1550394d65f3917609b796d64b7154d9 SHA1 41488b2074e66849c5f7845931590c03637c94a3 SHA256 f38c49db36b718a992a1040c791dd61561bbef2554df01bc0e785c25cc21e1f4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkshPQcACgkQNQqtfCuFneMIJACfTjaUQEgrPUturrExm61kHoqx
-4fwAnA+FFUxLT+m7g3UOEjUhviKzKhaq
-=g0fb
------END PGP SIGNATURE-----
diff --git a/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild b/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild
index 262842127fc6..2f7924d91075 100644
--- a/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild
@@ -1,15 +1,21 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-0.9.96.ebuild,v 1.3 2009/11/22 04:51:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild,v 1.1 2009/12/28 12:33:07 scarabeus Exp $
 
 EAPI="2"
 
-inherit kde4-base versionator
+KMNAME="extragear/sdk"
+inherit kde4-base
 
-KDEVELOP_PV="$(($(get_major_version)+3)).$(get_after_major_version)"
+if [[ ${PV} == *9999* ]]; then
+	KDEVELOP_PV="9999"
+else
+	inherit versionator
+	KDEVELOP_PV="$(($(get_major_version)+3)).$(get_after_major_version)"
+fi
 DESCRIPTION="KDE development support libraries and apps"
 HOMEPAGE="http://www.kdevelop.org/"
-SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
@@ -19,33 +25,38 @@ SLOT="4"
 IUSE="cvs debug mercurial subversion"
 
 DEPEND="
-	>=dev-libs/boost-1.35.0
+	dev-libs/boost
 	subversion? ( >=dev-util/subversion-1.3 )
 "
 # Moved to playground for now
 # bazaar? ( dev-util/bzr )
 # git? ( dev-util/git )
+# block - some plugins moved to kdevplatform from kdevelop
 RDEPEND="${DEPEND}
+	!<dev-util/kdevelop-${KDEVELOP_PV}
 	cvs? ( dev-util/cvs )
 	mercurial? ( dev-util/mercurial )
-	!<dev-util/kdevelop-3.9.96:4
 "
 
+src_prepare() {
+	kde4-base_src_prepare
+
+	# FindKDevPlatform.cmake is installed by kdelibs
+	sed -i \
+		-e '/^add_subdirectory(modules)/s/^/#DONOTINSTALL/' \
+		cmake/CMakeLists.txt || die
+}
+
 # Moved to playground for now
 # $(cmake-utils_use_build bazaar)
 # $(cmake-utils_use_build git)
 src_configure() {
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs=(
 		$(cmake-utils_use_build cvs)
 		$(cmake-utils_use_build mercurial)
 		$(cmake-utils_use_build subversion)
-		$(cmake-utils_use_with subversion SubversionLibrary)"
+		$(cmake-utils_use_with subversion SubversionLibrary)
+	)
 
 	kde4-base_src_configure
 }
-
-src_install() {
-	kde4-base_src_install
-
-	rm "${D}/${PREFIX}"/share/apps/cmake/modules/FindKDevPlatform.cmake
-}