version bump

9 files changed, 24 insertions, 207 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 4d647ec95e29..7bb7b9593ecf 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.60 2004/07/24 21:52:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.61 2004/08/10 20:46:24 carlo Exp $
+
+*kdevelop-3.1.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/kdevelop-2.1.5-gentoo.diff, -files/kdevelop-3.1_beta2-mutex.h.diff,
+  -kdevelop-2.1.5.ebuild, +kdevelop-3.1.0_rc2.ebuild,
+  -kdevelop-3.1_beta2.ebuild:
+  version bump, removed kdevelop-2.x
 
   24 Jul 2004; Carsten Lohrke <carlo@gentoo.org>
   +files/kdevelop-3.1_beta2-mutex.h.diff, kdevelop-3.1_beta2.ebuild:
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index f15ff6936dbc..c244558dfa7b 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,12 +1,8 @@
-MD5 d9b6820dff9f5513f533b39f5ca54878 kdevelop-3.1_beta2.ebuild 2777
-MD5 ca4cd8dcf6038690faaaf0ceae77b037 kdevelop-2.1.5.ebuild 2017
+MD5 f28c77538ba9ff56ac39d53016723ebd kdevelop-3.1.0_rc2.ebuild 2588
 MD5 95f96f28097682a2ef07f7298faff963 kdevelop-3.0.4.ebuild 2572
-MD5 9bb9015ac6bdbe3513e419b93ab146f8 ChangeLog 10124
+MD5 ed2ed064725fd400578c44febf101d5e ChangeLog 10407
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 5844083f843db38cd01fa7a77d677e51 files/digest-kdevelop-2.1.5 245
+MD5 917039709890a164eca147f1e407fd2c files/digest-kdevelop-3.1.0_rc2 72
 MD5 6a803afe94792dfe48514e5559f2c1cb files/digest-kdevelop-3.0.4 68
-MD5 5508874c2fcaa48c79c78529b07aced2 files/kdevelop-2.1.5-gentoo.diff 4536
-MD5 13c22bb7e87fe94cfe176813a148d84b files/kdevelop-3.1_beta2-mutex.h.diff 656
 MD5 dcdcaf1dea68db854de8dad4df83c096 files/kdevelop-3.1_beta1-bdb-fPIC.patch 391
-MD5 34aecfc4568e3f2cc41caca08bf3ab71 files/digest-kdevelop-3.1_beta2 69
 MD5 5dbe87ca31912cf4eeba60fb16082225 files/htdig.conf 8248
diff --git a/dev-util/kdevelop/files/digest-kdevelop-2.1.5 b/dev-util/kdevelop/files/digest-kdevelop-2.1.5
deleted file mode 100644
index c69aa1a731c4..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-2.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8953caa03c22aabe6707ca494a0d4a41 kdevelop-2.1.5_for_KDE_3.1.tar.bz2 5792839
-MD5 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 1096541
-MD5 a15d1f21ea2af5e0dd7e325a32551dfc kdevelop-2.1.3-qt-templates.tar.gz 27385
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.1.0_rc2 b/dev-util/kdevelop/files/digest-kdevelop-3.1.0_rc2
new file mode 100644
index 000000000000..8f4821b59ee2
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.1.0_rc2
@@ -0,0 +1 @@
+MD5 c2b51d11ac6079f9b846655ed372a077 kdevelop-3.1.0-rc2.tar.bz2 7918562
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.1_beta2 b/dev-util/kdevelop/files/digest-kdevelop-3.1_beta2
deleted file mode 100644
index b0eae544f7f1..000000000000
--- a/dev-util/kdevelop/files/digest-kdevelop-3.1_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 097b841c2ab1f0355b056ea1a49e4da7 kdevelop-3.0.92.tar.bz2 7919450
diff --git a/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff b/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff
deleted file mode 100644
index 4c00537b74dd..000000000000
--- a/dev-util/kdevelop/files/kdevelop-2.1.5-gentoo.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- kdevelop/setup/wizardkdedocpage.cpp	2003-01-14 01:41:20.000000000 +0100
-+++ kdevelop/setup/wizardkdedocpage.cpp	2003-02-04 16:56:00.000000000 +0100
-@@ -39,10 +39,8 @@
-   bool kde_docs_found=false;
- 
-   QStringList kde_dirs;
--  kde_dirs  << "/opt/kde2/share/doc/HTML/en/kdelibs"     // normal dist
--//!? conflict with KDE-1.x            << "/opt/kde/share/doc/HTML/en/kdelibs"     // normal dist
--            << "/usr/share/doc/kdelibs"                 // Redhat 6.0
--            << "/usr/local/kde/share/doc/kdelibs"       // other locations
-+  kde_dirs  << "/usr/kde/3.1/share/doc/HTML/en/kdelibs-apidocs"
-+            << "/usr/kde/3.2/share/doc/HTML/en/kdelibs-apidocs"
-             << KDELIBS_DOCDIR;    // autoconf said
- 
-   // first check the autoconfified path
---- kdevelop/setup/ccreatedocdatabasedlg.cpp	2002-06-07 01:45:09.000000000 +0200
-+++ kdevelop/setup/ccreatedocdatabasedlg.cpp	2003-02-04 17:32:26.000000000 +0100
-@@ -192,7 +192,7 @@
- 
- void CCreateDocDatabaseDlg::slotOkClicked()
- {
--  if(!QFile::exists(m_kdeDocDir + "/kdeui/KDialog.html") && kde_checkbox->isChecked()){
-+  if(!QFile::exists(m_kdeDocDir + "/kdeui/html/classKDialog.html") && kde_checkbox->isChecked()){
-     KMessageBox::error(0,i18n("The KDE-Documentation-Path isn't set correctly."),i18n("No Database created!"));
-     return;
-   }
---- kdevelop/setup/wizardcreatekdedocpage.cpp	2002-07-18 02:38:17.000000000 +0200
-+++ kdevelop/setup/wizardcreatekdedocpage.cpp	2003-02-04 17:42:10.000000000 +0100
-@@ -65,7 +65,7 @@
- //    kde_dir->mkdir(".kde/share/apps/kdevelop",false);
- //    kde_dir->mkdir(".kde/share/apps/kdevelop/KDE-Documentation",false);
- 
--    if(!QFile::exists(m_pInstallState->kde + "/kdeui/KDialog.html")) {
-+    if(!QFile::exists(m_pInstallState->kde + "/kdeui/html/classKDialog.html")) {
-       m_pInstallState->kde = docDir;
-     }
-     pDlg = new CUpdateKDEDocDlg(m_pInstallState->shell_process, docDir, m_pInstallState->qt, wdg, false, "test");
---- kdevelop/setup/ckdevinstall.cpp	2002-07-18 02:38:17.000000000 +0200
-+++ kdevelop/setup/ckdevinstall.cpp	2003-02-04 17:43:36.000000000 +0100
-@@ -62,7 +62,7 @@
-   m_config->setGroup("Doc_Location");
-   QString qtDocuPath = m_config->readEntry("doc_qt", QT_DOCDIR);
-   QString kdeDocuPath = m_config->readEntry("doc_kde", KDELIBS_DOCDIR);
--  if(!QFile::exists(kdeDocuPath + "/kdeui/KDialog.html"))
-+  if(!QFile::exists(kdeDocuPath + "/kdeui/html/classKDialog.html"))
-     kdeDocuPath = KDELIBS_DOCDIR;
-   m_pInstallState = new CKDevInstallState( qtDocuPath, kdeDocuPath);
- 
---- kdevelop/ctags/cctags_interf.h	2001-07-23 17:38:09.000000000 +0200
-+++ kdevelop/ctags/cctags_interf.h	2003-02-04 17:55:57.000000000 +0100
-@@ -31,7 +31,7 @@
- public:
-   CTagsCommandLine() {                    // long form of arguments
-     m_onlyProjectFiles=false;
--    m_command = "ctags";
-+    m_command = "exuberant-ctags";
-     m_append = "";                        //--append=no      [default]
-     m_sort = "-u";                        //--sort=no
-     m_totals = "--totals";                //--totals=yes
---- kdevelop/ckdevelop_project.cpp	2002-06-25 16:59:59.000000000 +0200
-+++ kdevelop/ckdevelop_project.cpp	2003-02-04 18:58:30.000000000 +0100
-@@ -1356,7 +1356,7 @@
- void CKDevelop::slotProjectMakeTags()
- {
-   slotStatusMsg(i18n("Creating tags file..."));
--  if(!CToolClass::searchInstProgram("ctags")) // no dialog
-+  if(!CToolClass::searchInstProgram("exuberant-ctags")) // no dialog
-   {
-     KMessageBox::sorry(0,
-       i18n("KDevelop needs \"Exuberant Ctags\" \n for tags based search functionality."),
---- kdevelop/setup/wizardtoolscheckpage.cpp	2002-07-18 02:38:17.000000000 +0200
-+++ kdevelop/setup/wizardtoolscheckpage.cpp	2003-02-04 19:14:09.000000000 +0100
-@@ -59,7 +59,7 @@
-   bool kpaint       = CToolClass::searchInstProgram("kpaint");
-   bool designer     = CToolClass::searchInstProgram("designer");
-   bool linguist     = CToolClass::searchInstProgram("linguist");
--  bool ctags        = CToolClass::searchInstProgram("ctags");
-+  bool ctags        = CToolClass::searchInstProgram("exuberant-ctags");
- 
-   m_pInstallState->make	 = CToolClass::searchInstProgram("make");
-   m_pInstallState->gmake = CToolClass::searchInstProgram("gmake");
---- kdevelop/doctreeview.cpp.orig	2003-12-29 16:26:45.000000000 +0100
-+++ kdevelop/doctreeview.cpp	2003-12-29 16:27:00.000000000 +0100
-@@ -826,7 +826,7 @@
-     void changePathes();
-     virtual void refresh();
-     #if KDE_QTVER >= 3
--    void DocTreeKDELibsFolder::appendBooks(QDir dir);
-+    void appendBooks(QDir dir);
-     #endif
- };
diff --git a/dev-util/kdevelop/files/kdevelop-3.1_beta2-mutex.h.diff b/dev-util/kdevelop/files/kdevelop-3.1_beta2-mutex.h.diff
deleted file mode 100644
index df7636065627..000000000000
--- a/dev-util/kdevelop/files/kdevelop-3.1_beta2-mutex.h.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- bdb/include/mutex.h.orig	2004-07-24 21:34:02.164952224 +0200
-+++ bdb/include/mutex.h	2004-07-24 21:34:37.961510320 +0200
-@@ -486,7 +486,7 @@
- 	int __one = 1;			\
- 	int __r;			\
- 	tsl_t *__l = (tsl);		\
--	asm volatile ("			\
-+	__asm volatile ("			\
- 0:					\
- 	lwarx %0,0,%1;			\
- 	cmpwi %0,0;			\
-@@ -621,7 +621,7 @@
- #define  MUTEX_SET(tsl) ({           \
- 	register tsl_t *__l = (tsl);          \
- 	int __r;              \
--	asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\
-+	__asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\
- 		: "=&a" (__r), "=m" (*__l)          \
- 		: "1" (*__l)            \
- 		);                \
diff --git a/dev-util/kdevelop/kdevelop-2.1.5.ebuild b/dev-util/kdevelop/kdevelop-2.1.5.ebuild
deleted file mode 100644
index 9cca79195ea7..000000000000
--- a/dev-util/kdevelop/kdevelop-2.1.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.11 2004/06/25 02:38:12 agriffis Exp $
-
-inherit kde eutils
-need-kde 3.1
-
-IUSE=""
-MY_P=${P}_for_KDE_3.1
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="KDevelop ${PV}"
-HOMEPAGE="http://www.kdevelop.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${MY_P}.tar.bz2
-	ftp://ftp.ee.fhm.edu/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-	mirror://gentoo/$PN-2.1.3-qt-templates.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-#Several of these runtime dependencies should probably only be
-#in DEPEND. DEPEND is for what is needed to build, RDEPEND is
-#for what is needed to run. RDEPEND is used when merging from
-#.tbz2. (drobbins)
-RDEPEND=">=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}
-	app-doc/kdelibs-apidocs
-	=sys-devel/flex-2.5.4*
-	dev-lang/perl"
-
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
-
-# -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 WANT_AUTOCONF=2.5 kdevelop:g' $x.2 > $x
-		rm $x.2
-	done
-	cd ${WORKDIR}
-	mv q*.tar.gz ${S}/kdevelop/templates/
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	kde_src_compile
-	cd ${WORKDIR}/c_cpp_reference-2.0.2_for_KDE_3.0
-	econf --with-qt-dir=/usr/qt/3 || die "econf failed"
-	emake
-}
-
-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
-
-	# c/cpp reference package
-	cd ${WORKDIR}/c_cpp_reference-2.0.2_for_KDE_3.0
-	einstall
-}
diff --git a/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild b/dev-util/kdevelop/kdevelop-3.1.0_rc2.ebuild
index 91f5673ef066..af8bebaba017 100644
--- a/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.1.0_rc2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.1_beta2.ebuild,v 1.2 2004/07/24 21:52:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.1.0_rc2.ebuild,v 1.1 2004/08/10 20:46:24 carlo Exp $
 
 inherit python kde eutils
 
-MY_P=${PN}-3.0.92
-S=${WORKDIR}/${MY_P}
+MY_P=${PN}-${PV/_/-}
+S=${WORKDIR}/${MY_P%-*}
 
-IUSE="doc java python ruby"
+IUSE="arts doc java python ruby"
 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.2.92/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://kde/unstable/3.3.0rc2/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.kdevelop.org"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
@@ -18,7 +18,7 @@ SLOT=3
 DEPEND="dev-lang/perl
 	sys-devel/flex
 	sys-devel/gdb
-	java? ( virtual/jdk dev-java/ant )
+	java? ( virtual/jdk dev-java/ant dev-java/java-config )
 	python? ( dev-lang/python )
 	doc? ( app-doc/doxygen )"
 RDEPEND="$DEPEND"
@@ -29,17 +29,17 @@ myconf="$myconf --with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apido
 src_unpack() {
 	kde_src_unpack
 
-	epatch ${FILESDIR}/${P}-mutex.h.diff
 	if use amd64; then
-		epatch ${FILESDIR}/${P/beta?/beta1}-bdb-fPIC.patch
+		epatch ${FILESDIR}/${P/rc?/beta1}-bdb-fPIC.patch
 	fi
 }
 
 src_compile() {
 	python_version
-	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/python${PYVER}" || myconf="$myconf --disable-scripting"
-	use ruby || myconf="$myconf --disable-ruby"
+	myconf="$myconf $(use_enable java javasupport) $(use_with java java $(java-config --jdk-home))
+			$(use_enable python scripting) $(use_with python pythondir /usr/lib/python${PYVER})
+			$(use_enable ruby)
+			$(use_enable arts)"
 	kde_src_compile
 }