new version

9 files changed, 14 insertions, 104 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index e984bcadc4bd..58d6993b8227 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,14 +1,9 @@
-MD5 61e1a8b7391d4d241d9dbc8cb54a0b80 kdevelop-3.0.0_beta1.ebuild 3037
-MD5 1a2aedb78f9ef02ee2de85a3d9480858 kdevelop-3.0.0_rc1.ebuild 2822
-MD5 0524591ec25ebeb62efa72eb5165c5be kdevelop-2.1.5.ebuild 1752
-MD5 e2b0e547a1367705af200cbebd224b07 kdevelop-3.0.0_beta2.ebuild 2960
-MD5 eec8f7fc20efcfa8822416c01d18df56 ChangeLog 7369
+MD5 2d527a545ce480f351bbed65fd126ec6 kdevelop-3.0.0_rc1.ebuild 2911
+MD5 b967d2f55eef251bf2e542ab5016142c kdevelop-2.1.5.ebuild 1752
+MD5 76761a5e37731934aa33f262d65ba658 ChangeLog 7711
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 9bacd530b8e15f85ea1610a106fa9829 files/digest-kdevelop-3.0.0_beta1 70
-MD5 665f29214568862e2f77aadd007ed80f files/digest-kdevelop-3.0.0_beta2 70
-MD5 4744796501d8e6a5b4f31978482a8a5a files/kdevelop-3.0.0_beta1-compat.patch 372
 MD5 5844083f843db38cd01fa7a77d677e51 files/digest-kdevelop-2.1.5 245
 MD5 04f506126fcc3a76e72f9c5adba3a2f5 files/kdevelop-2.1.5-gentoo.diff 4198
-MD5 94d687e3f472dfba1723a04974f36556 files/kdevelop-3.0.0_beta2-mainwindow.patch 385
+MD5 94d687e3f472dfba1723a04974f36556 files/kdevelop-3.0.0_rc1-mainwindow.patch 385
 MD5 538685470538a387467a1651ca9c72e0 files/digest-kdevelop-3.0.0_rc1 70
 MD5 5dbe87ca31912cf4eeba60fb16082225 files/htdig.conf 8248
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta1 b/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta1
deleted file mode 100644
index aeb7908685dc..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be6aa5a268fd7024b6a447c28f83279d kdevelop-3.0.0b1.tar.bz2 4965439
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta2 b/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta2
deleted file mode 100644
index c12323d4f137..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ec7e3bbe99eaa093ed5ff83b2452674 kdevelop-3.0.0b2.tar.bz2 5025376
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.0.0_rc1 b/dev-util/kdevelop/files/digest-kdevelop-3.0.0_rc1
new file mode 100644
index 000000000000..d103bdc11f4f
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.0.0_rc1
@@ -0,0 +1 @@
+MD5 c3d8e6ce937499f2432cd264b962f113 kdevelop-3.0.0r1.tar.bz2 4995832
diff --git a/dev-util/kdevelop/files/kdevelop-3.0.0_beta1-compat.patch b/dev-util/kdevelop/files/kdevelop-3.0.0_beta1-compat.patch
deleted file mode 100644
index 2dedc6da4ca6..000000000000
--- a/dev-util/kdevelop/files/kdevelop-3.0.0_beta1-compat.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- parts/bookmarks/bookmarks_settings_base.ui.orig	2003-11-17 14:00:10.000000000 -0500
-+++ parts/bookmarks/bookmarks_settings_base.ui	2003-11-17 14:00:25.000000000 -0500
-@@ -1,4 +1,4 @@
--<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
- <class>BookmarkSettingsBase</class>
- <widget class="QWidget">
-     <property name="name">
diff --git a/dev-util/kdevelop/files/kdevelop-3.0.0_beta2-mainwindow.patch b/dev-util/kdevelop/files/kdevelop-3.0.0_rc1-mainwindow.patch
index 222284e24775..222284e24775 100644
--- a/dev-util/kdevelop/files/kdevelop-3.0.0_beta2-mainwindow.patch
+++ b/dev-util/kdevelop/files/kdevelop-3.0.0_rc1-mainwindow.patch
diff --git a/dev-util/kdevelop/kdevelop-2.1.5.ebuild b/dev-util/kdevelop/kdevelop-2.1.5.ebuild
index 2e8095c57ed6..90e52931149a 100644
--- a/dev-util/kdevelop/kdevelop-2.1.5.ebuild
+++ b/dev-util/kdevelop/kdevelop-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.5.ebuild,v 1.6 2003/12/28 04:00:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-2.1.5.ebuild,v 1.7 2004/01/19 14:17:06 caleb Exp $
 
 inherit kde eutils
 need-kde 3.1
diff --git a/dev-util/kdevelop/kdevelop-3.0.0_beta1.ebuild b/dev-util/kdevelop/kdevelop-3.0.0_beta1.ebuild
deleted file mode 100644
index f3ccd817e489..000000000000
--- a/dev-util/kdevelop/kdevelop-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.0.0_beta1.ebuild,v 1.4 2003/11/17 19:05:16 caleb Exp $
-
-inherit kde-base
-need-kde 3
-
-IUSE="doc java python"
-MY_P="kdevelop-3.0.0b1"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="KDevelop is an easy to use C/C++ IDE for Unix. It supports KDE/Qt, GNOME, plain C and C++ projects."
-SRC_URI="mirror://kde/unstable/3.1.93/src/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.kdevelop.org"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-SLOT=3
-# -j2 and greater fails - see bug #6199
-export MAKEOPTS="$MAKEOPTS -j1"
-
-newdepend "dev-lang/perl
-	sys-devel/flex
-	app-text/sgmltools-lite
-	sys-devel/gdb
-	java? ( virtual/jdk dev-java/ant )
-	python? ( dev-lang/python )
-	doc? ( app-doc/doxygen )"
-
-myconf="$myconf --with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs"
-if [ "`use java`" ]; then
-	myconf="$myconf --enable-javasupport --with-java=`java-config --jdk-home`"
-else
-	myconf="$myconf --disable-javasupport"
-fi
-if [ "`use python`" ]; then
-	myconf="$myconf --enable-scripting --with-pythondir=/usr/lib/python2.2"
-else
-	myconf="$myconf --disable-scripting"
-fi
-
-src_unpack()
-{
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-compat.patch
-}
-
-pkg_postinst() {
-
-einfo "kdevelop can use a wide range of apps for extra functionality. This is an almost"
-einfo "complete list. If you want subversion support, you must emerge it and then re-emerge"
-einfo "kdevelop; all other packages can be emerged after kdevelop."
-einfo
-einfo "dev-util/cvs:		provide frontend for cvs version control system"
-einfo "net-misc/x11-ssh-askpass		for use with SSH protected CVS systems"
-einfo "dev-util/subversion		ditto for subversion. However much newer version of"
-einfo "				subversion is needed than exists in portage atm"
-einfo "perforce			ditto for perforce system. No ebuild exists atm"
-einfo ">=dev-util/ctags-5		faster and more powerful code browsing logic"
-einfo "dev-util/kdoc		tools to generate KDE-style documentation for your project"
-einfo "app-misc/glimpse		index and search your project's documentation"
-einfo "app-doc/doxygen		ditto. doxygen has a more free license than glimpse iirc"
-einfo "net-www/htdig		ditto. yet another supoprted indexing/searching backend"
-einfo "dev-util/kdbg		kde frontend to gdb"
-einfo "dev-java/ant			supports projects for this java development environment"
-einfo "app-arch/rpm			supports creating RPMs of your project"
-einfo "kde-base/kdebase		embed konsole kpart in kdevelop ide"
-einfo "kde-base/kdesdk		use kompare widget for showing the output of diff"
-einfo "dev-util/valgrind		integrates valgrind (memory debugger) commands"
-einfo "app-emulation/		create and run projects for this gameboy"
-einfo "	visualboyadvance	/gameboy color/gameboy advance emulator"
-einfo
-einfo "Support for GNU-style make, tmake, qmake and probably jam and other systems is included."
-einfo "There is also php, fortran, ruby, java etc. support - use your favourite package, I suppose."
-
-}
diff --git a/dev-util/kdevelop/kdevelop-3.0.0_beta2.ebuild b/dev-util/kdevelop/kdevelop-3.0.0_rc1.ebuild
index da8139f28bd6..629c4cc97a35 100644
--- a/dev-util/kdevelop/kdevelop-3.0.0_beta2.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.0.0_rc1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.0.0_beta2.ebuild,v 1.5 2003/12/28 04:00:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.0.0_rc1.ebuild,v 1.1 2004/01/19 14:17:06 caleb Exp $
 
 inherit distutils kde
-need-kde 3
 
 IUSE="doc java python ruby"
-MY_P="kdevelop-3.0.0b2"
+MY_P="kdevelop-3.0.0r1"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="KDevelop is an easy to use C/C++ IDE for Unix. It supports KDE/Qt, GNOME, plain C and C++ projects."
-SRC_URI="mirror://kde/unstable/3.1.94/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://kde/unstable/3.1.95/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.kdevelop.org"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc"
 SLOT=3
 # -j2 and greater fails - see bug #6199
-export MAKEOPTS="$MAKEOPTS -j1"
+# export MAKEOPTS="$MAKEOPTS -j1"
 
-DEPEND="dev-lang/perl
+DEPEND=">=kde-base/kdebase-3.1.0
+	dev-lang/perl
 	sys-devel/flex
-	app-text/sgmltools-lite
 	sys-devel/gdb
 	java? ( virtual/jdk dev-java/ant )
 	python? ( dev-lang/python )
@@ -36,7 +35,6 @@ use ruby || myconf="$myconf --disable-ruby"
 src_unpack()
 {
 	kde_src_unpack
-#	epatch ${FILESDIR}/${P}-compat.patch
 	epatch ${FILESDIR}/${P}-mainwindow.patch
 }