Add patch to fix building of ant projects (#100823).

(Portage version: 2.0.51.22-r3)

6 files changed, 196 insertions, 1 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index f93d54d52731..614daad3e3de 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.102 2005/10/18 15:15:11 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.103 2005/10/18 15:33:27 greg_g Exp $
+
+*kdevelop-3.3.0_beta2-r1 (18 Oct 2005)
+*kdevelop-3.2.3-r1 (18 Oct 2005)
+
+  18 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdevelop-3.2.3-ant.patch, +kdevelop-3.2.3-r1.ebuild,
+  +kdevelop-3.3.0_beta2-r1.ebuild:
+  Add patch to fix building of ant projects (#100823).
 
   18 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> kdevelop-3.2.3.ebuild,
   kdevelop-3.3.0_beta2.ebuild:
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.2.3-r1 b/dev-util/kdevelop/files/digest-kdevelop-3.2.3-r1
new file mode 100644
index 000000000000..06bb724b6e9c
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.2.3-r1
@@ -0,0 +1 @@
+MD5 7dfae96e274c6dcb4748419452ebdf35 kdevelop-3.2.3.tar.bz2 8353809
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.3.0_beta2-r1 b/dev-util/kdevelop/files/digest-kdevelop-3.3.0_beta2-r1
new file mode 100644
index 000000000000..e220a0479e56
--- /dev/null
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.3.0_beta2-r1
@@ -0,0 +1 @@
+MD5 88c471e8b86b275f949d0d4eee055f91 kdevelop-3.2.92.tar.bz2 8077910
diff --git a/dev-util/kdevelop/files/kdevelop-3.2.3-ant.patch b/dev-util/kdevelop/files/kdevelop-3.2.3-ant.patch
new file mode 100644
index 000000000000..2aaceaef5aed
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.2.3-ant.patch
@@ -0,0 +1,21 @@
+diff -Nur kdevelop-3.2.3.orig/buildtools/ant/antprojectpart.cpp kdevelop-3.2.3/buildtools/ant/antprojectpart.cpp
+--- kdevelop-3.2.3.orig/buildtools/ant/antprojectpart.cpp	2005-10-05 15:32:08.000000000 +0200
++++ kdevelop-3.2.3/buildtools/ant/antprojectpart.cpp	2005-10-18 17:28:46.000000000 +0200
+@@ -431,7 +431,7 @@
+ 
+ void AntProjectPart::ant(const QString &target)
+ {
+-  QString cmd = "%0 cd %1 && ant %2 -buildfile %3 %4 %5";
++  QString cmd = "cd %0 && %1 ant %2 -buildfile %3 %4 %5";
+ 
+   QString verb = "";
+   switch (m_antOptions.m_verbosity)
+@@ -457,7 +457,7 @@
+   if (!m_classPath.count() == 0)
+     cp = "CLASSPATH="+m_classPath.join(":");
+   
+-  makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(cp).arg(m_projectDirectory).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(options));
++  makeFrontend()->queueCommand(m_projectDirectory, cmd.arg(m_projectDirectory).arg(cp).arg(target).arg(m_antOptions.m_buildXML).arg(verb).arg(options));
+ }
+ 
+ 
diff --git a/dev-util/kdevelop/kdevelop-3.2.3-r1.ebuild b/dev-util/kdevelop/kdevelop-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..0320d5940417
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-3.2.3-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.2.3-r1.ebuild,v 1.1 2005/10/18 15:33:27 greg_g Exp $
+
+inherit kde eutils
+
+DESCRIPTION="Integrated Development Enviroment for Unix, supporting KDE/Qt, C/C++ and a many other languages."
+HOMEPAGE="http://www.kdevelop.org"
+SRC_URI="mirror://kde/stable/${PV/#3.2/3.4}/src/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ada clearcase fortran haskell java pascal perforce perl php python ruby sql subversion"
+
+DEPEND="dev-lang/perl
+	sys-devel/flex
+	sys-devel/gdb
+	|| ( kde-base/cervisia kde-base/kdesdk )"
+
+RDEPEND="${DEPEND}
+	subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )"
+
+need-kde 3.3
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S}
+
+	# See bug #86780 and kde bug 98852.
+	epatch "${FILESDIR}/kdevelop-3.2.1-makefiles.patch"
+
+	# Fix building of ant projects (kde bug 100813).
+	epatch "${FILESDIR}/kdevelop-3.2.3-ant.patch"
+
+	# Update the admin dir used in KDE template projects.
+	# See also kde bug 104386.
+	for i in ${S}/admin/*; do
+		cp ${i} ${S}/parts/appwizard/common/admin/
+	done
+}
+
+src_compile() {
+	local myconf="--with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs"
+
+	# languages
+	myconf="${myconf} $(use_enable java) $(use_enable python)
+			$(use_enable ruby) $(use_enable ada) $(use_enable fortran)
+			$(use_enable haskell) $(use_enable pascal) $(use_enable perl)
+			$(use_enable php) $(use_enable sql)"
+
+	# build tools
+	myconf="${myconf} $(use_enable java antproject)"
+
+	# version control systems
+	myconf="${myconf} $(use_enable clearcase) $(use_enable perforce)
+			$(use_enable subversion)"
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	einfo "kdevelop can use a wide range of apps for extra functionality. This is an almost"
+	einfo "complete list. All these packages can be emerged after kdevelop."
+	einfo
+	einfo "kde-base/kdebase:               (RECOMMENDED) embed konsole kpart in kdevelop ide"
+	einfo "dev-util/kdbg:                  (RECOMMENDED) kde frontend to gdb"
+	einfo "dev-util/valgrind:              (RECOMMENDED) integrates valgrind (memory debugger) commands"
+	einfo "kde-base/kompare:               (RECOMMENDED) show differences between files"
+	einfo "dev-java/ant:                   support projects using the ant build tool"
+	einfo "dev-util/ctags:                 faster and more powerful code browsing logic"
+	einfo "app-doc/doxygen:                generate KDE-style documentation for your project"
+	einfo "www-misc/htdig:                 index and search your project's documentation"
+	einfo "app-arch/rpm:                   support creating RPMs of your project"
+	einfo "app-emulation/visualboyadvance: create and run projects for this gameboy"
+	einfo
+	einfo "Support for GNU-style make, tmake, qmake is included."
+	einfo "Support for using clearcase, perforce and subversion"
+	einfo "as version control systems is optional."
+}
diff --git a/dev-util/kdevelop/kdevelop-3.3.0_beta2-r1.ebuild b/dev-util/kdevelop/kdevelop-3.3.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..41a326551496
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-3.3.0_beta2-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.0_beta2-r1.ebuild,v 1.1 2005/10/18 15:33:27 greg_g Exp $
+
+inherit kde eutils
+
+MY_PV=3.2.92
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DESCRIPTION="Integrated Development Enviroment for Unix, supporting KDE/Qt, C/C++ and a many other languages."
+HOMEPAGE="http://www.kdevelop.org"
+#SRC_URI="mirror://kde/stable/${PV/#3.3/3.5}/src/${P}.tar.bz2"
+SRC_URI="mirror://kde/unstable/${PV/#3.3.0_/3.5-}/src/${PN}-${MY_PV}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ada clearcase fortran haskell java pascal perforce perl php python ruby sql subversion"
+
+DEPEND="dev-lang/perl
+	sys-devel/flex
+	sys-devel/gdb
+	|| ( kde-base/cervisia kde-base/kdesdk )"
+
+RDEPEND="${DEPEND}
+	subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )"
+
+need-kde 3.3
+
+src_unpack() {
+	kde_src_unpack
+	cd ${S}
+
+	# See bug #86780 and kde bug 98852.
+	epatch "${FILESDIR}/kdevelop-3.2.1-makefiles.patch"
+
+	# Fix building of ant projects (kde bug 100813).
+	epatch "${FILESDIR}/kdevelop-3.2.3-ant.patch"
+
+	# Update the admin dir used in KDE template projects.
+	# See also kde bug 104386.
+	for i in ${S}/admin/*; do
+		cp "${i}" "${S}/parts/appwizard/common/admin/"
+	done
+}
+
+src_compile() {
+	local myconf="--with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs"
+
+	# languages
+	myconf="${myconf} $(use_enable java) $(use_enable python)
+			$(use_enable ruby) $(use_enable ada) $(use_enable fortran)
+			$(use_enable haskell) $(use_enable pascal) $(use_enable perl)
+			$(use_enable php) $(use_enable sql)"
+
+	# build tools
+	myconf="${myconf} $(use_enable java antproject)"
+
+	# version control systems
+	myconf="${myconf} $(use_enable clearcase) $(use_enable perforce)
+			$(use_enable subversion)"
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	einfo "kdevelop can use a wide range of apps for extra functionality. This is an almost"
+	einfo "complete list. All these packages can be emerged after kdevelop."
+	einfo
+	einfo "kde-base/kdebase:               (RECOMMENDED) embed konsole kpart in kdevelop ide"
+	einfo "dev-util/kdbg:                  (RECOMMENDED) kde frontend to gdb"
+	einfo "dev-util/valgrind:              (RECOMMENDED) integrates valgrind (memory debugger) commands"
+	einfo "kde-base/kompare:               (RECOMMENDED) show differences between files"
+	einfo "dev-java/ant:                   support projects using the ant build tool"
+	einfo "dev-util/ctags:                 faster and more powerful code browsing logic"
+	einfo "app-doc/doxygen:                generate KDE-style documentation for your project"
+	einfo "www-misc/htdig:                  index and search your project's documentation"
+	einfo "app-arch/rpm:                   support creating RPMs of your project"
+	einfo "app-emulation/visualboyadvance: create and run projects for this gameboy"
+	einfo
+	einfo "Support for GNU-style make, tmake, qmake is included."
+	einfo "Support for using clearcase, perforce and subversion"
+	einfo "as version control systems is optional."
+}