diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2011-01-21 19:33:14 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-01-21 19:33:14 +0000 |
| commit | eac8e33d5e629e7e84c3a7b5e7856bc8222f3160 (patch) | |
| tree | f111d5a579d361a199d7709ca00d3756acea18af /dev-util/netbeans | |
| parent | Bump -5.11 development version (diff) | |
| download | gentoo-2-eac8e33d5e629e7e84c3a7b5e7856bc8222f3160.tar.gz gentoo-2-eac8e33d5e629e7e84c3a7b5e7856bc8222f3160.tar.bz2 gentoo-2-eac8e33d5e629e7e84c3a7b5e7856bc8222f3160.zip | |
dev-util/netbeans: fixed bug #342647
(Portage version: 2.1.9.34/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/netbeans')
| -rw-r--r-- | dev-util/netbeans/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/netbeans/files/6.9/cnd.model.services-build.xml.patch | 18 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-6.9.1.ebuild | 5 |
3 files changed, 26 insertions, 3 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 105b4a07c906..02385f73f86e 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/netbeans # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.149 2011/01/12 22:37:59 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.150 2011/01/21 19:33:14 fordfrog Exp $ + + 21 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> + +files/6.9/cnd.model.services-build.xml.patch, netbeans-6.9.1.ebuild: + Fixed bug #342647 (thanks to Andrew Haley <aph@redhat.com> for the fix) 12 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> netbeans-6.9.1.ebuild: just few minor fixes, also switched to EAPI=3 diff --git a/dev-util/netbeans/files/6.9/cnd.model.services-build.xml.patch b/dev-util/netbeans/files/6.9/cnd.model.services-build.xml.patch new file mode 100644 index 000000000000..3955904e596f --- /dev/null +++ b/dev-util/netbeans/files/6.9/cnd.model.services-build.xml.patch @@ -0,0 +1,18 @@ +--- cnd.model.services/nbproject/project.xml~ 2010-07-28 23:10:26.000000000 +0100 ++++ cnd.model.services/nbproject/project.xml 2011-01-21 17:54:19.000000000 +0000 +@@ -131,6 +131,15 @@ + <specification-version>6.26</specification-version> + </run-dependency> + </dependency> ++ <dependency> ++ <code-name-base>org.netbeans.modules.lexer</code-name-base> ++ <build-prerequisite/> ++ <compile-dependency/> ++ <run-dependency> ++ <release-version>2</release-version> ++ <specification-version>1.26</specification-version> ++ </run-dependency> ++ </dependency> + </module-dependencies> + <friend-packages> + <friend>com.microchip.mplab.debugger.mdb</friend> diff --git a/dev-util/netbeans/netbeans-6.9.1.ebuild b/dev-util/netbeans/netbeans-6.9.1.ebuild index 0c48969a5443..69b6e41f2b9b 100644 --- a/dev-util/netbeans/netbeans-6.9.1.ebuild +++ b/dev-util/netbeans/netbeans-6.9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9.1.ebuild,v 1.3 2011/01/12 22:37:59 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-6.9.1.ebuild,v 1.4 2011/01/21 19:33:14 fordfrog Exp $ EAPI="3" WANT_SPLIT_ANT="true" @@ -460,7 +460,8 @@ src_unpack () { src_prepare () { # We need to disable downloading of jars epatch "${FILESDIR}"/${SLOT}/nbbuild_build.xml.patch \ - "${FILESDIR}"/${SLOT}/nbbuild_templates_projectized.xml.patch + "${FILESDIR}"/${SLOT}/nbbuild_templates_projectized.xml.patch \ + "${FILESDIR}"/${SLOT}/cnd.model.services-build.xml.patch if use keychain ; then epatch "${FILESDIR}"/${SLOT}/netbeans-keychain.patch |