diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2005-08-17 21:05:02 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2005-08-17 21:05:02 +0000 |
| commit | 7e332a6216e80de4ec53f75d5df012fb3c7c90d5 (patch) | |
| tree | 56f5462e3cb3767881d7746ff6afd5788922f3ce /dev-util/netbeans | |
| parent | Fixed init script. Bug #102826. (diff) | |
| download | gentoo-2-7e332a6216e80de4ec53f75d5df012fb3c7c90d5.tar.gz gentoo-2-7e332a6216e80de4ec53f75d5df012fb3c7c90d5.tar.bz2 gentoo-2-7e332a6216e80de4ec53f75d5df012fb3c7c90d5.zip | |
Fixed a problem where an old junit emerge could cause an access violation.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-util/netbeans')
| -rw-r--r-- | dev-util/netbeans/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/netbeans/Manifest | 28 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-4.0-r2.ebuild | 8 |
3 files changed, 19 insertions, 23 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index 160813c0d951..31d762c79d4b 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.33 2005/07/19 18:39:17 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.34 2005/08/17 21:05:02 betelgeuse Exp $ + + 17 Aug 2005; Petteri Räty <betelgeuse@gentoo.org> netbeans-4.0-r2.ebuild: + Fixed a problem where an old junit emerge could cause an access violation. + Thanks to obsidian-studios for reporting the error. *netbeans-4.0-r2 (19 Jul 2005) diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest index bd8296f81aa8..69530dd099ff 100644 --- a/dev-util/netbeans/Manifest +++ b/dev-util/netbeans/Manifest @@ -1,29 +1,19 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 bb955be50099441e31cf75af92d044f7 netbeans-4.0-r2.ebuild 12090 +MD5 389e3f2823c7385508d6b7cf15c0fa5f ChangeLog 6065 +MD5 e7fcbf7f5131562425fda47afe3b39b9 metadata.xml 1128 +MD5 9daf3998d4271e1d45088cba870a7cc5 netbeans-4.0-r2.ebuild 12159 MD5 3995327ee30375ca261228f816a9f9a2 netbeans-3.4.1.ebuild 3191 MD5 a2ecc45e7604ad37b1d92d16d18ba3c0 netbeans-3.5.1.ebuild 3155 MD5 123427f9dd5f7996a3f5fdd909eb65db netbeans-3.6-r1.ebuild 3155 -MD5 fbb333726636f44832a476a1f90a7ad1 ChangeLog 5855 -MD5 e7fcbf7f5131562425fda47afe3b39b9 metadata.xml 1128 MD5 95ab6db4dc5ed189e21f0e6ae1aa657e files/antbuild.xml.patch 957 -MD5 9c6f59bb154bdcd7242f4544b8feae6b files/netbeans-KDE.desktop 139 -MD5 0c98dd3e09a6ddfc91bf8eac2ef22871 files/startscript.sh 409 -MD5 21a78956bac04c98135ba5707b98da66 files/netbeans.png 2163 +MD5 eba3a44af2a04cab3a7bf00ce982130e files/digest-netbeans-3.4.1 77 +MD5 9db67cc7c38cdd884ec192a4c642e144 files/digest-netbeans-3.5.1 77 MD5 a31cf39b9b70944a298e8fa97275d122 files/digest-netbeans-3.6-r1 67 MD5 628cbd47ea7d573ab47cc6b96c1b4d65 files/digest-netbeans-4.0-r2 163 +MD5 a80b4daebbce9c3aa54890ab458f8ecd files/emptyunscramble.xsl 405 MD5 df81663e1eac8d30955facf133f41e7a files/nbbuild.patch 1317 MD5 86a2e857f2e16af4becaa6e0e733c215 files/netbeans 786 +MD5 9c6f59bb154bdcd7242f4544b8feae6b files/netbeans-KDE.desktop 139 MD5 e04a4eefe6510679e7cf06d0377e9e18 files/netbeans.desktop 103 -MD5 eba3a44af2a04cab3a7bf00ce982130e files/digest-netbeans-3.4.1 77 -MD5 9db67cc7c38cdd884ec192a4c642e144 files/digest-netbeans-3.5.1 77 -MD5 a80b4daebbce9c3aa54890ab458f8ecd files/emptyunscramble.xsl 405 +MD5 21a78956bac04c98135ba5707b98da66 files/netbeans.png 2163 +MD5 0c98dd3e09a6ddfc91bf8eac2ef22871 files/startscript.sh 409 MD5 0c98dd3e09a6ddfc91bf8eac2ef22871 files/4.0/startscript.sh 409 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC3Ujv/rLF9B432nYRAiqqAJ9lX1P1+CqvqY1+/NKA+6fuPfF+4gCfWTMx -iWY3xfLLlMkzehVmkWcDwJw= -=IWRo ------END PGP SIGNATURE----- diff --git a/dev-util/netbeans/netbeans-4.0-r2.ebuild b/dev-util/netbeans/netbeans-4.0-r2.ebuild index b43568581acd..dc27d85c275b 100644 --- a/dev-util/netbeans/netbeans-4.0-r2.ebuild +++ b/dev-util/netbeans/netbeans-4.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-4.0-r2.ebuild,v 1.1 2005/07/19 18:39:17 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-4.0-r2.ebuild,v 1.2 2005/08/17 21:05:02 betelgeuse Exp $ inherit eutils java-pkg @@ -215,8 +215,8 @@ src_unpack () { cd ${S}/junit/external/ touch junit-3.8.1-api.zip - java-pkg_jar-from ${JUNIT} unscramble_and_empty + java-pkg_jar-from ${JUNIT} cd ${S}/tasklist/external/ unscramble_and_empty @@ -404,5 +404,7 @@ function remove_unscrambling() { xsltproc -o ${T}/out.xml ${FILESDIR}/emptyunscramble.xsl ${file} \ || die "Failed to remove unscrambling from one of the build.xml files" - mv ${T}/out.xml ${file} + + mv ${T}/out.xml ${file} \ + || die "Failed to create a build.xml file without unscrambling" } |