diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-06-11 15:50:20 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-06-11 15:50:20 +0000 |
| commit | baa9906986e02cfc6db85a2a2dd2f03d5fd7ae37 (patch) | |
| tree | b4c2d4846ba987775dd6e726f27efba1774cab3a /dev-util/netbeans | |
| parent | Remove old ebuild (diff) | |
| download | gentoo-2-baa9906986e02cfc6db85a2a2dd2f03d5fd7ae37.tar.gz gentoo-2-baa9906986e02cfc6db85a2a2dd2f03d5fd7ae37.tar.bz2 gentoo-2-baa9906986e02cfc6db85a2a2dd2f03d5fd7ae37.zip | |
Remove build requirement on sun-jmx as Netbeans builds just fine with the jar deleted.
(Portage version: 2.1.2.9)
Diffstat (limited to 'dev-util/netbeans')
| -rw-r--r-- | dev-util/netbeans/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/netbeans/netbeans-5.5-r6.ebuild | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog index da927b6f8168..87da40d4fee9 100644 --- a/dev-util/netbeans/ChangeLog +++ b/dev-util/netbeans/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/netbeans # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.66 2007/05/23 17:36:03 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/ChangeLog,v 1.67 2007/06/11 15:50:20 betelgeuse Exp $ + + 11 Jun 2007; Petteri Räty <betelgeuse@gentoo.org> netbeans-5.5-r6.ebuild: + Remove build requirement on sun-jmx as Netbeans builds just fine with the + jar deleted. 23 May 2007; Diego Pettenò <flameeyes@gentoo.org> netbeans-5.5-r6.ebuild: Add ~x86-fbsd keyword. Bug #176906. diff --git a/dev-util/netbeans/netbeans-5.5-r6.ebuild b/dev-util/netbeans/netbeans-5.5-r6.ebuild index e98765430356..4fc00f2c0bc6 100644 --- a/dev-util/netbeans/netbeans-5.5-r6.ebuild +++ b/dev-util/netbeans/netbeans-5.5-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r6.ebuild,v 1.6 2007/05/23 17:36:03 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-5.5-r6.ebuild,v 1.7 2007/06/11 15:50:20 betelgeuse Exp $ inherit eutils java-pkg-2 java-ant-2 versionator @@ -76,7 +76,6 @@ DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* ) >=dev-java/prefuse-20060715_beta >=dev-java/rome-0.6 =dev-java/servletapi-2.3* - dev-java/sun-jmx =dev-java/xml-xmlbeans-1* >=dev-util/pmd-1.3 ${COMMON_DEPEND}" @@ -139,7 +138,7 @@ src_compile() { -name "*.exe" -o \ -name "*.cmd" -o \ -name "*.bat" -o \ - -name "*.dll" \ + -name "*.dll" \ | xargs rm -f # Removing external stuff. They are api docs from external libs. @@ -286,9 +285,10 @@ place_unpack_symlinks() { cd ${S}/nbbuild/external java-pkg_jar-from javahelp jhall.jar jhall-2.0_03.jar - einfo "Symlinking jars for serverplugins" - cd ${S}/serverplugins/external - java-pkg_jar-from --build-only sun-jmx jmxri.jar jmxremote.jar + cd "${S}/serverplugins/external" + # Builds just fine without this. Maybe lefover from times when NB could be + # built with 1.4? + rm -v jmxremote.jar || die einfo "Symlinking jars for tasklist" cd ${S}/tasklist/external |