9 files changed, 30 insertions, 182 deletions
diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 927d7d090ace..d6d0716d6513 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.38 2003/11/17 19:05:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.39 2003/12/08 15:32:36 caleb Exp $
+
+*kdevelop-3.0.0_beta2 (08 Dec 2003)
+
+  08 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdevelop-2.1.2.ebuild,
+  kdevelop-2.1.3-r1.ebuild, kdevelop-3.0.0_beta2.ebuild,
+  kdevelop-3.0_alpha7.ebuild:
+  New beta version, remove older builds
 
   17 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdevelop-3.0.0_beta1.ebuild,
   files/kdevelop-3.0.0_beta1-compat.patch:
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index d84be4ec59b1..7fb3f8fdbb03 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,7 +1,7 @@
 MD5 61e1a8b7391d4d241d9dbc8cb54a0b80 kdevelop-3.0.0_beta1.ebuild 3037
 MD5 d5f5a5a0a6253f352123365a201f3918 kdevelop-2.1.5.ebuild 1763
-MD5 68f2cf6b9c9da5d94dc6453d5628ea06 kdevelop-3.0.0_beta2.ebuild 3038
-MD5 1c89f1bc79f35977315a6bbe81d3fffd ChangeLog 7014
+MD5 8b3ebf776d8be6d4e8e43969701dbd15 kdevelop-3.0.0_beta2.ebuild 2880
+MD5 8a725d3c2a0188168907929c74093083 ChangeLog 7249
 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
diff --git a/dev-util/kdevelop/files/digest-kdevelop-2.1.2 b/dev-util/kdevelop/files/digest-kdevelop-2.1.2
deleted file mode 100644
index 43b25d9d5f43..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-2.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b644aec61fedd8af5ef2305a09d1e2df kdevelop-2.1.2_for_KDE_3.0.tar.bz2 3384306
-MD5 cd84fd2c8c8129d19e6e2686d6bf63a5 c_cpp_reference-1.0.tar.gz 1146504
-MD5 ca365b62446d131ea0e4a631ec6e2a08 kdelibs-kdevelop-docs-3.0.1.tar.bz2 1848072
diff --git a/dev-util/kdevelop/files/digest-kdevelop-2.1.3-r1 b/dev-util/kdevelop/files/digest-kdevelop-2.1.3-r1
deleted file mode 100644
index 9668dcd73014..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-2.1.3-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 f71ad2aa07522f99ef62bc46d2e3e8bf kdevelop-2.1.3_for_KDE_3.0.tar.bz2 3403196
-MD5 cd84fd2c8c8129d19e6e2686d6bf63a5 c_cpp_reference-1.0.tar.gz 1146504
-MD5 ca365b62446d131ea0e4a631ec6e2a08 kdelibs-kdevelop-docs-3.0.1.tar.bz2 1848072
-MD5 a15d1f21ea2af5e0dd7e325a32551dfc kdevelop-2.1.3-qt-templates.tar.gz 27385
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta2 b/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta2
new file mode 100644
index 000000000000..c12323d4f137
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.0.0_beta2
@@ -0,0 +1 @@
+MD5 9ec7e3bbe99eaa093ed5ff83b2452674 kdevelop-3.0.0b2.tar.bz2 5025376
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.0_alpha7 b/dev-util/kdevelop/files/digest-kdevelop-3.0_alpha7
deleted file mode 100644
index 516366a40fbb..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.0_alpha7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a3277ec46418a2131e8fd31d8638cd0 kdevelop-3.0.0a7.tar.bz2 4673301
diff --git a/dev-util/kdevelop/kdevelop-2.1.2.ebuild b/dev-util/kdevelop/kdevelop-2.1.2.ebuild
deleted file mode 100644
index 5a43daa69248..000000000000
--- a/dev-util/kdevelop/kdevelop-2.1.2.ebuild
+++ /dev/null
@@ -1,72 +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-2.1.2.ebuild,v 1.18 2003/03/11 21:11:45 seemant Exp $
-
-inherit kde-base
-need-kde 3
-
-S=${WORKDIR}/${P}_for_KDE_3.0
-DESCRIPTION="KDevelop ${PV}"
-HOMEPAGE="http://www.kdevelop.org/"
-SRC_PATH="kde/stable/3.0.2/src/${P}_for_KDE_3.0.tar.bz2"
-SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
-	ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH
-	ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH
-	mirror://gentoo/c_cpp_reference-1.0.tar.gz
-	mirror://gentoo/kdelibs-kdevelop-docs-3.0.1.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-DEPEND="$DEPEND
-	sys-devel/flex
-	dev-lang/perl"
-
-newdepend ">=kde-base/kdebase-3
-	>=dev-util/kdoc-2.0_alpha24
-	>=dev-util/kdbg-1.2.5.3
-	>=net-www/htdig-3.1.6
-	>=app-text/enscript-1.6.1
-	>=app-text/a2ps-4.13b
-	>=dev-util/ctags-5.0.1
-	>=app-text/sgmltools-lite-3.0.3
-	>=app-doc/qt-docs-${QTVER}"
-
-# -j2 and greater fails - see bug #6199
-export MAKEOPTS="$MAKEOPTS -j1"
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S}/kdevelop
-	for x in *.desktop; do
-		mv $x $x.2
-		sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
-		rm $x.2
-	done
-}
-
-src_install() {
-	kde_src_install
-
-	# setup htdig for use with kdevelop out-of-the-box (sort of)
-	sed -e "s:_KDEDIR_:${PREFIX}:g" \
-		${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
-	dodir ${PREFIX}/share/apps/kdevelop/htdig/db
-
-	# kdelibs documentation - pregenerated so we don't need kdelibs sources etc
-	cp -r ${WORKDIR}/KDE-Documentation ${D}/${PREFIX}/share/apps/kdevelop/
-
-	# c/cpp reference package
-	dodir ${PREFIX}/share/doc/HTML/en/kdevelop/reference
-	cp -r ${WORKDIR}/c_cpp_reference-1.0/reference/{C,CPLUSPLUS,GRAPHICS} ${D}/${PREFIX}/share/doc/HTML/en/kdevelop/reference/
-}
-
-pkg_postinst() {
-	einfo "Don't run the kdevelop setup! It will try to generate the kdelibs documentation,"
-	einfo "but a pregenerated package of it has been installed with this ebuild."
-	einfo "Instead, run kdevelop, go to Options->Kdevelop Setup, Documentation tab, and change"
-	einfo "the value of KDE-Libraries-Doc to $PREFIX/share/apps/kdevelop/KDE-Documentation/ ."
-	einfo
-	einfo "Oh, and if you think of a nice way to automate this from the ebuild, pray tell"
-	einfo "(but test first!) :-)"
-}
diff --git a/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild b/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild
deleted file mode 100644
index 8d8630c5570a..000000000000
--- a/dev-util/kdevelop/kdevelop-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,77 +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-2.1.3-r1.ebuild,v 1.9 2003/03/11 21:11:45 seemant Exp $
-
-inherit kde-base
-need-kde 3
-
-S=${WORKDIR}/${P}_for_KDE_3.0
-DESCRIPTION="KDevelop ${PV}"
-HOMEPAGE="http://www.kdevelop.org/"
-SRC_PATH="kde/stable/3.0.3/src/${P}_for_KDE_3.0.tar.bz2"
-SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
-	ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH
-	ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH
-	mirror://gentoo/c_cpp_reference-1.0.tar.gz
-	mirror://gentoo/kdelibs-kdevelop-docs-3.0.1.tar.bz2
-	mirror://gentoo/$P-qt-templates.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND="$DEPEND
-	sys-devel/flex
-	dev-lang/perl"
-
-newdepend ">=kde-base/kdebase-3
-	>=dev-util/kdoc-2.0_alpha24
-	>=dev-util/kdbg-1.2.5.3
-	>=net-www/htdig-3.1.6
-	>=app-text/enscript-1.6.1
-	>=app-text/a2ps-4.13b
-	>=dev-util/ctags-5.0.1
-	>=app-text/sgmltools-lite-3.0.3
-	>=app-doc/qt-docs-${QTVER}"
-
-# -j2 and greater fails - see bug #6199
-export MAKEOPTS="$MAKEOPTS -j1"
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S}/kdevelop
-	for x in *.desktop; do
-		mv $x $x.2
-		sed -e 's:Exec=kdevelop:Exec=env WANT_AUTOMAKE_1_4=1 WANT_AUTOCONF_2_5=1 kdevelop:g' $x.2 > $x
-		rm $x.2
-	done
-
-	# new qt project templates, fix #5839
-	cd $WORKDIR
-	mv q*.tar.gz $S/kdevelop/templates/
-}
-
-src_install() {
-	kde_src_install
-
-	# setup htdig for use with kdevelop out-of-the-box (sort of)
-	sed -e "s:_KDEDIR_:${PREFIX}:g" \
-		${FILESDIR}/htdig.conf > ${D}/${PREFIX}/share/apps/kdevelop/tools/htdig.conf
-	dodir ${PREFIX}/share/apps/kdevelop/htdig/db
-
-	# kdelibs documentation - pregenerated so we don't need kdelibs sources etc
-	cp -r ${WORKDIR}/KDE-Documentation ${D}/${PREFIX}/share/apps/kdevelop/
-
-	# c/cpp reference package
-	dodir ${PREFIX}/share/doc/HTML/en/kdevelop/reference
-	cp -r ${WORKDIR}/c_cpp_reference-1.0/reference/{C,CPLUSPLUS,GRAPHICS} ${D}/${PREFIX}/share/doc/HTML/en/kdevelop/reference/
-}
-
-pkg_postinst() {
-	einfo "Don't run the kdevelop setup! It will try to generate the kdelibs documentation,"
-	einfo "but a pregenerated package of it has been installed with this ebuild."
-	einfo "Instead, run kdevelop, go to Options->Kdevelop Setup, Documentation tab, and change"
-	einfo "the value of KDE-Libraries-Doc to $PREFIX/share/apps/kdevelop/KDE-Documentation/ ."
-	einfo
-	einfo "Oh, and if you think of a nice way to automate this from the ebuild, pray tell"
-	einfo "(but test first!) :-)"
-}
diff --git a/dev-util/kdevelop/kdevelop-3.0_alpha7.ebuild b/dev-util/kdevelop/kdevelop-3.0.0_beta2.ebuild
index bb8ea9fe081f..d23161c61daf 100644
--- a/dev-util/kdevelop/kdevelop-3.0_alpha7.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.0.0_beta2.ebuild
@@ -1,15 +1,15 @@
 # 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_alpha7.ebuild,v 1.1 2003/09/26 03:20:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.0.0_beta2.ebuild,v 1.1 2003/12/08 15:32:36 caleb Exp $
 
-inherit kde-base
+inherit kde
 need-kde 3
 
-IUSE="doc java python"
-MY_P="kdevelop-3.0.0a7"
+IUSE="doc java python ruby"
+MY_P="kdevelop-3.0.0b2"
 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.92/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://kde/unstable/3.1.94/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.kdevelop.org"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc"
@@ -17,26 +17,25 @@ SLOT=3
 # -j2 and greater fails - see bug #6199
 export MAKEOPTS="$MAKEOPTS -j1"
 
-newdepend ">=dev-lang/perl-5.0.4
+newdepend "dev-lang/perl
 	sys-devel/flex
 	app-text/sgmltools-lite
-	doc? ( app-doc/qt-docs )
-	doc? ( app-doc/kdelibs-apidocs )
 	sys-devel/gdb
-	java? ( virtual/jdk )
-	python? ( dev-lang/python )"
+	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
+
+use java && myconf="$myconf --enable-javasupport --with-java=`java-config --jdk-home`" || myconf="$myconf --disable-javasupport"
+use python && myconf="$myconf --enable-scripting --with-pythondir=/usr/lib/python2.2" || myconf="$myconf --disable-scripting"
+use ruby || myconf="$myconf --disable-ruby"
+
+src_unpack()
+{
+	kde_src_unpack
+#	epatch ${FILESDIR}/${P}-compat.patch
+}
 
 pkg_postinst() {
 
@@ -52,10 +51,8 @@ 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"