Fix KDE dependencies to use =cat/foo-3.5* so it cannot pull in KDE 4.x (bug #206528). Make sure kdesdk get compiled with USE=subversion when necessary (bug #208726). Put splits packages first in the dependency order (bug #207415).

(Portage version: 2.1.4.1)

3 files changed, 73 insertions, 42 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 127bc4afe842..63139a39a12a 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.157 2008/01/06 23:08:14 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.158 2008/02/03 14:26:38 zlin Exp $
+
+  03 Feb 2008; Bo Ørsted Andresen <zlin@gentoo.org> kdevelop-3.4.1.ebuild,
+  kdevelop-3.5.0.ebuild:
+  Fix KDE dependencies to use =cat/foo-3.5* so it cannot pull in KDE 4.x (bug
+  #206528). Make sure kdesdk get compiled with USE=subversion when necessary
+  (bug #208726). Put splits packages first in the dependency order
+  (bug #207415).
 
   06 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
   kdevelop-3.5.0.ebuild:
diff --git a/dev-util/kdevelop/kdevelop-3.4.1.ebuild b/dev-util/kdevelop/kdevelop-3.4.1.ebuild
index 0097eedad33b..c417c9886cff 100644
--- a/dev-util/kdevelop/kdevelop-3.4.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild,v 1.10 2007/08/28 20:41:13 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild,v 1.11 2008/02/03 14:26:38 zlin Exp $
 
 inherit kde eutils db-use
 
@@ -16,10 +16,12 @@ IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python rub
 
 DEPEND="sys-devel/gdb
 	>=sys-libs/db-4.1
-	cvs? ( || ( kde-base/cervisia kde-base/kdesdk ) )"
+	cvs? ( || ( =kde-base/cervisia-3.5*
+		=kde-base/kdesdk-3.5* ) )"
 
 RDEPEND="${DEPEND}
-	subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )"
+	subversion? ( || ( =kde-base/kdesdk-kioslaves-3.5*
+		=kde-base/kdesdk-3.5* ) )"
 DEPEND="${DEPEND}
 	>=sys-devel/flex-2.5.33"
 
@@ -29,12 +31,22 @@ PATCHES="${FILESDIR}/kdevelop-3.4.1-hang-fix.diff"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if use subversion && \
+		has_version =kde-base/kdesdk-3.5* && \
+		! built_with_use =kde-base/kdesdk-3.5* subversion; then
+		eerror "To build this package with USE=subversion"
+		eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too."
+		die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion."
+	fi
+}
+
 src_unpack() {
 	kde_src_unpack
 
 	# Update the admin dir used in KDE template projects.
 	# See also kde bug 104386.
-	for i in ${S}/admin/*; do
+	for i in "${S}"/admin/*; do
 		cp "${i}" "${S}/parts/appwizard/common/admin/"
 	done
 
@@ -69,29 +81,29 @@ src_install() {
 
 	# Default to exuberant-ctags so that we don't end up trying to run emacs's
 	# ctags.
-	cat - >> "${D}/usr/share/config/kdeveloprc" <<EOF
+	cat <<-EOF >> "${D}/usr/share/config/kdeveloprc"
 
-[CTAGS]
-ctags binary=/usr/bin/exuberant-ctags
+	[CTAGS]
+	ctags binary=/usr/bin/exuberant-ctags
 
-EOF
+	EOF
 }
 
 pkg_postinst() {
 	elog "kdevelop can use a wide range of apps for extra functionality. This is an"
 	elog "almost complete list. All these packages can be emerged after kdevelop."
 	elog
-	elog "kde-base/konsole:		  (RECOMMENDED) embed konsole kpart in kdevelop ide"
-	elog "OR kde-base/kdebase:	  (RECOMMENDED) embed konsole kpart in kdevelop ide"
-	elog "dev-util/kdbg:		  (RECOMMENDED) kde frontend to gdb"
-	elog "dev-util/valgrind:	  (RECOMMENDED) integrates valgrind (memory debugger) commands"
-	elog "kde-base/kompare:		  (RECOMMENDED) show differences between files"
-	elog "media-gfx/graphviz:	  (RECOMMENDED) support the new graphical classbrowser"
-	elog "dev-java/ant:			  support projects using the ant build tool"
-	elog "dev-util/ctags:		  faster and more powerful code browsing logic"
-	elog "app-doc/doxygen:		  generate KDE-style documentation for your project"
-	elog "www-misc/htdig:		  index and search your project's documentation"
-	elog "app-arch/rpm:			  support creating RPMs of your project"
+	elog "=kde-base/konsole-3.5*:    (RECOMMENDED) embed konsole kpart in kdevelop ide"
+	elog "OR =kde-base/kdebase-3.5*: (RECOMMENDED) embed konsole kpart in kdevelop ide"
+	elog "dev-util/kdbg:             (RECOMMENDED) kde frontend to gdb"
+	elog "dev-util/valgrind:         (RECOMMENDED) integrates valgrind (memory debugger) commands"
+	elog "=kde-base/kompare-3.5*:    (RECOMMENDED) show differences between files"
+	elog "media-gfx/graphviz:        (RECOMMENDED) support the new graphical classbrowser"
+	elog "dev-java/ant:              support projects using the ant build tool"
+	elog "dev-util/ctags:            faster and more powerful code browsing logic"
+	elog "app-doc/doxygen:           generate KDE-style documentation for your project"
+	elog "www-misc/htdig:            index and search your project's documentation"
+	elog "app-arch/rpm:              support creating RPMs of your project"
 	elog "app-emulation/visualboyadvance: create and run projects for this gameboy"
 	elog
 	elog "Support for GNU-style make, tmake, qmake is included."
diff --git a/dev-util/kdevelop/kdevelop-3.5.0.ebuild b/dev-util/kdevelop/kdevelop-3.5.0.ebuild
index d357945390a6..b68326d5c019 100644
--- a/dev-util/kdevelop/kdevelop-3.5.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild,v 1.6 2008/01/06 23:08:14 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild,v 1.7 2008/02/03 14:26:38 zlin Exp $
 
 inherit kde eutils db-use
 
@@ -15,24 +15,36 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion"
 
 DEPEND="sys-devel/gdb
-		>=sys-libs/db-4.1
-		cvs? ( || ( kde-base/kdesdk kde-base/cervisia ) )"
+	>=sys-libs/db-4.1
+	cvs? ( || ( =kde-base/cervisia-3.5*
+		=kde-base/kdesdk-3.5* ) )"
 
 RDEPEND="${DEPEND}
-		subversion? ( || ( kde-base/kdesdk kde-base/kdesdk-kioslaves ) )"
+	subversion? ( || ( =kde-base/kdesdk-kioslaves-3.5*
+		=kde-base/kdesdk-3.5* ) )"
 DEPEND="${DEPEND}
-		>=sys-devel/flex-2.5.33"
+	>=sys-devel/flex-2.5.33"
 
 need-kde 3.5
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+pkg_setup() {
+	if use subversion && \
+		has_version =kde-base/kdesdk-3.5* && \
+		! built_with_use =kde-base/kdesdk-3.5* subversion; then
+		eerror "To build this package with USE=subversion"
+		eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too."
+		die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion."
+	fi
+}
+
 src_unpack() {
 	kde_src_unpack
 
 	# Update the admin dir used in KDE template projects.
 	# See also kde bug 104386.
-	for i in "${S}"/admin/* ; do
+	for i in "${S}"/admin/*; do
 		cp "${i}" "${S}/parts/appwizard/common/admin/"
 	done
 
@@ -70,29 +82,29 @@ src_install() {
 
 	# Default to exuberant-ctags so that we don't end up trying to run emacs's
 	# ctags.
-	cat - >> "${D}/usr/share/config/kdeveloprc" <<EOF
+	cat <<-EOF >> "${D}/usr/share/config/kdeveloprc"
 
-[CTAGS]
-ctags binary=/usr/bin/exuberant-ctags
+	[CTAGS]
+	ctags binary=/usr/bin/exuberant-ctags
 
-EOF
+	EOF
 }
 
 pkg_postinst() {
 	elog "kdevelop can use a wide range of apps for extra functionality. This is an"
 	elog "almost complete list. All these packages can be emerged after kdevelop."
 	elog
-	elog "kde-base/konsole:		  (RECOMMENDED) embed konsole kpart in kdevelop ide"
-	elog "OR kde-base/kdebase:	  (RECOMMENDED) embed konsole kpart in kdevelop ide"
-	elog "dev-util/kdbg:		  (RECOMMENDED) kde frontend to gdb"
-	elog "dev-util/valgrind:	  (RECOMMENDED) integrates valgrind (memory debugger) commands"
-	elog "kde-base/kompare:		  (RECOMMENDED) show differences between files"
-	elog "media-gfx/graphviz:	  (RECOMMENDED) support the new graphical classbrowser"
-	elog "dev-java/ant:			  support projects using the ant build tool"
-	elog "dev-util/ctags:		  faster and more powerful code browsing logic"
-	elog "app-doc/doxygen:		  generate KDE-style documentation for your project"
-	elog "www-misc/htdig:		  index and search your project's documentation"
-	elog "app-arch/rpm:			  support creating RPMs of your project"
+	elog "=kde-base/konsole-3.5*:    (RECOMMENDED) embed konsole kpart in kdevelop ide"
+	elog "OR =kde-base/kdebase-3.5*: (RECOMMENDED) embed konsole kpart in kdevelop ide"
+	elog "dev-util/kdbg:             (RECOMMENDED) kde frontend to gdb"
+	elog "dev-util/valgrind:         (RECOMMENDED) integrates valgrind (memory debugger) commands"
+	elog "=kde-base/kompare-3.5*:    (RECOMMENDED) show differences between files"
+	elog "media-gfx/graphviz:        (RECOMMENDED) support the new graphical classbrowser"
+	elog "dev-java/ant:              support projects using the ant build tool"
+	elog "dev-util/ctags:            faster and more powerful code browsing logic"
+	elog "app-doc/doxygen:           generate KDE-style documentation for your project"
+	elog "www-misc/htdig:            index and search your project's documentation"
+	elog "app-arch/rpm:              support creating RPMs of your project"
 	elog "app-emulation/visualboyadvance: create and run projects for this gameboy"
 	elog
 	elog "Support for GNU-style make, tmake, qmake is included."