From 584138ba7429b7a3e8969f38368831de16849f8e Mon Sep 17 00:00:00 2001 From: Gregorio Guidi Date: Tue, 18 Oct 2005 15:33:27 +0000 Subject: [PATCH] Add patch to fix building of ant projects (#100823). Package-Manager: portage-2.0.51.22-r3 --- dev-util/kdevelop/ChangeLog | 10 ++- dev-util/kdevelop/Manifest | 7 +- .../kdevelop/files/digest-kdevelop-3.2.3-r1 | 1 + .../files/digest-kdevelop-3.3.0_beta2-r1 | 1 + .../kdevelop/files/kdevelop-3.2.3-ant.patch | 21 +++++ dev-util/kdevelop/kdevelop-3.2.3-r1.ebuild | 80 ++++++++++++++++++ .../kdevelop/kdevelop-3.3.0_beta2-r1.ebuild | 84 +++++++++++++++++++ 7 files changed, 202 insertions(+), 2 deletions(-) create mode 100644 dev-util/kdevelop/files/digest-kdevelop-3.2.3-r1 create mode 100644 dev-util/kdevelop/files/digest-kdevelop-3.3.0_beta2-r1 create mode 100644 dev-util/kdevelop/files/kdevelop-3.2.3-ant.patch create mode 100644 dev-util/kdevelop/kdevelop-3.2.3-r1.ebuild create mode 100644 dev-util/kdevelop/kdevelop-3.3.0_beta2-r1.ebuild 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 + +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 kdevelop-3.2.3.ebuild, kdevelop-3.3.0_beta2.ebuild: diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest index 24a1633fe3b7..071f5decf93e 100644 --- a/dev-util/kdevelop/Manifest +++ b/dev-util/kdevelop/Manifest @@ -1,19 +1,24 @@ MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +MD5 e51a96b6e5f2440879be767b01c04375 kdevelop-3.3.0_beta2-r1.ebuild 3115 MD5 af2bf95f6867509e24f9d4ccda1cfba9 kdevelop-3.2.1-r1.ebuild 2858 +MD5 55efb33ccee6a40c91130ad529552000 kdevelop-3.2.3-r1.ebuild 2983 MD5 be27cb0ad17d922992efa60840dda2dc kdevelop-3.1.2.ebuild 2722 -MD5 57e0b387f8375b7e782b314c04a48a4b ChangeLog 15793 +MD5 b1cd4ef22c52b6251906b562456204aa ChangeLog 16069 MD5 b7b71e0c83b22cc11ddb06e001c2a2fd kdevelop-3.3.0_beta2.ebuild 3014 MD5 e940bb0a107baa39c8a1b42e13e57e98 kdevelop-3.2.2.ebuild 2832 MD5 accda6c7d42fc9c024903cbc09078e71 kdevelop-3.3_beta1.ebuild 3017 MD5 9a9549087cbbd316790c894ca0c96ce3 kdevelop-3.2.3.ebuild 2882 +MD5 34af4d3547f033e0198702768d81c2ad files/digest-kdevelop-3.2.3-r1 68 MD5 dcdcaf1dea68db854de8dad4df83c096 files/kdevelop-3.1_beta1-bdb-fPIC.patch 391 MD5 3e9fd708ae657cffd1d68041f52aabc8 files/digest-kdevelop-3.2.1-r1 68 MD5 a94b1b00d38f496db64b8fcbd85bbb9b files/digest-kdevelop-3.2.2 68 MD5 72bf5d9a24a821f9584ec59ccf1a2d6e files/kdevelop-3.2.1-gcc4.patch 446 MD5 5ea55be30c933e635663774aabe62dda files/digest-kdevelop-3.3.0_beta2 69 MD5 34af4d3547f033e0198702768d81c2ad files/digest-kdevelop-3.2.3 68 +MD5 5ea55be30c933e635663774aabe62dda files/digest-kdevelop-3.3.0_beta2-r1 69 MD5 1760f21a5c2d5c152495c12af8232d04 files/kdevelop-3.2.1-makefiles.patch 815 MD5 9baadc6b0dcbb08db8c865897cf4cf43 files/kdevelop-3.1.0-bdb-mutex.patch 656 MD5 2c2ec3055c3e463c416ac6d713f532e0 files/kdevelop-qt-3.3.5.patch 479 +MD5 e904b2e0a85d8e1363b48e3a3ce623d3 files/kdevelop-3.2.3-ant.patch 968 MD5 70835c57ebb94e216c92f19bc82ac539 files/digest-kdevelop-3.3_beta1 69 MD5 529d6ae5875e5eff1f3ec62dd5234e81 files/digest-kdevelop-3.1.2 68 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." +} -- 2.26.2