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 | f04e3990e661180d6d9abb578459fbed0004f3c9 (patch) | |
| tree | 8edc5b3d0594332089f811a9a308e7320c91ab08 /dev-util/netbeans | |
| parent | Bump -5.11 development version (diff) | |
| download | historical-f04e3990e661180d6d9abb578459fbed0004f3c9.tar.gz historical-f04e3990e661180d6d9abb578459fbed0004f3c9.tar.bz2 historical-f04e3990e661180d6d9abb578459fbed0004f3c9.zip | |
dev-util/netbeans: fixed bug #342647
Package-Manager: portage-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/Manifest | 5 | ||||
| -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 |
4 files changed, 29 insertions, 5 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/Manifest b/dev-util/netbeans/Manifest index ab8503973439..e130829224c8 100644 --- a/dev-util/netbeans/Manifest +++ b/dev-util/netbeans/Manifest @@ -5,6 +5,7 @@ AUX 6.7/nbbuild_build.xml.patch 1989 RMD160 483d9301da88be90ec467c283cff0498f0e4 AUX 6.7/nbbuild_templates_projectized.xml.patch 867 RMD160 eb3021fbc02eefc074315fe7ec8991f3210c6a1d SHA1 1f6f7da1fe055e3826195e29e13b0999be797e8b SHA256 558c52a2365a0605277aa49db271c54e7c93e3919c2e056610343816fd8451ec AUX 6.8/nbbuild_build.xml.patch 1989 RMD160 483d9301da88be90ec467c283cff0498f0e4de63 SHA1 3113a60c005eb84238cce17e9f927bee4ffb7a38 SHA256 e01b8cc5b25873e94da3310719ba51bbe40a0269d7af69a3f5596a773fe5b9a6 AUX 6.8/nbbuild_templates_projectized.xml.patch 883 RMD160 556555de346a1202d36f5ef4bdc7cf1951dc28c0 SHA1 ad5f44dd4ac88dede256746629aae146cec8c363 SHA256 55a8b7e4f9cea194fde29b97372eb473bcc0f3030898c1c74a7d49a8ecff2dd3 +AUX 6.9/cnd.model.services-build.xml.patch 909 RMD160 e33b41b5dc7e4fb1f1c9ee6a21a8bc3f707528db SHA1 47b2e417da01299ead492f1ec3e63975a8c46ac8 SHA256 a8ea9f7ac5e37a0e086fc00e7e40be84771f8943dcbbdad0fdc921a2017ba650 AUX 6.9/nbbuild_build.xml.patch 2462 RMD160 7063d564dbe9f1eb22af201631918699a40637ee SHA1 9ab9eef8247337510f91656eafed75591e14fd53 SHA256 10d9b0677668711215797977f8766ca76b2f838ab4a27d85c3c8b2bc98b1bbda AUX 6.9/nbbuild_templates_projectized.xml.patch 935 RMD160 4b11af335e901ba2392bee48a2cc3b1add8b31c5 SHA1 ffbad335f79b0d11f61447b7b3fd6715183ca94f SHA256 bfe90e3da56de91677ba193dac0a5ee3dbd68a6ae32b677c556c0b810e64044e AUX 6.9/netbeans-keychain.patch 748 RMD160 04f61c66934cd7f8294684ddb6f907860cf76d57 SHA1 e7c578f9248384696d2686324ac7023573d9317c SHA256 1754a9c49d03d2abf1c2e0a07dcce66935d8f64c9e0e6ed52be28f20509afa07 @@ -25,6 +26,6 @@ EBUILD netbeans-6.7.1.ebuild 42302 RMD160 97684afb2c5ca20d654e03fb44c75918f5bb4f EBUILD netbeans-6.8-r1.ebuild 43136 RMD160 1ed63a12ce46beb4838913c8f65690aaec9d2a3a SHA1 bf2af027925686c64e58a34d60bbe7fada2cac4a SHA256 5b34a9b43e28cefa7518645f2850f480e25701e09b9cbb4afb304cdb893d3d80 EBUILD netbeans-6.9-r2.ebuild 46059 RMD160 a76d01fb0de80eb5151602e6d7abcf9108b96a29 SHA1 1e8de42b3a199b922e8d1ebe1ca84e8e685a8ed0 SHA256 85f98f30743b35af4bfa9d16706c9c9ebd4d7b0d6c5bb0d385a21b1e1c76326d EBUILD netbeans-6.9-r3.ebuild 47312 RMD160 46785d484ca8ae6fb3593f43a3bb9fb0e4c91f2b SHA1 d56cb739b6851485809b3b86fda1388682408456 SHA256 1c06cbc5f876129bb4b1c9af05d0cf4f52dfb219b5136b0c8222f3e987ae4282 -EBUILD netbeans-6.9.1.ebuild 49335 RMD160 5e1cad03a280bd71c108a565e85fe460c48c0063 SHA1 9fc22a9136e315db63443e20a772c8a466257b8c SHA256 676aa2f22764b1118faf8b7273f0fc1e27e6a4901892282481599393dc8aa2fb -MISC ChangeLog 28090 RMD160 576d7df1844ac373946b13ed176c4e68ca6dbb6e SHA1 e04d273493fb89e6acd94ff4bbd8bd4913b11085 SHA256 359727bb0cc595c4dfe379164fc248856d377b69566d1240e8f6ca0108f28ae4 +EBUILD netbeans-6.9.1.ebuild 49396 RMD160 35893664eb27de6cd0dd662fbcd72b9bbdfe08f2 SHA1 f0b6066be883f806c133b2733a452a7e4470c7bc SHA256 1e757f74fda37938d95520226eaccca851718addb9ae3b6c653f04a216913296 +MISC ChangeLog 28289 RMD160 2a285572f5a465aa515a61bdbc58cb53e4c97750 SHA1 97df7907d6916807b8e0fc022e392c01078d8ddc SHA256 e1a090dc8b6935cbb9438307bbc9513d0a5986105b88b98602f5d46640757d34 MISC metadata.xml 1322 RMD160 04ba87bda7c1a2322721b78b5e071760be5686f7 SHA1 2a9a7b60c4da843a985ab38c0e5deb8654a62952 SHA256 2edbcc66e3e4449c48a6aae87e223c396acaf0a81483d2f7106ebf7a909c2af5 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 |